Changeset 14173

Timestamp:

07/22/16 06:34:07 (8 years ago)

Author:

abeham

Message:

#2527: merged 13402,13964 to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.ALPS (modified) (1 prop)
• HeuristicLab.Algorithms.ALPS/3.3/AlpsOffspringSelectionGeneticAlgorithm.cs (copied) (copied from trunk/sources/HeuristicLab.Algorithms.ALPS/3.3/AlpsOffspringSelectionGeneticAlgorithm.cs) (5 diffs)
• HeuristicLab.Algorithms.ALPS/3.3/AlpsOffspringSelectionGeneticAlgorithmMainLoop.cs (copied) (copied from trunk/sources/HeuristicLab.Algorithms.ALPS/3.3/AlpsOffspringSelectionGeneticAlgorithmMainLoop.cs)
• HeuristicLab.Algorithms.ALPS/3.3/AlpsOffspringSelectionGeneticAlgorithmMainOperator.cs (copied) (copied from trunk/sources/HeuristicLab.Algorithms.ALPS/3.3/AlpsOffspringSelectionGeneticAlgorithmMainOperator.cs)
• HeuristicLab.Algorithms.ALPS/3.3/AlpsOffspringSelector.cs (copied) (copied from trunk/sources/HeuristicLab.Algorithms.ALPS/3.3/AlpsOffspringSelector.cs)
• HeuristicLab.Algorithms.ALPS/3.3/HeuristicLab.Algorithms.ALPS-3.3.csproj (modified) (1 diff)

stable/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) },

stable/HeuristicLab.Algorithms.ALPS/3.3/HeuristicLab.Algorithms.ALPS-3.3.csproj

@@ -85 +85 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AlpsOffspringSelectionGeneticAlgorithmMainLoop.cs" />
+    <Compile Include="AlpsOffspringSelectionGeneticAlgorithm.cs" />
     <Compile Include="AlpsGeneticAlgorithmMainOperator.cs" />
+    <Compile Include="AlpsOffspringSelectionGeneticAlgorithmMainOperator.cs" />
+    <Compile Include="AlpsOffspringSelector.cs" />
     <Compile Include="ReseedingController.cs" />
     <Compile Include="ResultsHistoryWiper.cs" />