Changeset 8501

Timestamp:

08/19/12 15:56:24 (12 years ago)

Author:

ascheibe

Message:

#1886 fixed cloning and made helper classes items

Location:

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

Files:

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

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

@@ -47 +47 @@
     #endregion
 
-
     #region Parameter properties
     public ILookupParameter<ResultCollection> ResultsParameter {
@@ -78 +77 @@
     #endregion
 
-    ScatterPlotHelper plotHelper, childDiversityHelper, parentDiversityHelper;
-    DataTableHelper performanceHelper, successHelper, equalParentsHelper;
-    int cnt = 0;
-    int success = 0;
-    int lastGeneration = 0;
-    int equalParents = 0;
-    List<double> qualityPoints = new List<double>();
+    private ScatterPlotHelper plotHelper, childDiversityHelper, parentDiversityHelper;
+    private DataTableHelper performanceHelper, successHelper, equalParentsHelper;
+    private int cnt = 0;
+    private int success = 0;
+    private int lastGeneration = 0;
+    private int equalParents = 0;
+    private List<double> qualityPoints = new List<double>();
 
     [StorableConstructor]
     private CrossoverPerformanceAnalyzer(bool deserializing) : base(deserializing) { }
-    private CrossoverPerformanceAnalyzer(CrossoverPerformanceAnalyzer original, Cloner cloner) : base(original, cloner) { }
+    private CrossoverPerformanceAnalyzer(CrossoverPerformanceAnalyzer original, Cloner cloner)
+      : base(original, cloner) {
+      cnt = original.cnt;
+      success = original.success;
+      lastGeneration = original.lastGeneration;
+      equalParents = original.equalParents;
+      qualityPoints = new List<double>(original.qualityPoints);
+      plotHelper = (ScatterPlotHelper)original.plotHelper.Clone(cloner);
+      childDiversityHelper = (ScatterPlotHelper)original.childDiversityHelper.Clone(cloner);
+      parentDiversityHelper = (ScatterPlotHelper)original.parentDiversityHelper.Clone(cloner);
+      performanceHelper = (DataTableHelper)original.performanceHelper.Clone(cloner);
+      successHelper = (DataTableHelper)original.successHelper.Clone(cloner);
+      equalParentsHelper = (DataTableHelper)original.equalParentsHelper.Clone(cloner);
+    }
+
     public CrossoverPerformanceAnalyzer()
       : base() {

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

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common;
+using HeuristicLab.Core;
 using HeuristicLab.Optimization;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Analysis.AlgorithmBehavior.Analyzers {
-  public class DataTableHelper {
+  [Item("DataTableHelper", "Helper class for creating datatables.")]
+  [StorableClass]
+  public class DataTableHelper : Item {
 
     private ResultCollection resultsCol;
@@ -30 +35 @@
     private DataRow dtRow;
 
+    [StorableConstructor]
+    private DataTableHelper(bool deserializing) : base(deserializing) { }
+    private DataTableHelper(DataTableHelper original, Cloner cloner)
+      : base(original, cloner) {
+      resultsCol = original.resultsCol;
+      chartName = original.chartName;
+      dataRowName = original.dataRowName;
+      dtRow = (DataRow)original.dtRow.Clone(cloner);
+    }
+    public DataTableHelper() : base() { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new DataTableHelper(this, cloner);
+    }
 
     public void InitializeChart(ResultCollection results, string chartName, string dataRowName) {

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

@@ -74 +74 @@
     #endregion
 
-
-    ScatterPlotHelper diversityPlotHelper, qualityPlotHelper;
-    DataTableHelper avgDataTableHelper;
-    int cnt = 0, lastGeneration = 0;
-    List<double> qualityPoints = new List<double>();
+    private ScatterPlotHelper diversityPlotHelper, qualityPlotHelper;
+    private DataTableHelper avgDataTableHelper;
+    private int cnt = 0, lastGeneration = 0;
+    private List<double> qualityPoints = new List<double>();
 
     [StorableConstructor]
     private MutationPerformanceAnalyzer(bool deserializing) : base(deserializing) { }
-    private MutationPerformanceAnalyzer(MutationPerformanceAnalyzer original, Cloner cloner) : base(original, cloner) { }
+    private MutationPerformanceAnalyzer(MutationPerformanceAnalyzer original, Cloner cloner)
+      : base(original, cloner) {
+      diversityPlotHelper = (ScatterPlotHelper)original.diversityPlotHelper.Clone(cloner);
+      qualityPlotHelper = (ScatterPlotHelper)original.qualityPlotHelper.Clone(cloner);
+      avgDataTableHelper = (DataTableHelper)original.avgDataTableHelper.Clone(cloner);
+      cnt = original.cnt;
+      lastGeneration = original.lastGeneration;
+      qualityPoints = new List<double>(original.qualityPoints);
+    }
+
     public MutationPerformanceAnalyzer()
       : base() {

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

@@ -22 +22 @@
 using System.Collections.Generic;
 using HeuristicLab.Common;
+using HeuristicLab.Core;
 using HeuristicLab.Optimization;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Analysis.AlgorithmBehavior.Analyzers {
-  public class ScatterPlotHelper {
+  [Item("ScatterPlotHelper", "Helper class for creating scatter plots.")]
+  [StorableClass]
+  public class ScatterPlotHelper : Item {
 
     private ResultCollection resultsCol;
@@ -36 +40 @@
       get { return plot; }
       private set { plot = value; }
+    }
+
+    [StorableConstructor]
+    private ScatterPlotHelper(bool deserializing) : base(deserializing) { }
+    private ScatterPlotHelper(ScatterPlotHelper original, Cloner cloner)
+      : base(original, cloner) {
+      resultsCol = original.resultsCol;
+      chartName = original.chartName;
+      xAxisTitle = original.xAxisTitle;
+      yAxisTitle = original.yAxisTitle;
+      plot = (ScatterPlot)original.plot.Clone(cloner);
+    }
+    public ScatterPlotHelper() : base() { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new ScatterPlotHelper(this, cloner);
     }