Changeset 5143 for trunk/sources/HeuristicLab.Algorithms.NSGA2/3.3/NSGA2.cs

Timestamp:

12/21/10 01:08:34 (13 years ago)

Author:

abeham

Message:

#1040

• Merged NSGA-II into trunk
• Ranking and crowding operators moved to HeuristicLab.Optimization.Operators
• CrowdedTournamentSelector moved to HeuristicLab.Selection
• Pareto front analyzer moved to HeuristicLab.Analysis with a base class should there be more (as discussed with swagner and mkommend)

Location:

trunk/sources/HeuristicLab.Algorithms.NSGA2

Files:

• . (copied) (copied from branches/NSGA2/HeuristicLab.Algorithms.NSGA2)
• 3.3/NSGA2.cs (modified) (4 diffs)

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

@@ -147 +147 @@
 
     [Storable]
-    private BasicMultiObjectiveQualityAnalyzer basicMOQualityAnalyzer;
+    private RankBasedParetoFrontAnalyzer paretoFrontAnalyzer;
 
     [StorableConstructor]
     protected NSGA2(bool deserializing) : base(deserializing) { }
     protected NSGA2(NSGA2 original, Cloner cloner) : base (original, cloner) {
-      basicMOQualityAnalyzer = (BasicMultiObjectiveQualityAnalyzer)cloner.Clone(original.basicMOQualityAnalyzer);
+      paretoFrontAnalyzer = (RankBasedParetoFrontAnalyzer)cloner.Clone(original.paretoFrontAnalyzer);
       AttachEventHandlers();
     }
@@ -207 +207 @@
       ParameterizeSelectors();
 
-      basicMOQualityAnalyzer = new BasicMultiObjectiveQualityAnalyzer();
-      basicMOQualityAnalyzer.RankParameter.ActualName = "Rank";
-      basicMOQualityAnalyzer.RankParameter.Depth = 1;
-      basicMOQualityAnalyzer.ResultsParameter.ActualName = "Results";
+      paretoFrontAnalyzer = new RankBasedParetoFrontAnalyzer();
+      paretoFrontAnalyzer.RankParameter.ActualName = "Rank";
+      paretoFrontAnalyzer.RankParameter.Depth = 1;
+      paretoFrontAnalyzer.ResultsParameter.ActualName = "Results";
       ParameterizeAnalyzers();
       UpdateAnalyzers();
@@ -332 +332 @@
     private void ParameterizeAnalyzers() {
       if (Problem != null) {
-        basicMOQualityAnalyzer.QualitiesParameter.ActualName = Problem.Evaluator.QualitiesParameter.ActualName;
-        basicMOQualityAnalyzer.QualitiesParameter.Depth = 1;
+        paretoFrontAnalyzer.QualitiesParameter.ActualName = Problem.Evaluator.QualitiesParameter.ActualName;
+        paretoFrontAnalyzer.QualitiesParameter.Depth = 1;
       }
     }
@@ -373 +373 @@
         }
       }
-      Analyzer.Operators.Add(basicMOQualityAnalyzer);
+      Analyzer.Operators.Add(paretoFrontAnalyzer);
     }
     #endregion