...

Author: khernyo

src/pgep/Engine.scala

@@ -10,7 +10,7 @@ object Engine {
   }
 }
 
-class Engine(params: EngineParameters, pop: Array[Genotype]) {
+class Engine private (params: EngineParameters, pop: Array[Genotype]) {
   protected val random = RNGProvider()
 
   protected var population = pop

src/pgep/EngineParameters.scala

@@ -37,20 +37,19 @@ object EngineParameters {
     val nrep = ops.reproducers map (_.nchildren) reduceLeft (_ + _)
     require(nrep <= popsize)
     val operators = if (nrep == popsize) ops
-    				else new OperatorSet(ops.fitnessFunction, ops.mpf,
-                             			 ops.reproducers ++ List(new CreateRandom(gtparams, popsize - nrep)),
-                             			 ops.modifiers)
+    				else OperatorSet(ops.fitnessFunction, ops.mpf,
+    								 ops.reproducers ++ List(new CreateRandom(gtparams, popsize - nrep)) ++ ops.modifiers)
 
     new EngineParameters(popsize, gtparams, maxNrGenerations, goodEnoughFitness, consts, operators, constgen, constantMutationProbability, nConstants)
   }
 }
 
-class EngineParameters(val popsize:Int,
-                       val gtparams: GenotypeParameters,
-                       val maxNrGenerations: Int,
-                       val goodEnoughFitness: Double,
-                       val constants: HashMap[Class[_], AlphabetRW[Const]],
-					   val operators: OperatorSet,
-					   val constgen: Map[Class[_], () => Any],
-					   val constantMutationProbability: Double,
-					   val nConstants: Int)
+class EngineParameters private (val popsize:Int,
+                                val gtparams: GenotypeParameters,
+                                val maxNrGenerations: Int,
+                                val goodEnoughFitness: Double,
+                                val constants: HashMap[Class[_], AlphabetRW[Const]],
+                                val operators: OperatorSet,
+                                val constgen: Map[Class[_], () => Any],
+                                val constantMutationProbability: Double,
+                                val nConstants: Int)

src/pgep/Gene.scala

@@ -55,7 +55,7 @@ object Gene {
   }
 }
 
-class Gene(parameters: GeneParameters, k_expression: Map[Class[_], Array[Term]], constants: Map[Class[_], Array[Const]]) {
+class Gene private (parameters: GeneParameters, k_expression: Map[Class[_], Array[Term]], constants: Map[Class[_], Array[Const]]) {
   val _k_expression = k_expression
   private val _constants = constants
 

src/pgep/Genotype.scala

@@ -34,8 +34,8 @@ object Genotype {
   private[this] final val isInvalid = (x: Double) => x.isNaN || x.isInfinity
 }
 
-class Genotype(val gp: GenotypeParameters,
-               val genes: Array[Gene]) {
+class Genotype private (val gp: GenotypeParameters,
+                        val genes: Array[Gene]) {
   import Genotype.isInvalid  
 
   private var _matingProbability: Double = _

src/pgep/GenotypeParameters.scala

@@ -17,11 +17,11 @@ object GenotypeParameters {
   }
 }
 
-class GenotypeParameters(val nrGenes: Int,
-                         val geneLinkingFunction: Func,
-                         val selector_fvc: Selector[Term],
-                         val selector_vc: Selector[Term],
-						 val geneParameters: Seq[GeneParameters]) {
+class GenotypeParameters private (val nrGenes: Int,
+                                  val geneLinkingFunction: Func,
+                                  val selector_fvc: Selector[Term],
+                                  val selector_vc: Selector[Term],
+                                  val geneParameters: Seq[GeneParameters]) {
 
   def geneLen = geneParameters(0).geneLen
   def headLen = geneParameters(0).headLen

src/pgep/OperatorSet.scala

@@ -12,7 +12,7 @@ object OperatorSet {
   }
 }
 
-class OperatorSet(val fitnessFunction: (Genotype) => Double,
-                  val mpf: MatingProbabilityFunction,
-                  val reproducers: List[Reproducer],
-                  val modifiers: List[Mutator])
+class OperatorSet private (val fitnessFunction: (Genotype) => Double,
+                           val mpf: MatingProbabilityFunction,
+                           val reproducers: List[Reproducer],
+                           val modifiers: List[Mutator])

src/pgep/TermProbabilities.scala

@@ -7,6 +7,6 @@ object TermProbabilities {
   }
 }
 
-class TermProbabilities(val functionProbabilities: Double,
-                        val variableProbabilities: Double,
-                        val constantProbabilities: Double)
+class TermProbabilities private (val functionProbabilities: Double,
+                                 val variableProbabilities: Double,
+                                 val constantProbabilities: Double)