Changeset 4252

Timestamp:

08/18/10 15:11:52 (14 years ago)

Author:

mkommend

Message:

Updated grammars in DataAnalysis branch (ticket #1028).

Location:

branches/DataAnalysis

Files:

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

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis/3.3/Symbolic/SymbolicTimeSeriesPrognosisGrammar.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using System.Collections.Generic;
-using System;
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
+using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
-using HeuristicLab.Data;
+using HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis.Symbolic.Symbols;
 using HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols;
-using HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis.Symbolic.Symbols;
 
 namespace HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis.Symbolic {
@@ -46 +43 @@
       this.dimension = dimension;
       Initialize();
-    }
-
-    protected SymbolicTimeSeriesPrognosisGrammar(SymbolicTimeSeriesPrognosisGrammar original)
-      : base(original) {
-      this.dimension = original.dimension;
     }
 
@@ -140 +132 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new SymbolicTimeSeriesPrognosisGrammar(this);
+      SymbolicTimeSeriesPrognosisGrammar clone = (SymbolicTimeSeriesPrognosisGrammar)base.Clone(cloner);
+      clone.dimension = this.dimension;
+      return clone;
     }
   }

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

@@ -44 +44 @@
     }
 
-    protected MultiVariateExpressionGrammar(MultiVariateExpressionGrammar original)
-      : base(original) {
-      this.dimension = original.dimension;
-    }
-
     public void SetDimension(int n) {
       dimension = n;
@@ -63 +58 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      var clone = new MultiVariateExpressionGrammar(this);
-      cloner.RegisterClonedObject(this, clone);
+      MultiVariateExpressionGrammar clone = (MultiVariateExpressionGrammar)base.Clone(cloner);
+      clone.dimension = this.dimension;
       return clone;
     }