Changeset 16801 for branches/2521_ProblemRefactoring/HeuristicLab.Analysis

Timestamp:

04/17/19 16:03:57 (6 years ago)

Author:

mkommend

Message:

#2521: Merged trunk changes and adapted programmable problem templates for combined solutions.

Location:

branches/2521_ProblemRefactoring

Files:

• . (modified) (1 prop)
• HeuristicLab.Analysis (modified) (1 prop)
• HeuristicLab.Analysis/3.3/DataVisualization/DataRowVisualProperties.cs (modified) (1 diff)
• HeuristicLab.Analysis/3.3/DataVisualization/IndexedDataRow.cs (modified) (1 diff)
• HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlot.cs (modified) (1 diff)
• HeuristicLab.Analysis/3.3/PopulationSimilarityAnalysis/PopulationSimilarityAnalyzer.cs (modified) (1 diff)

branches/2521_ProblemRefactoring/HeuristicLab.Analysis/3.3/DataVisualization/DataRowVisualProperties.cs

@@ -227 +227 @@
     internal DataRowHistogramAggregation? Aggregation { get; private set; }
 
-    [Storable(Name = "Bins")]
+    [Storable(OldName = "Bins")]
     private int StorableBins { set { Bins = value; } }
-    [Storable(Name = "ExactBins")]
+    [Storable(OldName = "ExactBins")]
     private bool StorableExactBins { set { ExactBins = value; } }
-    [Storable(Name = "Aggregation")]
+    [Storable(OldName = "Aggregation")]
     private DataRowHistogramAggregation StorableAggregation { set { Aggregation = value; } }
     #endregion

branches/2521_ProblemRefactoring/HeuristicLab.Analysis/3.3/DataVisualization/IndexedDataRow.cs

@@ -61 +61 @@
     #region Backwards compatible code, remove with 3.4
     // tuples are stored inefficiently
-    [Storable(Name = "values")]
+    [Storable(OldName = "values")]
     private IEnumerable<Tuple<T, double>> StorableValues {
       set { values = new ObservableList<Tuple<T, double>>(value); }

branches/2521_ProblemRefactoring/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlot.cs

@@ -107 +107 @@
     #region Backwards compatible code, remove with 3.4
     private ObservableList<PointF> points;
-    [Storable(Name = "points")]
+    [Storable(OldName = "points")]
     private ObservableList<PointF> StorablePoints {
       set { points = value; }
     }
     private string xAxisName;
-    [Storable(Name = "xAxisName")]
+    [Storable(OldName = "xAxisName")]
     private string StorableXAxisName {
       set { xAxisName = value; }
     }
     private string yAxisName;
-    [Storable(Name = "yAxisName")]
+    [Storable(OldName = "yAxisName")]
     private string StorableYAxisName {
       set { yAxisName = value; }

branches/2521_ProblemRefactoring/HeuristicLab.Analysis/3.3/PopulationSimilarityAnalysis/PopulationSimilarityAnalyzer.cs

@@ -44 +44 @@
     #region Backwards compatible code, remove with 3.4
     private ISolutionSimilarityCalculator oldSimilarityCalculator;
-    [Storable]
+    [Storable(OldName = "SimilarityCalculator")]
     [Obsolete]
     private ISolutionSimilarityCalculator SimilarityCalculator { set { oldSimilarityCalculator = value; } }