Changeset 8505 for branches/HeuristicLab.Analysis.AlgorithmBehavior

Timestamp:

08/20/12 12:40:57 (12 years ago)

Author:

ascheibe

Message:

#1886 fixed cloning and storing

Location:

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

Files:

• CrossoverPerformanceAnalyzer.cs (modified) (1 diff)
• DataTableHelper.cs (modified) (1 diff)
• DuplicateSolutionsAnalyzer.cs (modified) (2 diffs)
• MutationPerformanceAnalyzer.cs (modified) (1 diff)
• ScatterPlotHelper.cs (modified) (1 diff)

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

@@ -77 +77 @@
     #endregion
 
+    [Storable]
     private ScatterPlotHelper plotHelper, childDiversityHelper, parentDiversityHelper;
+    [Storable]
     private DataTableHelper performanceHelper, successHelper, equalParentsHelper;
+    [Storable]
     private int cnt = 0;
+    [Storable]
     private int success = 0;
+    [Storable]
     private int lastGeneration = 0;
+    [Storable]
     private int equalParents = 0;
+    [Storable]
     private List<double> qualityPoints = new List<double>();
 

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

@@ -30 +30 @@
   public class DataTableHelper : Item {
 
+    [Storable]
     private ResultCollection resultsCol;
+    [Storable]
     private string chartName;
+    [Storable]
     private string dataRowName;
+    [Storable]
     private DataRow dtRow;
 

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

@@ -56 +56 @@
     }
 
+    [Storable]
     private DataTableHelper chartingHelper;
     #endregion
@@ -61 +62 @@
     [StorableConstructor]
     private DuplicateSolutionsAnalyzer(bool deserializing) : base(deserializing) { }
-    private DuplicateSolutionsAnalyzer(DuplicateSolutionsAnalyzer original, Cloner cloner) : base(original, cloner) { }
+    
+    private DuplicateSolutionsAnalyzer(DuplicateSolutionsAnalyzer original, Cloner cloner) : base(original, cloner) {
+      chartingHelper = (DataTableHelper)original.chartingHelper.Clone(cloner);
+    }
+    
     public DuplicateSolutionsAnalyzer()
       : base() {

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

@@ -74 +74 @@
     #endregion
 
+    [Storable]
     private ScatterPlotHelper diversityPlotHelper, qualityPlotHelper;
+    [Storable]
     private DataTableHelper avgDataTableHelper;
+    [Storable]
     private int cnt = 0, lastGeneration = 0;
+    [Storable]
     private List<double> qualityPoints = new List<double>();
 

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

@@ -31 +31 @@
   public class ScatterPlotHelper : Item {
 
+    [Storable]
     private ResultCollection resultsCol;
+    [Storable]
     private string chartName;
+    [Storable]
     private string xAxisTitle;
+    [Storable]
     private string yAxisTitle;
 
+    [Storable]
     private ScatterPlot plot;
     public ScatterPlot Plot {