Changeset 17745 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.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.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs (modified) (1 diff)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs

@@ -103 +103 @@
     }
 
-    public override void Analyze(RealVector[] realVectors, double[] qualities, ResultCollection results, IRandom random) {
-      var best = GetBestSolution(realVectors, qualities);
+    //TODO: change to new analyze interface
+    public override void Analyze(ISingleObjectiveSolutionContext<RealVector>[] solutionContexts, IRandom random) {
+      base.Analyze(solutionContexts, random);
 
-      DoubleValue bestKnownQuality = BestKnownQualityParameter.Value;
-      RealVector bestKnownSolution = null;
-      var bestKnownUpdate = bestKnownQuality == null || IsBetter(best.Item2, bestKnownQuality.Value);
-      if (bestKnownUpdate) {
-        if (bestKnownQuality != null) bestKnownQuality.Value = best.Item2;
-        else BestKnownQualityParameter.Value = bestKnownQuality = new DoubleValue(best.Item2);
-        BestKnownSolutionParameter.Value = bestKnownSolution = (RealVector)best.Item1.Clone();
-      }
+      //TODO: reimplement code below using results directly
 
-      SingleObjectiveTestFunctionSolution solution = null;
-      if (results.TryGetValue("Best Solution", out var res) && res.Value != null) {
-        solution = (SingleObjectiveTestFunctionSolution)res.Value;
-        if (IsBetter(best.Item2, solution.BestQuality.Value)) {
-          solution.BestRealVector = (RealVector)best.Item1.Clone();
-          solution.BestQuality = new DoubleValue(best.Item2);
-        }
-      } else {
-        solution = new SingleObjectiveTestFunctionSolution((RealVector)best.Item1.Clone(),
-                                                           new DoubleValue(best.Item2),
-                                                           TestFunctionParameter.Value) {
-          BestKnownRealVector = bestKnownSolution,
-          Bounds = BoundsRefParameter.Value
-        };
-        results.AddOrUpdateResult("Best Solution", solution);
-      }
-      if (best.Item1.Length == 2) solution.Population = new ItemArray<RealVector>(realVectors.Select(x => (RealVector)x.Clone()));
-      if (bestKnownUpdate) solution.BestKnownRealVector = bestKnownSolution;
+      //var best = GetBestSolution(realVectors, qualities);
+
+      //DoubleValue bestKnownQuality = BestKnownQualityParameter.Value;
+      //RealVector bestKnownSolution = null;
+      //var bestKnownUpdate = bestKnownQuality == null || IsBetter(best.Item2, bestKnownQuality.Value);
+      //if (bestKnownUpdate) {
+      //  if (bestKnownQuality != null) bestKnownQuality.Value = best.Item2;
+      //  else BestKnownQualityParameter.Value = bestKnownQuality = new DoubleValue(best.Item2);
+      //  BestKnownSolutionParameter.Value = bestKnownSolution = (RealVector)best.Item1.Clone();
+      //}
+
+      //SingleObjectiveTestFunctionSolution solution = null;
+      //if (results.TryGetValue("Best Solution", out var res) && res.Value != null) {
+      //  solution = (SingleObjectiveTestFunctionSolution)res.Value;
+      //  if (IsBetter(best.Item2, solution.BestQuality.Value)) {
+      //    solution.BestRealVector = (RealVector)best.Item1.Clone();
+      //    solution.BestQuality = new DoubleValue(best.Item2);
+      //  }
+      //} else {
+      //  solution = new SingleObjectiveTestFunctionSolution((RealVector)best.Item1.Clone(),
+      //                                                     new DoubleValue(best.Item2),
+      //                                                     TestFunctionParameter.Value) {
+      //    BestKnownRealVector = bestKnownSolution,
+      //    Bounds = BoundsRefParameter.Value
+      //  };
+      //  results.AddOrUpdateResult("Best Solution", solution);
+      //}
+      //if (best.Item1.Length == 2) solution.Population = new ItemArray<RealVector>(realVectors.Select(x => (RealVector)x.Clone()));
+      //if (bestKnownUpdate) solution.BestKnownRealVector = bestKnownSolution;
     }