Changeset 5275 for branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate/3.3/Symbolic

Timestamp:

01/11/11 15:03:46 (14 years ago)

Author:

gkronber

Message:

Merged changes from trunk to data analysis exploration branch and added fractional distance metric evaluator. #1142

File:

• branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate/3.3/Symbolic/MultiVariateExpressionGrammar.cs (modified) (3 diffs)

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate/3.3/Symbolic/MultiVariateExpressionGrammar.cs

@@ -37 +37 @@
     }
 
+    [StorableConstructor]
+    protected MultiVariateExpressionGrammar(bool deserializing) : base(deserializing) { }
+    protected MultiVariateExpressionGrammar(MultiVariateExpressionGrammar original, Cloner cloner)
+      : base(original, cloner) {
+        dimension = original.dimension;
+    }
     public MultiVariateExpressionGrammar() : this(2) { }
-
     public MultiVariateExpressionGrammar(int dimension)
       : base() {
@@ -50 +55 @@
 
       foreach (Symbol s in Symbols) {
-        if (s != StartSymbol)
+        if (s != StartSymbol) 
           for (int i = 0; i < n; i++) {
             SetAllowedChild(StartSymbol, s, i);
@@ -58 +63 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      MultiVariateExpressionGrammar clone = (MultiVariateExpressionGrammar)base.Clone(cloner);
-      clone.dimension = this.dimension;
-      return clone;
+      return new MultiVariateExpressionGrammar(this, cloner);
     }
   }