Changeset 3894 for trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Analyzers

Timestamp:

06/02/10 21:34:31 (14 years ago)

Author:

abeham

Message:

#1029

• Added Bounds to SingleObjectiveTestFunctionSolution
• This would break persistence, so I added a CompatibilityMethod (which can be removed again once moving to 3.4)

File:

• trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Analyzers/BestSingleObjectiveTestFunctionSolutionAnalyzer.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Analyzers/BestSingleObjectiveTestFunctionSolutionAnalyzer.cs

@@ -69 +69 @@
       get { return (IValueLookupParameter<ISingleObjectiveTestFunctionProblemEvaluator>)Parameters["Evaluator"]; }
     }
+    public ILookupParameter<DoubleMatrix> BoundsParameter {
+      get { return (ILookupParameter<DoubleMatrix>)Parameters["Bounds"]; }
+    }
 
+    protected BestSingleObjectiveTestFunctionSolutionAnalyzer(bool deserializing) : base(deserializing) { }
     public BestSingleObjectiveTestFunctionSolutionAnalyzer()
       : base() {
@@ -80 +84 @@
       Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The result collection where the SingleObjectiveTestFunction solution should be stored."));
       Parameters.Add(new ValueLookupParameter<ISingleObjectiveTestFunctionProblemEvaluator>("Evaluator", "The evaluator with which the solution is evaluated."));
+      Parameters.Add(new LookupParameter<DoubleMatrix>("Bounds", "The bounds of the function."));
+    }
+
+    /// <summary>
+    /// This method can simply be removed when the plugin version is > 3.3
+    /// </summary>
+    [StorableHook(HookType.AfterDeserialization)]
+    private void CompatibilityMethod() {
+      // Bounds are introduced in 3.3.0.3894
+      if (!Parameters.ContainsKey("Bounds"))
+        Parameters.Add(new LookupParameter<DoubleMatrix>("Bounds", "The bounds of the function."));
     }
 
@@ -85 +100 @@
       ItemArray<RealVector> realVectors = RealVectorParameter.ActualValue;
       ItemArray<DoubleValue> qualities = QualityParameter.ActualValue;
-      ResultCollection results = ResultsParameter.ActualValue;
-      ISingleObjectiveTestFunctionProblemEvaluator evaluator = EvaluatorParameter.ActualValue;
       bool max = MaximizationParameter.ActualValue.Value;
       DoubleValue bestKnownQuality = BestKnownQualityParameter.ActualValue;
+      SingleObjectiveTestFunctionSolution solution = BestSolutionParameter.ActualValue;
 
       int i = qualities.Select((x, index) => new { index, x.Value }).OrderBy(x => x.Value).First().index;
@@ -97 +111 @@
         BestKnownQualityParameter.ActualValue = new DoubleValue(qualities[i].Value);
         BestKnownSolutionParameter.ActualValue = (RealVector)realVectors[i].Clone();
+        if (solution != null)
+          solution.BestKnownRealVector = BestKnownSolutionParameter.ActualValue;
       }
 
-      SingleObjectiveTestFunctionSolution solution = BestSolutionParameter.ActualValue;
       if (solution == null) {
-        solution = new SingleObjectiveTestFunctionSolution(realVectors[i], qualities[i], evaluator);
+        ResultCollection results = ResultsParameter.ActualValue;
+        solution = new SingleObjectiveTestFunctionSolution(realVectors[i], qualities[i], EvaluatorParameter.ActualValue);
         solution.Population = realVectors;
         solution.BestKnownRealVector = BestKnownSolutionParameter.ActualValue;
+        solution.Bounds = BoundsParameter.ActualValue;
         BestSolutionParameter.ActualValue = solution;
         results.Add(new Result("Best Solution", solution));