Changeset 9059 for branches

Timestamp:

12/14/12 16:03:28 (11 years ago)

Author:

ascheibe

Message:

#1886 track min and max quality values for scaling

Location:

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3

Files:

• DataTableHelper.cs (modified) (2 diffs)
• ScatterPlotHelper.cs (modified) (5 diffs)
• SolutionToPopulationAnalyzer.cs (modified) (1 diff)

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/DataTableHelper.cs

@@ -20 +20 @@
 #endregion
 
-using System.Collections.Generic;
+using HeuristicLab.Collections;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -75 +75 @@
       dt.Rows[dataRowNames[0]].Values.Add(point);
     }
+
+    public ObservableList<double> GetFirstDataRow() {
+      return dt.Rows[dataRowNames[0]].Values;
+    }
   }
 }

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/ScatterPlotHelper.cs

@@ -45 +45 @@
     public bool CreateDataTable { get; set; }
     [Storable]
-    public DataTableHelper dataTableHelper;
+    public DataTableHelper dataTableHelper, minMaxDataTableHelper;
     [Storable]
     private string lastRowName;
+    [Storable]
+    private bool trackMinMaxValues;
+    [Storable]
+    private double min;
+    [Storable]
+    private double max;
+    [Storable]
+    private ResultCollection Results;
 
     [Storable]
@@ -68 +76 @@
       StoreHistory = true;
       CreateDataTable = false;
+      min = double.MaxValue;
+      max = double.MinValue;
     }
 
-    public ScatterPlotHelper(bool storeHistory, bool createDataTable)
+    public ScatterPlotHelper(bool storeHistory, bool createDataTable, bool trackMinMax = false)
       : base() {
       StoreHistory = storeHistory;
       CreateDataTable = createDataTable;
+      trackMinMaxValues = trackMinMax;
+      min = double.MaxValue;
+      max = double.MinValue;
     }
 
@@ -81 +94 @@
 
     public void InitializePlot(ResultCollection results, string chartName, string xAxisTitle, string yAxisTitle) {
+      Results = results;
       if (CreateDataTable) {
         if (dataTableHelper == null) {
           dataTableHelper = new DataTableHelper();
+          minMaxDataTableHelper = new DataTableHelper();
         }
         dataTableHelper.InitializeChart(results, chartName + " Chart", new string[] { yAxisTitle });
+
       }
 
@@ -104 +120 @@
 
     public void AddPoint(string rowName, Point2D<double> point) {
+      if (point.Y > max)
+        max = point.Y;
+      if (point.Y < min)
+        min = point.Y;
+
       if (!Plot.Rows.ContainsKey(rowName)) {
         if (StoreHistory)
@@ -135 +156 @@
 
     public void CleanUp() {
+      if (CreateDataTable && trackMinMaxValues) {
+        minMaxDataTableHelper.InitializeChart(Results, chartName + " Scaled Chart", new string[] { yAxisTitle });
+        dataTableHelper.GetFirstDataRow().ForEach(x => minMaxDataTableHelper.AddPoint((x - min) / (max - min)));
+      }
+
       if (!StoreHistory && CreateDataTable) {
         resultsCol[chartName].Value = null;

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/SolutionToPopulationAnalyzer.cs

@@ -101 +101 @@
 
       populationDiversityPlot = new ScatterPlotHelper(false, true);
-      populationQualityPlot = new ScatterPlotHelper(false, true);
-      qualityPlot = new ScatterPlotHelper(false, true);
+      populationQualityPlot = new ScatterPlotHelper(false, true, true);
+      qualityPlot = new ScatterPlotHelper(false, true, true);
     }