[Quantproject-developers] QuantProject/b1_ADT/Optimizing/Genetic GeneticOptimizer.cs, 1.27, 1.28

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

Update of /cvsroot/quantproject/QuantProject/b1_ADT/Optimizing/Genetic
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22227/b1_ADT/Optimizing/Genetic

Modified Files:
	GeneticOptimizer.cs 
Log Message:
Some methods have been commented out

Index: GeneticOptimizer.cs
===================================================================
RCS file: /cvsroot/quantproject/QuantProject/b1_ADT/Optimizing/Genetic/GeneticOptimizer.cs,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** GeneticOptimizer.cs	19 Jan 2008 18:59:19 -0000	1.27
--- GeneticOptimizer.cs	30 Aug 2009 15:44:53 -0000	1.28
***************
*** 64,69 ****
  	
      private int generationCounter;
!     private double averageRandomFitness;
!     private double standardDeviationOfRandomFitness;
      
      #endregion
--- 64,69 ----
  	
      private int generationCounter;
! //    private double averageRandomFitness;
! //    private double standardDeviationOfRandomFitness;
      
      #endregion
***************
*** 134,153 ****
      }
      
!     /// <summary>
!     /// Average fitness of a group of genomes (this.numberOfGenomesForAverageRandomFitness)
!     /// chosen at random
!     /// </summary>
!     public double AverageRandomFitness
!     {
!       get{return this.averageRandomFitness;}
!     }
!     /// <summary>
!     /// Standard deviation of fitness of a group of genomes (this.numberOfGenomesForAverageRandomFitness)
!     /// chosen at random
!     /// </summary>
!     public double StandardDeviationOfRandomFitness
!     {
!       get{return this.standardDeviationOfRandomFitness;}
!     }
      #endregion
  
--- 134,153 ----
      }
      
! //    /// <summary>
! //    /// Average fitness of a group of genomes (this.numberOfGenomesForAverageRandomFitness)
! //    /// chosen at random
! //    /// </summary>
! //    public double AverageRandomFitness
! //    {
! //      get{return this.averageRandomFitness;}
! //    }
! //    /// <summary>
! //    /// Standard deviation of fitness of a group of genomes (this.numberOfGenomesForAverageRandomFitness)
! //    /// chosen at random
! //    /// </summary>
! //    public double StandardDeviationOfRandomFitness
! //    {
! //      get{return this.standardDeviationOfRandomFitness;}
! //    }
      #endregion
  
***************
*** 220,255 ****
      }
      
!     /// <summary>
!     /// It updates AverageRandomFitness and StandardDeviationOfRandomFitness
!     /// properties with the average and std dev fitness
!     /// of a given group of genomes chosen at random
!     /// </summary>
!     public void CalculateRandomFitness()
!     {
!       this.createFirstGeneration(false);
!       this.averageRandomFitness = this.totalSpecialFitnessForRouletteSelection/this.currentGeneration.Count;
!       this.standardDeviationOfRandomFitness = this.calculateRandomFitness_getStdDevOfRandomFitness();
!     }
!     /// <summary>
!     /// It updates StandardDeviationOfRandomFitness property with the std dev of
!     /// fitness of a given group of genomes chosen at random
!     /// </summary>
!     private double calculateRandomFitness_getStdDevOfRandomFitness()
!     {
!       double[] fitnesses = new double[this.currentGeneration.Count];
!       for(int i = 0; i<this.currentGeneration.Count; i++)
!         fitnesses[i] = ((Genome)this.currentGeneration[i]).Fitness;
!       return QuantProject.ADT.Statistics.BasicFunctions.StdDev(fitnesses);
!     }
      
!     private void run_calculateRandomFitness()
!     {
!       GeneticOptimizer GOForAverageRandomFitness = 
!         new GeneticOptimizer(this.genomeManager, ConstantsProvider.NumGenomesForRandomFitnessComputation,
!                              0,ConstantsProvider.SeedForRandomGenerator);
!       GOForAverageRandomFitness.CalculateRandomFitness(); 
!       this.averageRandomFitness = GOForAverageRandomFitness.AverageRandomFitness;
!       this.standardDeviationOfRandomFitness = GOForAverageRandomFitness.StandardDeviationOfRandomFitness;
!     }
      /// <summary>
      /// Method to start the GeneticOptmizer
--- 220,255 ----
      }
      
! //    /// <summary>
! //    /// It updates AverageRandomFitness and StandardDeviationOfRandomFitness
! //    /// properties with the average and std dev fitness
! //    /// of a given group of genomes chosen at random
! //    /// </summary>
! //    public void CalculateRandomFitness()
! //    {
! //      this.createFirstGeneration(false);
! //      this.averageRandomFitness = this.totalSpecialFitnessForRouletteSelection/this.currentGeneration.Count;
! //      this.standardDeviationOfRandomFitness = this.calculateRandomFitness_getStdDevOfRandomFitness();
! //    }
! //    /// <summary>
! //    /// It updates StandardDeviationOfRandomFitness property with the std dev of
! //    /// fitness of a given group of genomes chosen at random
! //    /// </summary>
! //    private double calculateRandomFitness_getStdDevOfRandomFitness()
! //    {
! //      double[] fitnesses = new double[this.currentGeneration.Count];
! //      for(int i = 0; i<this.currentGeneration.Count; i++)
! //        fitnesses[i] = ((Genome)this.currentGeneration[i]).Fitness;
! //      return QuantProject.ADT.Statistics.BasicFunctions.StdDev(fitnesses);
! //    }
      
! //    private void run_calculateRandomFitness()
! //    {
! //      GeneticOptimizer GOForAverageRandomFitness = 
! //        new GeneticOptimizer(this.genomeManager, ConstantsProvider.NumGenomesForRandomFitnessComputation,
! //                             0,ConstantsProvider.SeedForRandomGenerator);
! //      GOForAverageRandomFitness.CalculateRandomFitness(); 
! //      this.averageRandomFitness = GOForAverageRandomFitness.AverageRandomFitness;
! //      this.standardDeviationOfRandomFitness = GOForAverageRandomFitness.StandardDeviationOfRandomFitness;
! //    }
      /// <summary>
      /// Method to start the GeneticOptmizer