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

Timestamp:

05/11/10 21:16:12 (14 years ago)

Author:

abeham

Message:

#893

• Removed best known quality tracking from BestAverageWorstQualityAnalyzer
• Added best known quality / solution tracking to problem specific analyzers

File:

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

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

@@ -39 +39 @@
   [StorableClass]
   class BestSingleObjectiveTestFunctionSolutionAnalyzer : SingleSuccessorOperator, IBestSingleObjectiveTestFunctionSolutionAnalyzer, IAnalyzer {
-
+    public LookupParameter<BoolValue> MaximizationParameter {
+      get { return (LookupParameter<BoolValue>)Parameters["Maximization"]; }
+    }
     public ScopeTreeLookupParameter<RealVector> RealVectorParameter {
       get { return (ScopeTreeLookupParameter<RealVector>)Parameters["RealVector"]; }
@@ -70 +72 @@
     public BestSingleObjectiveTestFunctionSolutionAnalyzer()
       : base() {
+      Parameters.Add(new LookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem."));
       Parameters.Add(new ScopeTreeLookupParameter<RealVector>("RealVector", "The SingleObjectiveTestFunction solutions from which the best solution should be visualized."));
       Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The qualities of the SingleObjectiveTestFunction solutions which should be visualized."));
@@ -84 +87 @@
       ResultCollection results = ResultsParameter.ActualValue;
       ISingleObjectiveTestFunctionProblemEvaluator evaluator = EvaluatorParameter.ActualValue;
-      bool max = evaluator.Maximization;
+      bool max = MaximizationParameter.ActualValue.Value;
+      DoubleValue bestKnownQuality = BestKnownQualityParameter.ActualValue;
 
       int i = qualities.Select((x, index) => new { index, x.Value }).OrderBy(x => x.Value).First().index;
+
+      if (bestKnownQuality == null ||
+          max && qualities[i].Value > bestKnownQuality.Value
+          || !max && qualities[i].Value < bestKnownQuality.Value) {
+        BestKnownQualityParameter.ActualValue = new DoubleValue(qualities[i].Value);
+        BestKnownSolutionParameter.ActualValue = (RealVector)realVectors[i].Clone();
+      }
+
       SingleObjectiveTestFunctionSolution solution = BestSolutionParameter.ActualValue;
       if (solution == null) {
         solution = new SingleObjectiveTestFunctionSolution(realVectors[i], qualities[i], evaluator);
         solution.Population = realVectors;
-        double bestknownQuality = BestKnownQualityParameter.ActualValue.Value;
-        if (max && qualities[i].Value >= bestknownQuality
-          || !max && qualities[i].Value <= bestknownQuality) {
-          BestKnownSolutionParameter.ActualValue = (RealVector)realVectors[i].Clone();
-        }
         solution.BestKnownRealVector = BestKnownSolutionParameter.ActualValue;
         BestSolutionParameter.ActualValue = solution;
-        results.Add(new Result("Best SingleObjectiveTestFunction Solution", solution));
+        results.Add(new Result("Best Solution", solution));
       } else {
-        double bestknownQuality = BestKnownQualityParameter.ActualValue.Value;
-        if (max && qualities[i].Value >= bestknownQuality
-          || !max && qualities[i].Value <= bestknownQuality) {
-          BestKnownSolutionParameter.ActualValue = (RealVector)realVectors[i].Clone();
-        }
         if (max && qualities[i].Value > solution.BestQuality.Value
           || !max && qualities[i].Value < solution.BestQuality.Value) {
@@ -111 +113 @@
         }
         solution.Population = realVectors;
-        //results["Best SingleObjectiveTestFunction Solution"].Value = solution;
       }