Changeset 3493 for trunk

Timestamp:

04/22/10 20:04:27 (15 years ago)

Author:

gkronber

Message:

fixed bugs in cloning. #938 (Data types and operators for regression problems)

Location:

trunk/sources

Files:

• HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionModel.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionSolution.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.3/Dataset.cs (modified) (2 diffs)

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

@@ -71 +71 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       var clone = (SymbolicRegressionModel)base.Clone(cloner);
-      clone.tree = (SymbolicExpressionTree)tree.Clone(cloner);
-      clone.interpreter = (ISymbolicExpressionTreeInterpreter)interpreter.Clone(cloner);
+      clone.tree = (SymbolicExpressionTree)cloner.Clone(tree);
+      clone.interpreter = (ISymbolicExpressionTreeInterpreter)cloner.Clone(interpreter);
       clone.inputVariables = new List<string>(inputVariables);
       return clone;

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

@@ -100 +100 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       SymbolicRegressionSolution clone = (SymbolicRegressionSolution)base.Clone(cloner);
-      clone.model = (SymbolicRegressionModel)model.Clone(cloner);
+      clone.model = (SymbolicRegressionModel)cloner.Clone(model);
       return clone;
     }

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Dataset.cs

@@ -217 +217 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       Dataset clone = (Dataset)base.Clone(cloner);
-      clone.data = (double[,])data.Clone();
+      clone.data = data;
       clone.variableNames = (string[])variableNames.Clone();
       return clone;
@@ -367 +367 @@
     }
     #endregion
+
+
   }
 }