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

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

Location:

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis/3.3/Symbolic/Symbols

Files:

• DerivativeVariable.cs (modified) (2 diffs)
• DerivativeVariableTreeNode.cs (modified) (2 diffs)
• IntegratedVariable.cs (modified) (2 diffs)
• IntegratedVariableTreeNode.cs (modified) (2 diffs)
• MovingAverage.cs (modified) (2 diffs)
• MovingAverageTreeNode.cs (modified) (2 diffs)

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis/3.3/Symbolic/Symbols/DerivativeVariable.cs

@@ -47 +47 @@
       set { maxLag = value; }
     }
+    [StorableConstructor]
+    protected DerivativeVariable(bool deserializing) : base(deserializing) { }
+    protected DerivativeVariable(DerivativeVariable original, Cloner cloner)
+      : base(original, cloner) {
+        minLag = original.minLag;
+        maxLag = original.maxLag;
+    }
     public DerivativeVariable()
       : base("DerivativeVariable", "Represents an differentiated variable value with a time offset.") {
@@ -57 +64 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      DerivativeVariable clone = (DerivativeVariable)base.Clone(cloner);
-      clone.minLag = minLag;
-      clone.maxLag = maxLag;
-      return clone;
+      return new DerivativeVariable(this, cloner);
     }
   }

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis/3.3/Symbolic/Symbols/DerivativeVariableTreeNode.cs

@@ -44 +44 @@
     private DerivativeVariableTreeNode() { }
 
-    // copy constructor
-    private DerivativeVariableTreeNode(DerivativeVariableTreeNode original)
-      : base(original) {
-      lag = original.lag;
+    [StorableConstructor]
+    protected DerivativeVariableTreeNode(bool deserializing) : base(deserializing) { }
+    protected DerivativeVariableTreeNode(DerivativeVariableTreeNode original, Cloner cloner)
+      : base(original, cloner) {
+        lag = original.lag;
     }
 
@@ -69 +70 @@
 
 
-    public override object Clone() {
-      return new DerivativeVariableTreeNode(this);
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new DerivativeVariableTreeNode(this, cloner);
     }
 

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis/3.3/Symbolic/Symbols/IntegratedVariable.cs

@@ -47 +47 @@
       set { maxLag = value; }
     }
+    [StorableConstructor]
+    protected IntegratedVariable(bool deserializing) : base(deserializing) { }
+    protected IntegratedVariable(IntegratedVariable original, Cloner cloner)
+      : base(original, cloner) {
+        minLag = original.minLag;
+        maxLag = original.maxLag;
+    }
     public IntegratedVariable()
       : base("IntegratedVariable", "Represents an integrated variable value with a time offset.") {
@@ -57 +64 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      IntegratedVariable clone = (IntegratedVariable)base.Clone(cloner);
-      clone.minLag = minLag;
-      clone.maxLag = maxLag;
-      return clone;
+      return new IntegratedVariable(this, cloner);
     }
   }

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis/3.3/Symbolic/Symbols/IntegratedVariableTreeNode.cs

@@ -50 +50 @@
 
     private IntegratedVariableTreeNode() { }
-
-    // copy constructor
-    private IntegratedVariableTreeNode(IntegratedVariableTreeNode original)
-      : base(original) {
+    [StorableConstructor]
+    protected IntegratedVariableTreeNode(bool deserializing) : base(deserializing) { }
+    protected IntegratedVariableTreeNode(IntegratedVariableTreeNode original, Cloner cloner)
+      : base(original, cloner) {
       minTimeOffset = original.minTimeOffset;
       maxTimeOffset = original.maxTimeOffset;
@@ -77 +77 @@
       maxTimeOffset = Math.Min(Symbol.MaxLag, Math.Max(minTimeOffset, maxTimeOffset + random.Next(-1, 2)));
     }
-
-
-    public override object Clone() {
-      return new IntegratedVariableTreeNode(this);
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new IntegratedVariableTreeNode(this, cloner);
     }
-
     public override string ToString() {
       return Weight.ToString("E4") + " I(" + VariableName +

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis/3.3/Symbolic/Symbols/MovingAverage.cs

@@ -47 +47 @@
       set { maxLag = value; }
     }
+    [StorableConstructor]
+    protected MovingAverage(bool deserializing) : base(deserializing) { }
+    protected MovingAverage(MovingAverage original, Cloner cloner)
+      : base(original, cloner) {
+      minLag = original.minLag;
+      maxLag = original.maxLag;
+    }
     public MovingAverage()
       : base("MovingAverage", "Represents a moving average of a variable value with a time offset.") {
@@ -57 +64 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      MovingAverage clone = (MovingAverage)base.Clone(cloner);
-      clone.minLag = minLag;
-      clone.maxLag = maxLag;
-      return clone;
+      return new MovingAverage(this, cloner);
     }
   }

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis/3.3/Symbolic/Symbols/MovingAverageTreeNode.cs

@@ -50 +50 @@
 
     private MovingAverageTreeNode() { }
-
-    // copy constructor
-    private MovingAverageTreeNode(MovingAverageTreeNode original)
-      : base(original) {
+    [StorableConstructor]
+    protected MovingAverageTreeNode(bool deserializing) : base(deserializing) { }
+    protected MovingAverageTreeNode(MovingAverageTreeNode original, Cloner cloner)
+      : base(original, cloner) {
       minTimeOffset = original.minTimeOffset;
       maxTimeOffset = original.maxTimeOffset;
@@ -79 +79 @@
 
 
-    public override object Clone() {
-      return new MovingAverageTreeNode(this);
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new MovingAverageTreeNode(this, cloner);
     }
-
     public override string ToString() {
       return Weight.ToString("E4") + " MA(" + VariableName +