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

Timestamp:

01/11/11 15:03:46 (13 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.TimeSeriesPrognosis/3.3/Symbolic/Symbols/MovingAverage.cs (modified) (2 diffs)

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);
     }
   }