Changeset 17382 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.cs

Timestamp:

12/18/19 16:11:21 (4 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.Knapsack/3.3/KnapsackProblem.cs (modified) (2 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.cs

@@ -97 +97 @@
     }
 
-    public override double Evaluate(BinaryVector solution, IRandom random, CancellationToken cancellationToken) {
+    public override ISingleObjectiveEvaluationResult Evaluate(BinaryVector solution, IRandom random, CancellationToken cancellationToken) {
       var totalWeight = 0.0;
       var totalValue = 0.0;
@@ -105 +105 @@
         totalValue += Values[i];
       }
-      return totalWeight > KnapsackCapacity ? KnapsackCapacity - totalWeight : totalValue;
+      var quality = totalWeight > KnapsackCapacity ? KnapsackCapacity - totalWeight : totalValue;
+      return new SingleObjectiveEvaluationResult(quality);
     }