Changeset 3485 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionSolution.cs

Timestamp:

04/22/10 08:53:04 (14 years ago)

Author:

gkronber

Message:

Bug fixes in cloning and persistence code. #938

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionSolution.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionSolution.cs

@@ -36 +36 @@
   [StorableClass]
   public sealed class SymbolicRegressionSolution : DataAnalysisSolution {
+    [Storable]
     private SymbolicRegressionModel model;
     public SymbolicRegressionModel Model {
@@ -52 +53 @@
       : base(problemData) {
       this.model = model;
-      RecalculateEstimatedValues();
     }
 
@@ -75 +75 @@
     public override IEnumerable<double> EstimatedValues {
       get {
+        if (estimatedValues == null) RecalculateEstimatedValues();
         return estimatedValues.AsEnumerable();
       }
@@ -81 +82 @@
     public override IEnumerable<double> EstimatedTrainingValues {
       get {
+        if (estimatedValues == null) RecalculateEstimatedValues();
         int start = ProblemData.TrainingSamplesStart.Value;
         int n = ProblemData.TrainingSamplesEnd.Value - start;
@@ -89 +91 @@
     public override IEnumerable<double> EstimatedTestValues {
       get {
+        if (estimatedValues == null) RecalculateEstimatedValues();
         int start = ProblemData.TestSamplesStart.Value;
         int n = ProblemData.TestSamplesEnd.Value - start;
@@ -94 +97 @@
       }
     }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      SymbolicRegressionSolution clone = (SymbolicRegressionSolution)base.Clone(cloner);
+      clone.model = (SymbolicRegressionModel)model.Clone(cloner);
+      return clone;
+    }
   }
 }