Changeset 17382 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.GraphColoring

Timestamp:

12/18/19 16:11:21 (5 years ago)

Author:

mkommend

Message:

#2521: Refactored single-objective problems to use EvaluationResult instead of double as return type from Evaluate.

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.GraphColoring/3.3/GraphColoringProblem.cs (modified) (3 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.GraphColoring/3.3/GraphColoringProblem.cs

@@ -129 +129 @@
     }
 
-    public override double Evaluate(LinearLinkage lle, IRandom random, CancellationToken cancellationToken) {
+    public override ISingleObjectiveEvaluationResult Evaluate(LinearLinkage lle, IRandom random, CancellationToken cancellationToken) {
       var adjList = adjacencyListParameter.Value;
       var llee = lle.ToEndLinks(); // LLE-e encoding uses the highest indexed member as group number
+
+      double quality = double.NaN;
 
       switch (FitnessFunction) {
@@ -142 +144 @@
             var mag = Math.Pow(10, -(int)Math.Ceiling(Math.Log10(llee.Length)));
             // the value is e.g. 4.03 for 4 conflicts with 3 colors (and less than 100 nodes)
-            return conflicts + colors * mag;
+            quality = conflicts + colors * mag;
+            break;
           }
         case FitnessFunction.Penalized: {
@@ -157 +160 @@
               if (color1 == color2) colors[color1].ConflictCount++;
             }
-            return 2 * colors.Sum(x => x.Value.ColorCount * x.Value.ConflictCount) - colors.Sum(x => x.Value.ColorCount * x.Value.ColorCount);
+            quality = 2 * colors.Sum(x => x.Value.ColorCount * x.Value.ConflictCount) - colors.Sum(x => x.Value.ColorCount * x.Value.ColorCount);
+            break;
           }
         default: throw new InvalidOperationException(string.Format("Unknown fitness function {0}.", FitnessFunction));
       }
+
+      return new SingleObjectiveEvaluationResult(quality);
     }