Changeset 14600 for branches/PerformanceComparison/HeuristicLab.Analysis/3.3/DataVisualization

Timestamp:

01/23/17 16:11:02 (8 years ago)

Author:

abeham

Message:

#2457: updated branch to trunk

Location:

branches/PerformanceComparison/HeuristicLab.Analysis

Files:

• . (modified) (1 prop)
• 3.3/DataVisualization/DataRow.cs (modified) (1 diff)
• 3.3/DataVisualization/DataRowVisualProperties.cs (modified) (6 diffs)
• 3.3/DataVisualization/DataTable.cs (modified) (1 diff)
• 3.3/DataVisualization/DataTableHistory.cs (modified) (1 diff)
• 3.3/DataVisualization/DataTableValuesCollector.cs (modified) (1 diff)
• 3.3/DataVisualization/DataTableVisualProperties.cs (modified) (1 diff)
• 3.3/DataVisualization/HeatMap.cs (modified) (1 diff)
• 3.3/DataVisualization/HeatMapHistory.cs (modified) (1 diff)
• 3.3/DataVisualization/ScatterPlot.cs (modified) (1 diff)
• 3.3/DataVisualization/ScatterPlotDataRow.cs (modified) (1 diff)
• 3.3/DataVisualization/ScatterPlotDataRowVisualProperties.cs (modified) (7 diffs)
• 3.3/DataVisualization/ScatterPlotHistory.cs (modified) (1 diff)
• 3.3/DataVisualization/ScatterPlotVisualProperties.cs (modified) (1 diff)

branches/PerformanceComparison/HeuristicLab.Analysis/3.3/DataVisualization/DataRow.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/PerformanceComparison/HeuristicLab.Analysis/3.3/DataVisualization/DataRowVisualProperties.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -52 +52 @@
     }
     #endregion
+    #region Histogram Aggregation
+    public enum DataRowHistogramAggregation {
+      Overlapping,
+      SideBySide,
+      Stacked
+    }
+    #endregion
 
     private DataRowChartType chartType;
@@ -140 +147 @@
           exactBins = value;
           OnPropertyChanged("ExactBins");
+        }
+      }
+    }
+    private DataRowHistogramAggregation aggregation;
+    public DataRowHistogramAggregation Aggregation {
+      get { return aggregation; }
+      set {
+        if (aggregation != value) {
+          aggregation = value;
+          OnPropertyChanged("Aggregation");
         }
       }
@@ -224 +241 @@
       get { return exactBins; }
       set { exactBins = value; }
+    }
+    [Storable(Name = "Aggregation", DefaultValue = DataRowHistogramAggregation.Overlapping)]
+    private DataRowHistogramAggregation StorableAggregation {
+      get { return aggregation; }
+      set { aggregation = value; }
     }
     [Storable(Name = "ScaleFactor")]
@@ -255 +277 @@
       this.bins = original.bins;
       this.exactBins = original.exactBins;
+      this.aggregation = original.aggregation;
       this.scaleFactor = original.scaleFactor;
       this.displayName = original.displayName;
@@ -269 +292 @@
       bins = 10;
       exactBins = false;
+      aggregation = DataRowHistogramAggregation.Overlapping;
       scaleFactor = 1.0;
       displayName = String.Empty;

branches/PerformanceComparison/HeuristicLab.Analysis/3.3/DataVisualization/DataTable.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/PerformanceComparison/HeuristicLab.Analysis/3.3/DataVisualization/DataTableHistory.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/PerformanceComparison/HeuristicLab.Analysis/3.3/DataVisualization/DataTableValuesCollector.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/PerformanceComparison/HeuristicLab.Analysis/3.3/DataVisualization/DataTableVisualProperties.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/PerformanceComparison/HeuristicLab.Analysis/3.3/DataVisualization/HeatMap.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/PerformanceComparison/HeuristicLab.Analysis/3.3/DataVisualization/HeatMapHistory.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/PerformanceComparison/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlot.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/PerformanceComparison/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotDataRow.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/PerformanceComparison/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotDataRowVisualProperties.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Common;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using System;
 using System.ComponentModel;
 using System.Drawing;
+using HeuristicLab.Common;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Analysis {
@@ -45 +45 @@
     }
     #endregion
