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

Timestamp:

09/15/20 13:53:11 (4 years ago)

Author:

mkommend

Message:

#2971: Added first draft of results implementation and problem adaptation.

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.cs (modified) (1 diff)

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

@@ -103 +103 @@
     }
 
-    public override void Analyze(BinaryVector[] solutions, double[] qualities, ResultCollection results, IRandom random) {
-      base.Analyze(solutions, qualities, results, random);
-
-      var best = GetBestSolution(solutions, qualities);
-
-      if (double.IsNaN(BestKnownQuality) || IsBetter(best.Item2, BestKnownQuality)) {
-        BestKnownQuality = best.Item2;
-        BestKnownSolution = (BinaryVector)best.Item1.Clone();
-      }
-
-      IResult result;
-      if (!results.TryGetValue("Best Knapsack Solution", out result)) {
-        results.Add(result = new Result("Best Knapsack Solution", typeof(KnapsackSolution)));
-      }
-      var solution = (KnapsackSolution)result.Value;
-      if (solution == null) {
-        solution = new KnapsackSolution((BinaryVector)best.Item1.Clone(), new DoubleValue(best.Item2),
-          KnapsackCapacityParameter.Value, WeightsParameter.Value, ValuesParameter.Value);
-        result.Value = solution;
-      } else {
-        if (IsBetter(best.Item2, solution.Quality.Value)) {
-          solution.BinaryVector = (BinaryVector)best.Item1.Clone();
-          solution.Quality = new DoubleValue(best.Item2);
-          solution.Capacity = KnapsackCapacityParameter.Value;
-          solution.Weights = WeightsParameter.Value;
-          solution.Values = ValuesParameter.Value;
-        }
-      }
+    public override void Analyze(ISingleObjectiveSolutionContext<BinaryVector>[] solutionContexts, IRandom random) {
+      base.Analyze(solutionContexts, random);
+
+      //TODO reimplement code below using results directly
+
+      //var best = GetBestSolution(solutions, qualities);
+
+      //if (double.IsNaN(BestKnownQuality) || IsBetter(best.Item2, BestKnownQuality)) {
+      //  BestKnownQuality = best.Item2;
+      //  BestKnownSolution = (BinaryVector)best.Item1.Clone();
+      //}
+
+      //IResult result;
+      //if (!results.TryGetValue("Best Knapsack Solution", out result)) {
+      //  results.Add(result = new Result("Best Knapsack Solution", typeof(KnapsackSolution)));
+      //}
+      //var solution = (KnapsackSolution)result.Value;
+      //if (solution == null) {
+      //  solution = new KnapsackSolution((BinaryVector)best.Item1.Clone(), new DoubleValue(best.Item2),
+      //    KnapsackCapacityParameter.Value, WeightsParameter.Value, ValuesParameter.Value);
+      //  result.Value = solution;
+      //} else {
+      //  if (IsBetter(best.Item2, solution.Quality.Value)) {
+      //    solution.BinaryVector = (BinaryVector)best.Item1.Clone();
+      //    solution.Quality = new DoubleValue(best.Item2);
+      //    solution.Capacity = KnapsackCapacityParameter.Value;
+      //    solution.Weights = WeightsParameter.Value;
+      //    solution.Values = ValuesParameter.Value;
+      //  }
+      //}
     }