Changeset 4722 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Classification/3.3/Symbolic/SymbolicClassificationSolution.cs

Timestamp:

11/06/10 01:56:04 (14 years ago)

Author:

swagner

Message:

Merged cloning refactoring branch back into trunk (#922)

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Classification/3.3/Symbolic/SymbolicClassificationSolution.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Classification/3.3/Symbolic/SymbolicClassificationSolution.cs

@@ -35 +35 @@
   [StorableClass]
   public class SymbolicClassificationSolution : SymbolicRegressionSolution, IClassificationSolution {
-    private SymbolicClassificationSolution() : base() { }
+    public new ClassificationProblemData ProblemData {
+      get { return (ClassificationProblemData)base.ProblemData; }
+      set { base.ProblemData = value; }
+    }
+
+    #region properties
+    private List<double> optimalThresholds;
+    private List<double> actualThresholds;
+    public IEnumerable<double> Thresholds {
+      get {
+        if (actualThresholds == null) RecalculateEstimatedValues();
+        return actualThresholds;
+      }
+      set {
+        if (actualThresholds != null && actualThresholds.SequenceEqual(value))
+          return;
+        actualThresholds = new List<double>(value);
+        OnThresholdsChanged();
+      }
+    }
+
+    public IEnumerable<double> EstimatedClassValues {
+      get { return GetEstimatedClassValues(Enumerable.Range(0, ProblemData.Dataset.Rows)); }
+    }
+
+    public IEnumerable<double> EstimatedTrainingClassValues {
+      get { return GetEstimatedClassValues(ProblemData.TrainingIndizes); }
+    }
+
+    public IEnumerable<double> EstimatedTestClassValues {
+      get { return GetEstimatedClassValues(ProblemData.TestIndizes); }
+    }
+
+    [StorableConstructor]
+    protected SymbolicClassificationSolution(bool deserializing) : base(deserializing) { }
+    protected SymbolicClassificationSolution(SymbolicClassificationSolution original, Cloner cloner) : base(original, cloner) { }
     public SymbolicClassificationSolution(ClassificationProblemData problemData, SymbolicRegressionModel model, double lowerEstimationLimit, double upperEstimationLimit)
       : base(problemData, model, lowerEstimationLimit, upperEstimationLimit) {
     }
 
-    public new ClassificationProblemData ProblemData {
-      get { return (ClassificationProblemData)base.ProblemData; }
-      set { base.ProblemData = value; }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new SymbolicClassificationSolution(this, cloner);
     }
 
@@ -114 +148 @@
     }
 
-    #region properties
-    private List<double> optimalThresholds;
-    private List<double> actualThresholds;
-    public IEnumerable<double> Thresholds {
-      get {
-        if (actualThresholds == null) RecalculateEstimatedValues();
-        return actualThresholds;
-      }
-      set {
-        if (actualThresholds != null && actualThresholds.SequenceEqual(value))
-          return;
-        actualThresholds = new List<double>(value);
-        OnThresholdsChanged();
-      }
-    }
-
-    public IEnumerable<double> EstimatedClassValues {
-      get { return GetEstimatedClassValues(Enumerable.Range(0, ProblemData.Dataset.Rows)); }
-    }
-
-    public IEnumerable<double> EstimatedTrainingClassValues {
-      get { return GetEstimatedClassValues(ProblemData.TrainingIndizes); }
-    }
-
-    public IEnumerable<double> EstimatedTestClassValues {
-      get { return GetEstimatedClassValues(ProblemData.TestIndizes); }
-    }
-
     public IEnumerable<double> GetEstimatedClassValues(IEnumerable<int> rows) {
       double[] classValues = ProblemData.SortedClassValues.ToArray();