Changeset 3787 for trunk/sources/HeuristicLab.Problems.OneMax

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.OneMax/3.3/Analyzers/BestOneMaxSolutionAnalyzer.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.OneMax/3.3/Analyzers/BestOneMaxSolutionAnalyzer.cs

@@ -39 +39 @@
   [StorableClass]
   class BestOneMaxSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer {
-
+    public LookupParameter<BoolValue> MaximizationParameter {
+      get { return (LookupParameter<BoolValue>)Parameters["Maximization"]; }
+    }
     public ScopeTreeLookupParameter<BinaryVector> BinaryVectorParameter {
       get { return (ScopeTreeLookupParameter<BinaryVector>)Parameters["BinaryVector"]; }
@@ -52 +54 @@
       get { return (ValueLookupParameter<ResultCollection>)Parameters["Results"]; }
     }
+    public LookupParameter<DoubleValue> BestKnownQualityParameter {
+      get { return (LookupParameter<DoubleValue>)Parameters["BestKnownQuality"]; }
+    }
 
     public BestOneMaxSolutionAnalyzer()
       : base() {
+      Parameters.Add(new LookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem."));
       Parameters.Add(new ScopeTreeLookupParameter<BinaryVector>("BinaryVector", "The Onemax solutions from which the best solution should be visualized."));
-
       Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The qualities of the Onemax solutions which should be visualized."));
       Parameters.Add(new LookupParameter<OneMaxSolution>("BestSolution", "The best Onemax solution."));
       Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The result collection where the Onemax solution should be stored."));
+      Parameters.Add(new LookupParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution."));
     }
 
@@ -66 +72 @@
       ItemArray<DoubleValue> qualities = QualityParameter.ActualValue;
       ResultCollection results = ResultsParameter.ActualValue;
+      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;
+      int i = -1;
+      if (!max)
+        i = qualities.Select((x, index) => new { index, x.Value }).OrderBy(x => x.Value).First().index;
+      else i = qualities.Select((x, index) => new { index, x.Value }).OrderByDescending(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);
+      }
 
       OneMaxSolution solution = BestSolutionParameter.ActualValue;
       if (solution == null) {
-        solution = new OneMaxSolution(binaryVectors[i], QualityParameter.ActualValue[i]);
+        solution = new OneMaxSolution((BinaryVector)binaryVectors[i].Clone(), new DoubleValue(qualities[i].Value));
         BestSolutionParameter.ActualValue = solution;
         results.Add(new Result("Best OneMax Solution", solution));
       }  else {
-        solution.BinaryVector = binaryVectors[i];
-        solution.Quality = QualityParameter.ActualValue[i];
-
-        results["Best OneMax Solution"].Value = solution;
+        if (max && qualities[i].Value > solution.Quality.Value ||
+          !max && qualities[i].Value < solution.Quality.Value) {
+          solution.BinaryVector = (BinaryVector)binaryVectors[i].Clone();
+          solution.Quality = new DoubleValue(qualities[i].Value);
+        }
       }