Changeset 4722 for trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/GlobalSymbolicExpressionGrammar.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.Encodings.SymbolicExpressionTreeEncoding/3.3/GlobalSymbolicExpressionGrammar.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/GlobalSymbolicExpressionGrammar.cs

@@ -69 +69 @@
     private Defun defunSymbol;
 
+    [StorableConstructor]
+    private GlobalSymbolicExpressionGrammar(bool deserializing) : base(deserializing) { }
+    private GlobalSymbolicExpressionGrammar(GlobalSymbolicExpressionGrammar original, Cloner cloner)
+      : base(original, cloner) {
+      defunSymbol = (Defun)cloner.Clone(original.defunSymbol);
+      maxFunctionArguments = original.maxFunctionArguments;
+      minFunctionArguments = original.minFunctionArguments;
+      maxFunctionDefinitions = original.maxFunctionDefinitions;
+      minFunctionDefinitions = original.minFunctionDefinitions;
+    }
+
     public GlobalSymbolicExpressionGrammar(ISymbolicExpressionGrammar mainBranchGrammar)
       : base(mainBranchGrammar) {
@@ -100 +111 @@
           SetAllowedChild(defunSymbol, Symbols.Where(s => s.Name == symb.Name).First(), 0);
       }
-    }
-
-    //ctor for cloning
-    private GlobalSymbolicExpressionGrammar() : base() { }
-    [StorableConstructor]
-    private GlobalSymbolicExpressionGrammar(bool deserializing)
-      : base(deserializing) {
     }
 
@@ -171 +175 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      GlobalSymbolicExpressionGrammar clone = (GlobalSymbolicExpressionGrammar)base.Clone(cloner);
-      clone.defunSymbol = (Defun)cloner.Clone(this.defunSymbol);
-      clone.maxFunctionArguments = this.maxFunctionArguments;
-      clone.minFunctionArguments = this.minFunctionArguments;
-      clone.maxFunctionDefinitions = this.maxFunctionDefinitions;
-      clone.minFunctionDefinitions = this.minFunctionDefinitions;
-      return clone;
+      return new GlobalSymbolicExpressionGrammar(this, cloner);
     }
   }