Changeset 12996 for branches

Timestamp:

10/09/15 15:37:58 (9 years ago)

Author:

pfleck

Message:

#2269

• Added age progression and distribution analyzers per default but disabled.
• Added all regular analyzers as layer analyzers but disabled.
• Removed obsolete EvaluatedSolutionsHistoryAnalyzer.

Location:

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3

Files:

• AlpsGeneticAlgorithm.cs (modified) (7 diffs)
• Analyzers/EvaluatedSolutionsHistoryAnalyzer.cs (deleted)
• Analyzers/OldestAverageYoungestAgeAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Algorithms.ALPS-3.3.csproj (modified) (1 diff)

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/AlpsGeneticAlgorithm.cs

@@ -238 +238 @@
     [Storable]
     private BestAverageWorstQualityAnalyzer layerQualityAnalyzer;
+    [Storable]
+    private OldestAverageYoungestAgeAnalyzer ageAnalyzer;
+    [Storable]
+    private OldestAverageYoungestAgeAnalyzer layerAgeAnalyzer;
+    [Storable]
+    private AgeDistributionAnalyzer ageDistributionAnalyzer;
+    [Storable]
+    private AgeDistributionAnalyzer layerAgeDistributionAnalyzer;
     #endregion
 
@@ -251 +259 @@
     #endregion
 
+    #region Constructors
     [StorableConstructor]
     private AlpsGeneticAlgorithm(bool deserializing)
@@ -262 +271 @@
       qualityAnalyzer = cloner.Clone(original.qualityAnalyzer);
       layerQualityAnalyzer = cloner.Clone(original.layerQualityAnalyzer);
+      ageAnalyzer = cloner.Clone(original.ageAnalyzer);
+      layerAgeAnalyzer = cloner.Clone(original.layerAgeAnalyzer);
+      ageDistributionAnalyzer = cloner.Clone(original.ageDistributionAnalyzer);
+      layerAgeDistributionAnalyzer = cloner.Clone(original.layerAgeDistributionAnalyzer);
       generationsTerminator = cloner.Clone(original.generationsTerminator);
       evaluationsTerminator = cloner.Clone(original.evaluationsTerminator);
@@ -377 +390 @@
       qualityAnalyzer = new BestAverageWorstQualityAnalyzer();
       layerQualityAnalyzer = new BestAverageWorstQualityAnalyzer();
+      ageAnalyzer = new OldestAverageYoungestAgeAnalyzer();
+      layerAgeAnalyzer = new OldestAverageYoungestAgeAnalyzer();
+      ageDistributionAnalyzer = new AgeDistributionAnalyzer();
+      layerAgeDistributionAnalyzer = new AgeDistributionAnalyzer();
       #endregion
 
@@ -400 +417 @@
       Initialize();
     }
+    #endregion
 
     #region Events
@@ -569 +587 @@
       qualityAnalyzer.ResultsParameter.Hidden = true;
       qualityAnalyzer.QualityParameter.Depth = 2;
-      layerQualityAnalyzer.ResultsParameter.ActualName = "Results";
+      layerQualityAnalyzer.ResultsParameter.ActualName = "LayerResults";
       layerQualityAnalyzer.ResultsParameter.Hidden = true;
       layerQualityAnalyzer.QualityParameter.Depth = 1;
@@ -659 +677 @@
 
       Analyzer.Operators.Add(qualityAnalyzer, qualityAnalyzer.EnabledByDefault);
-      LayerAnalyzer.Operators.Add(layerQualityAnalyzer, layerQualityAnalyzer.EnabledByDefault);
+      Analyzer.Operators.Add(ageAnalyzer, ageAnalyzer.EnabledByDefault);
+      Analyzer.Operators.Add(ageDistributionAnalyzer, ageDistributionAnalyzer.EnabledByDefault);
+      LayerAnalyzer.Operators.Add(layerQualityAnalyzer, false);
+      LayerAnalyzer.Operators.Add(layerAgeAnalyzer, false);
+      LayerAnalyzer.Operators.Add(layerAgeDistributionAnalyzer, false);
 
       if (Problem != null) {
         foreach (var analyzer in Problem.Operators.OfType<IAnalyzer>()) {
           Analyzer.Operators.Add(analyzer, analyzer.EnabledByDefault);
+          LayerAnalyzer.Operators.Add((IAnalyzer)analyzer.Clone(), false);
         }
       }

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/Analyzers/OldestAverageYoungestAgeAnalyzer.cs

@@ -58 +58 @@
     #region Properties
     public bool EnabledByDefault {
-      get { return true; }
+      get { return false; }
     }
     private OldestAverageYoungestAgeCalculator OldestAverageYoungestAgeCalculator {

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

@@ -133 +133 @@
   <ItemGroup>
     <Compile Include="AgeInheritance.cs" />
-    <Compile Include="Analyzers\EvaluatedSolutionsHistoryAnalyzer.cs" />
     <Compile Include="Analyzers\OldestAverageYoungestAgeAnalyzer.cs" />
     <Compile Include="Analyzers\AgeDistributionAnalyzer.cs" />