Changeset 17745 for branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessCovarianceOptimizationProblem.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.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessCovarianceOptimizationProblem.cs (modified) (1 diff)

branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessCovarianceOptimizationProblem.cs

@@ -274 +274 @@
     }
 
-    public override void Analyze(ISymbolicExpressionTree[] trees, double[] qualities, ResultCollection results, IRandom random) {
-      if (!results.ContainsKey("Best Solution Quality")) {
-        results.Add(new Result("Best Solution Quality", typeof(DoubleValue)));
-      }
-      if (!results.ContainsKey("Best Tree")) {
-        results.Add(new Result("Best Tree", typeof(ISymbolicExpressionTree)));
-      }
-      if (!results.ContainsKey("Best Solution")) {
-        results.Add(new Result("Best Solution", typeof(GaussianProcessRegressionSolution)));
-      }
-
-      var bestQuality = qualities.Max();
-
-      if (results["Best Solution Quality"].Value == null || bestQuality > ((DoubleValue)results["Best Solution Quality"].Value).Value) {
-        var bestIdx = Array.IndexOf(qualities, bestQuality);
-        var bestClone = (ISymbolicExpressionTree)trees[bestIdx].Clone();
-        results["Best Tree"].Value = bestClone;
-        results["Best Solution Quality"].Value = new DoubleValue(bestQuality);
-        results["Best Solution"].Value = CreateSolution();
-      }
+
+    public override void Analyze(ISingleObjectiveSolutionContext<ISymbolicExpressionTree>[] solutionContexts, IRandom random) {
+      //TODO: reimplement code below with results parameter
+
+      //if (!results.ContainsKey("Best Solution Quality")) {
+      //  results.Add(new Result("Best Solution Quality", typeof(DoubleValue)));
+      //}
+      //if (!results.ContainsKey("Best Tree")) {
+      //  results.Add(new Result("Best Tree", typeof(ISymbolicExpressionTree)));
+      //}
+      //if (!results.ContainsKey("Best Solution")) {
+      //  results.Add(new Result("Best Solution", typeof(GaussianProcessRegressionSolution)));
+      //}
+
+      //var bestQuality = qualities.Max();
+
+      //if (results["Best Solution Quality"].Value == null || bestQuality > ((DoubleValue)results["Best Solution Quality"].Value).Value) {
+      //  var bestIdx = Array.IndexOf(qualities, bestQuality);
+      //  var bestClone = (ISymbolicExpressionTree)trees[bestIdx].Clone();
+      //  results["Best Tree"].Value = bestClone;
+      //  results["Best Solution Quality"].Value = new DoubleValue(bestQuality);
+      //  results["Best Solution"].Value = CreateSolution();
+      //}
     }