Changeset 5275 for branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/BasicExpressionGrammar.cs

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/3.3/Symbolic/BasicExpressionGrammar.cs (modified) (3 diffs)

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/BasicExpressionGrammar.cs

@@ -26 +26 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols;
+using HeuristicLab.Common;
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   [StorableClass]
@@ -33 +34 @@
     private HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols.Variable variableSymbol;
 
+    [StorableConstructor]
+    protected BasicExpressionGrammar(bool deserializing) : base(deserializing) { }
+    protected BasicExpressionGrammar(BasicExpressionGrammar original, Cloner cloner)
+      : base(original, cloner) {
+      foreach (var symb in Symbols) {
+        var varSym = symb as HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols.Variable;
+        if (varSym != null) this.variableSymbol = varSym;
+        break;
+      }
+    }
     public BasicExpressionGrammar()
       : base() {
@@ -38 +49 @@
     }
 
-    [StorableConstructor]
-    protected BasicExpressionGrammar(bool deserializing) : base(deserializing) { }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new BasicExpressionGrammar(this, cloner);
+    }
 
     private void Initialize() {