Changeset 4067

Timestamp:

07/22/10 00:11:15 (14 years ago)

Author:

abeham

Message:

#1040

• Fixed some bugs in NSGA-II

Location:

trunk/sources/HeuristicLab.Algorithms.NSGA2/3.3

Files:

• CrowdedComparisonSorter.cs (modified) (1 diff)
• CrowdingDistanceAssignment.cs (modified) (2 diffs)
• FastNonDominatedSort.cs (modified) (3 diffs)
• NSGA2.cs (modified) (4 diffs)

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

@@ -58 +58 @@
       int[] indices = Enumerable.Range(0, size).ToArray();
 
-      Array.Sort(indices, new CustomComparer(ranks, distances));
       IScope[] scopes = ExecutionContext.Scope.SubScopes.ToArray();
-      Array.Sort(indices, scopes);
+      Array.Sort(indices, scopes, new CustomComparer(ranks, distances));
       ExecutionContext.Scope.SubScopes.Clear();
       ExecutionContext.Scope.SubScopes.AddRange(scopes);

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

@@ -70 +70 @@
         double minQuality = qualities[0][m];
         double maxQuality = qualities[populationSize - 1][m];
-        for (int i = 2; i < populationSize - 1; i++) {
+        for (int i = 1; i < populationSize - 1; i++) {
           distances[i].Value += (qualities[i + 1][m] - qualities[i - 1][m]) / (maxQuality - minQuality);
         }
@@ -82 +82 @@
       for (int i = 0; i < populationSize; i++)
         distances[i] = new DoubleValue(0);
+
+      CrowdingDistanceParameter.ActualValue = new ItemArray<DoubleValue>(distances);
       
       Apply(qualities, distances);
 
-      CrowdingDistanceParameter.ActualValue = new ItemArray<DoubleValue>(distances);
       return base.Apply();
     }

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

@@ -72 +72 @@
       for (int pI = 0; pI < populationSize - 1; pI++) {
         IScope p = scope.SubScopes[pI];
-        dominatedScopes[p] = new List<int>();
+        if (!dominatedScopes.ContainsKey(p))
+          dominatedScopes[p] = new List<int>();
         for (int qI = pI + 1; qI < populationSize; qI++) {
           DominationResult test = Dominates(qualities[pI], qualities[qI], maximization);
@@ -80 +81 @@
           } else if (test == DominationResult.IsDominated) {
             dominationCounter[pI] += 1;
+            if (!dominatedScopes.ContainsKey(scope.SubScopes[qI]))
+              dominatedScopes.Add(scope.SubScopes[qI], new List<int>());
             dominatedScopes[scope.SubScopes[qI]].Add(pI);
           }
@@ -98 +101 @@
         ScopeList nextFront = new ScopeList();
         foreach (IScope p in fronts[i]) {
-          for (int k = 0; k < dominatedScopes[p].Count; k++) {
-            int dominatedScope = dominatedScopes[p][k];
-            dominationCounter[k] -= 1;
-            if (dominationCounter[k] == 0) {
-              rank[k] = new IntValue(i + 1);
-              nextFront.Add(scope.SubScopes[k]);
+          if (dominatedScopes.ContainsKey(p)) {
+            for (int k = 0; k < dominatedScopes[p].Count; k++) {
+              int dominatedScope = dominatedScopes[p][k];
+              dominationCounter[dominatedScope] -= 1;
+              if (dominationCounter[dominatedScope] == 0) {
+                rank[dominatedScope] = new IntValue(i + 1);
+                nextFront.Add(scope.SubScopes[dominatedScope]);
+              }
             }
           }

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

@@ -208 +208 @@
       foreach (IOperator op in Problem.Operators) ParameterizeStochasticOperator(op);
       ParameterizeSolutionsCreator();
+      ParameterizeRankAndCrowdingSorter();
       ParameterizeMainLoop();
       ParameterizeSelectors();
@@ -226 +227 @@
       ParameterizeStochasticOperator(Problem.Evaluator);
       ParameterizeSolutionsCreator();
+      ParameterizeRankAndCrowdingSorter();
       ParameterizeMainLoop();
       ParameterizeSelectors();
@@ -251 +253 @@
     }
     private void Evaluator_QualitiesParameter_ActualNameChanged(object sender, EventArgs e) {
+      ParameterizeRankAndCrowdingSorter();
       ParameterizeMainLoop();
       ParameterizeSelectors();
@@ -269 +272 @@
       SolutionsCreator.EvaluatorParameter.ActualName = Problem.EvaluatorParameter.Name;
       SolutionsCreator.SolutionCreatorParameter.ActualName = Problem.SolutionCreatorParameter.Name;
+    }
+    private void ParameterizeRankAndCrowdingSorter() {
+      RankAndCrowdingSorter.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
+      RankAndCrowdingSorter.QualitiesParameter.ActualName = Problem.Evaluator.QualitiesParameter.ActualName;
     }
     private void ParameterizeMainLoop() {