Changeset 13964

Timestamp:

07/01/16 09:14:59 (8 years ago)

Author:

pfleck

Message:

#2527 Removed some commented out code.

File:

• trunk/sources/HeuristicLab.Algorithms.ALPS/3.3/AlpsOffspringSelectionGeneticAlgorithm.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Algorithms.ALPS/3.3/AlpsOffspringSelectionGeneticAlgorithm.cs

@@ -284 +284 @@
     [Storable]
     private ComparisonTerminator<IntValue> generationsTerminator;
-    //[Storable]
-    //private ComparisonTerminator<DoubleValue> selectionPressureTerminator;
     [Storable]
     private ComparisonTerminator<IntValue> evaluationsTerminator;
@@ -314 +312 @@
       currentSuccessRatioAnalyzer = cloner.Clone(original.currentSuccessRatioAnalyzer);
       generationsTerminator = cloner.Clone(original.generationsTerminator);
-      //selectionPressureTerminator = cloner.Clone(original.selectionPressureTerminator);
       evaluationsTerminator = cloner.Clone(original.evaluationsTerminator);
       qualityTerminator = cloner.Clone(original.qualityTerminator);
@@ -470 +467 @@
       #region Create terminators
       generationsTerminator = new ComparisonTerminator<IntValue>("Generations", ComparisonType.Less, new IntValue(1000)) { Name = "Generations" };
-      //selectionPressureTerminator = new ComparisonTerminator<DoubleValue>("SelectionPressure", ComparisonType.Less, MaximumSelectionPressureParameter);
       evaluationsTerminator = new ComparisonTerminator<IntValue>("EvaluatedSolutions", ComparisonType.Less, new IntValue(int.MaxValue)) { Name = "Evaluations" };
       qualityTerminator = new SingleObjectiveQualityTerminator() { Name = "Quality" };
@@ -722 +718 @@
       Analyzer.Operators.Add(ageAnalyzer, ageAnalyzer.EnabledByDefault);
       Analyzer.Operators.Add(ageDistributionAnalyzer, ageDistributionAnalyzer.EnabledByDefault);
-      Analyzer.Operators.Add(selectionPressureAnalyzer, false); // find way to make history "pretty"
+      Analyzer.Operators.Add(selectionPressureAnalyzer, false);
       selectionPressureAnalyzer.ValueParameter.Depth = 1; // Adding analyzer sets depth to 2
       Analyzer.Operators.Add(currentSuccessRatioAnalyzer, false);
@@ -774 +770 @@
       var newTerminators = new Dictionary<ITerminator, bool> {
         {generationsTerminator, !Terminators.Operators.Contains(generationsTerminator) || Terminators.Operators.ItemChecked(generationsTerminator)},
-        //{selectionPressureTerminator, !Terminators.Operators.Contains(selectionPressureTerminator) || Terminators.Operators.ItemChecked(selectionPressureTerminator)},
         {evaluationsTerminator, Terminators.Operators.Contains(evaluationsTerminator) && Terminators.Operators.ItemChecked(evaluationsTerminator)},
         {qualityTerminator, Terminators.Operators.Contains(qualityTerminator) && Terminators.Operators.ItemChecked(qualityTerminator) },