[Quantproject-developers] QuantProject/b1_ADT/Optimizing/Genetic GeneticOptimizer.cs,1.7,1.8

[Marco M. <mi...@us...>]

Update of /cvsroot/quantproject/QuantProject/b1_ADT/Optimizing/Genetic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28878/b1_ADT/Optimizing/Genetic

Modified Files:
	GeneticOptimizer.cs 
Log Message:
Added new constructor for the GeneticOptimizer;
changed default values for mutationRate and the elitismRate (set to 0).


Index: GeneticOptimizer.cs
===================================================================
RCS file: /cvsroot/quantproject/QuantProject/b1_ADT/Optimizing/Genetic/GeneticOptimizer.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** GeneticOptimizer.cs	25 Jul 2005 22:27:49 -0000	1.7
--- GeneticOptimizer.cs	27 Jul 2005 22:34:24 -0000	1.8
***************
*** 127,130 ****
--- 127,134 ----
        get{return this.worstGenome;}
      }
+     public ArrayList CurrentGeneration
+     {
+       get{return this.currentGeneration;}
+     }
      #endregion
  
***************
*** 147,150 ****
--- 151,163 ----
      }
      
+     public GeneticOptimizer(IGenomeManager genomeManager, int populationSize,
+                             int generationNumber, int seedForRandomGenerator)
+     {
+       this.genomeManager = genomeManager;
+       this.populationSize = populationSize;
+       this.generationNumber = generationNumber;
+       this.random = new Random(seedForRandomGenerator);
+       this.commonInitialization();
+     }
      
      public GeneticOptimizer(double crossoverRate, double mutationRate, double elitismRate, 
***************
*** 178,184 ****
      private void commonInitialization()
      {
!       this.mutationRate = 0.02;
     		this.crossoverRate = 0.85;
!     	this.elitismRate = 0.01;
      	this.minConvergenceRate = 0.80;
      	this.keepOnRunningUntilConvergenceIsReached = false;
--- 191,197 ----
      private void commonInitialization()
      {
!       this.mutationRate = 0.10;
     		this.crossoverRate = 0.85;
!     	this.elitismRate = 0.0;
      	this.minConvergenceRate = 0.80;
      	this.keepOnRunningUntilConvergenceIsReached = false;