Context Navigation

Changeset 3485 for trunk/sources

Timestamp:

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

Author:

gkronber

Message:

Bug fixes in cloning and persistence code. #938

Location:

trunk/sources

Files:

-                      r3462
+                      r3485
   [StorableClass]
   public sealed class SymbolicRegressionSolution : DataAnalysisSolution {
+    [Storable]
     private SymbolicRegressionModel model;
     public SymbolicRegressionModel Model {
 …
       : base(problemData) {
       this.model = model;
-      RecalculateEstimatedValues();
+    }
 …
     public override IEnumerable<double> EstimatedValues {
       get {
+        if (estimatedValues == null) RecalculateEstimatedValues();
         return estimatedValues.AsEnumerable();
+      }
 …
     public override IEnumerable<double> EstimatedTrainingValues {
       get {
+        if (estimatedValues == null) RecalculateEstimatedValues();
         int start = ProblemData.TrainingSamplesStart.Value;
         int n = ProblemData.TrainingSamplesEnd.Value - start;
 …
     public override IEnumerable<double> EstimatedTestValues {
       get {
+        if (estimatedValues == null) RecalculateEstimatedValues();
         int start = ProblemData.TestSamplesStart.Value;
         int n = ProblemData.TestSamplesEnd.Value - start;
 …
+      }
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      SymbolicRegressionSolution clone = (SymbolicRegressionSolution)base.Clone(cloner);
+      clone.model = (SymbolicRegressionModel)model.Clone(cloner);
+      return clone;
+    }
+  }
+}

-                      r3462
+                      r3485
   public sealed class Constant : Symbol {
     #region Propeties
+    [Storable]
     private double minValue;
     public double MinValue {
 …
       set { minValue = value; }
+    }
+    [Storable]
     private double maxValue;
     public double MaxValue {
 …
       return new ConstantTreeNode(this);
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      Constant clone = (Constant) base.Clone(cloner);
+      clone.minValue = minValue;
+      clone.maxValue = maxValue;
+      return clone;
+    }
+  }
+}

-                      r3465
+                      r3485
       set { constantValue = value; }
+    }
+    private ConstantTreeNode() : base() { }
     // copy constructor
     private ConstantTreeNode(ConstantTreeNode original)

-                      r3462
+                      r3485
   public sealed class Variable : Symbol {
     #region Properties
+    [Storable]
     private double weightNu;
-    [Storable]
     public double WeightNu {
       get { return weightNu; }
       set { weightNu = value; }
+    }
+    [Storable]
     private double weightSigma;
-    [Storable]
     public double WeightSigma {
       get { return weightSigma; }
 …
+      }
+    }
+    [Storable]
     private List<string> variableNames;
-    [Storable]
     public IEnumerable<string> VariableNames {
       get { return variableNames; }
 …
       return new VariableTreeNode(this);
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      Variable clone = (Variable)base.Clone(cloner);
+      clone.weightNu = weightNu;
+      clone.weightSigma = weightSigma;
+      clone.variableNames = new List<string>(variableNames);
+      return clone;
+    }
+  }
+}

-                      r3465
+                      r3485
       get { return (Variable)base.Symbol; }
+    }
+    [Storable]
     private double weight;
-    [Storable]
     public double Weight {
       get { return weight; }
       set { weight = value; }
+    }
+    [Storable]
     private string variableName;
-    [Storable]
     public string VariableName {
       get { return variableName; }
       set { variableName = value; }
+    }
+    private VariableTreeNode() { }
     // copy constructor

Note: See TracChangeset for help on using the changeset viewer.