+    #region
+    public enum ScatterPlotDataRowRegressionType {
+      None,
+      Linear,
+      Polynomial,
+      Exponential,
+      Logarithmic,
+      Power
+    }
+    #endregion
 
     private Color color;
@@ -101 +111 @@
       }
     }
-    private bool showRegressionLine;
-    public bool ShowRegressionLine {
-      get { return showRegressionLine; }
-      set {
-        if (showRegressionLine == value) return;
-        showRegressionLine = value;
-        OnPropertyChanged("ShowRegressionLine");
+    private ScatterPlotDataRowRegressionType regressionType;
+    public ScatterPlotDataRowRegressionType RegressionType {
+      get { return regressionType; }
+      set {
+        if (regressionType != value) {
+          regressionType = value;
+          OnPropertyChanged("RegressionType");
+        }
+      }
+    }
+    private int polynomialRegressionOrder;
+    public int PolynomialRegressionOrder {
+      get { return polynomialRegressionOrder; }
+      set {
+        if (polynomialRegressionOrder != value) {
+          polynomialRegressionOrder = value;
+          OnPropertyChanged("PolynomialRegressionOrder");
+        }
+      }
+    }
+    private bool isRegressionVisibleInLegend;
+    public bool IsRegressionVisibleInLegend {
+      get { return isRegressionVisibleInLegend; }
+      set {
+        if (isRegressionVisibleInLegend != value) {
+          isRegressionVisibleInLegend = value;
+          OnPropertyChanged("IsRegressionVisibleInLegend");
+        }
+      }
+    }
+    private string regressionDisplayName;
+    public string RegressionDisplayName {
+      get { return regressionDisplayName ?? string.Empty; }
+      set {
+        if (regressionDisplayName != value) {
+          if (value == null && regressionDisplayName != string.Empty) {
+            regressionDisplayName = string.Empty;
+            OnPropertyChanged("RegressionDisplayName");
+          } else if (value != null) {
+            regressionDisplayName = value;
+            OnPropertyChanged("RegressionDisplayName");
+          }
+        }
       }
     }
@@ -137 +183 @@
       set { displayName = value; }
     }
-    [Storable(Name = "ShowRegressionLine")]
-    private bool StorableShowRegressionLine {
-      get { return showRegressionLine; }
-      set { showRegressionLine = value; }
+    [Storable(Name = "RegressionType")]
+    private ScatterPlotDataRowRegressionType StorableRegressionType {
+      get { return regressionType; }
+      set { regressionType = value; }
+    }
+    [Storable(Name = "PolynomialRegressionOrder", DefaultValue = 2)]
+    private int StorablePolynomialRegressionOrder {
+      get { return polynomialRegressionOrder; }
+      set { polynomialRegressionOrder = value; }
+    }
+    [Storable(Name = "IsRegressionVisibleInLegend", DefaultValue = true)]
+    private bool StorableIsRegressionVisibleInLegend {
+      get { return isRegressionVisibleInLegend; }
+      set { isRegressionVisibleInLegend = value; }
+    }
+    [Storable(Name = "RegressionDisplayName")]
+    private string StorableRegressionDisplayName {
+      get { return regressionDisplayName; }
+      set { regressionDisplayName = value; }
     }
     #endregion
@@ -153 +214 @@
       this.displayName = original.displayName;
       this.isVisibleInLegend = original.isVisibleInLegend;
-      this.showRegressionLine = original.showRegressionLine;
+      this.regressionType = original.regressionType;
+      this.polynomialRegressionOrder = original.polynomialRegressionOrder;
+      this.isRegressionVisibleInLegend = original.isRegressionVisibleInLegend;
+      this.regressionDisplayName = original.regressionDisplayName;
     }
     public ScatterPlotDataRowVisualProperties() {
@@ -161 +225 @@
       displayName = String.Empty;
       isVisibleInLegend = true;
-      showRegressionLine = false;
+      regressionType = ScatterPlotDataRowRegressionType.None;
+      polynomialRegressionOrder = 2;
+      isRegressionVisibleInLegend = true;
+      regressionDisplayName = string.Empty;
     }
     public ScatterPlotDataRowVisualProperties(string displayName)

branches/PerformanceComparison/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotHistory.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/PerformanceComparison/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotVisualProperties.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.