Changeset 4086 for trunk

Timestamp:

07/22/10 16:33:58 (14 years ago)

Author:

abeham

Message:

#1040

• Added a very very basic analyzer for listing the qualities on the pareto front

Location:

trunk/sources

Files:

• HeuristicLab.Algorithms.NSGA2/3.3/BasicMultiObjectiveQualityAnalyzer.cs (added)
• HeuristicLab.Algorithms.NSGA2/3.3/HeuristicLab.Algorithms.NSGA2-3.3.csproj (modified) (1 diff)
• HeuristicLab.Algorithms.NSGA2/3.3/NSGA2.cs (modified) (5 diffs)
• HeuristicLab.Problems.TestFunctions/3.3/Analyzers/BestSingleObjectiveTestFunctionSolutionAnalyzer.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Algorithms.NSGA2/3.3/HeuristicLab.Algorithms.NSGA2-3.3.csproj

@@ -101 +101 @@
     <None Include="HeuristicLab.snk" />
     <None Include="HeuristicLabAlgorithmsNSGA2Plugin.cs.frame" />
+    <Compile Include="BasicMultiObjectiveQualityAnalyzer.cs" />
     <Compile Include="CrowdedComparisonSorter.cs" />
     <Compile Include="CrowdedTournamentSelector.cs" />

trunk/sources/HeuristicLab.Algorithms.NSGA2/3.3/NSGA2.cs

@@ -139 +139 @@
     #endregion
 
+    [Storable]
+    private BasicMultiObjectiveQualityAnalyzer basicMOQualityAnalyzer;
+
     [StorableConstructor]
     public NSGA2(bool deserializing) : base(deserializing) { }
@@ -157 +160 @@
       RankAndCrowdingSorter rankAndCrowdingSorter = new RankAndCrowdingSorter();
       NSGA2MainLoop mainLoop = new NSGA2MainLoop();
+      
       OperatorGraph.InitialOperator = randomCreator;
 
@@ -191 +195 @@
       ParameterizeSelectors();
 
+      basicMOQualityAnalyzer = new BasicMultiObjectiveQualityAnalyzer();
+      basicMOQualityAnalyzer.RankParameter.ActualName = "Rank";
+      basicMOQualityAnalyzer.RankParameter.Depth = 1;
+      basicMOQualityAnalyzer.ResultsParameter.ActualName = "Results";
+      ParameterizeAnalyzers();
+      UpdateAnalyzers();
+
       AttachEventHandlers();
     }
@@ -298 +309 @@
     }
     private void ParameterizeAnalyzers() {
-      // TODO: Parameterize Analyzers
+      if (Problem != null) {
+        basicMOQualityAnalyzer.QualitiesParameter.ActualName = Problem.Evaluator.QualitiesParameter.ActualName;
+        basicMOQualityAnalyzer.QualitiesParameter.Depth = 1;
+      }
     }
     private void ParameterizeIterationBasedOperators() {
@@ -337 +351 @@
         }
       }
+      Analyzer.Operators.Add(basicMOQualityAnalyzer);
     }
     #endregion

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Analyzers/BestSingleObjectiveTestFunctionSolutionAnalyzer.cs

@@ -70 +70 @@
     }
 
+    [StorableConstructor]
     protected BestSingleObjectiveTestFunctionSolutionAnalyzer(bool deserializing) : base(deserializing) { }
     public BestSingleObjectiveTestFunctionSolutionAnalyzer()