Changeset 16611

Timestamp:

02/17/19 05:21:34 (6 years ago)

Author:

swagner

Message:

#2989: Moving Peaks Benchmark

• added calculation of offline error

Location:

branches/2989_MovingPeaksBenchmark/HeuristicLab.Problems.MovingPeaksBenchmark/3.3

Files:

• Analyzers/BestMovingPeaksBenchmarkSolutionAnalyzer.cs (modified) (2 diffs)
• MovingPeaksBenchmarkProblemEvaluator.cs (modified) (4 diffs)

branches/2989_MovingPeaksBenchmark/HeuristicLab.Problems.MovingPeaksBenchmark/3.3/Analyzers/BestMovingPeaksBenchmarkSolutionAnalyzer.cs

@@ -136 +136 @@
         DataTable table = new DataTable("Distance to Optimum");
         table.Rows.Add(new DataRow("Distance to Optimum"));
+        table.Rows["Distance to Optimum"].VisualProperties.StartIndexZero = true;
         distanceTable = new Result("Distance to Optimum", table);
         results.Add(distanceTable);
@@ -141 +142 @@
       (distanceTable.Value as DataTable).Rows["Distance to Optimum"].Values.Add(distanceToOptimum);
 
+      IResult offlineErrorTable;
+      if (!results.TryGetValue("Offline Error Chart", out offlineErrorTable)) {
+        DataTable table = new DataTable("Offline Error");
+        table.Rows.Add(new DataRow("Offline Error"));
+        table.Rows["Offline Error"].VisualProperties.StartIndexZero = true;
+        offlineErrorTable = new Result("Offline Error Chart", table);
+        results.Add(offlineErrorTable);
+      }
+      (offlineErrorTable.Value as DataTable).Rows["Offline Error"].Values.Add((results["Offline Error"].Value as DoubleValue).Value);
+
       return base.Apply();
     }

branches/2989_MovingPeaksBenchmark/HeuristicLab.Problems.MovingPeaksBenchmark/3.3/MovingPeaksBenchmarkProblemEvaluator.cs

@@ -40 +40 @@
     [Storable]
     long executions;
+    [Storable]
+    double currentBest;
+    [Storable]
+    double offlineErrorSum;
 
     public IValueLookupParameter<DoubleMatrix> PeakLocationsParameter {
@@ -143 +147 @@
           BestKnownSolutionParameter.ActualValue = new RealVector(peak);
           BestKnownQualityParameter.ActualValue.Value = heights.Max();
+          currentBest = -1;
         }
         executions++;
@@ -150 +155 @@
       double quality = Apply(peaks, widths, heights, point);
       QualityParameter.ActualValue = new DoubleValue(quality);
+
+      lock (this) {
+        if (quality > currentBest) {
+          currentBest = quality;
+        }
+        offlineErrorSum += heights.Max() - currentBest;
+        ResultCollection results = ResultsParameter.ActualValue;
+        IResult offlineError;
+        if (results.TryGetValue("Offline Error", out offlineError)) {
+          (offlineError.Value as DoubleValue).Value = offlineErrorSum / executions;
+        } else {
+          results.Add(new Result("Offline Error", new DoubleValue(offlineErrorSum / executions)));
+        }
+      }
       return base.InstrumentedApply();
     }
@@ -156 +175 @@
       base.InitializeState();
       executions = 0;
+      currentBest = -1;
+      offlineErrorSum = 0;
     }