Changeset 8477 for branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/AutoregressiveVariable.cs

Timestamp:

08/13/12 16:18:37 (12 years ago)

Author:

mkommend

Message:

#1081:

• Added autoregressive target variable Symbol
• Merged trunk changes into the branch.

File:

• branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/AutoregressiveVariable.cs (copied) (copied from branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/LaggedVariable.cs) (1 diff)

branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/AutoregressiveVariable.cs

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   [StorableClass]
   [Item("LaggedVariable", "Represents a variable value with a time offset.")]
-  public sealed class LaggedVariable : Variable {
-    [Storable]
-    private int minLag;
-    public int MinLag {
-      get { return minLag; }
-      set { minLag = value; }
+  public sealed class AutoregressiveTargetVariable : LaggedVariable {
+    [StorableConstructor]
+    private AutoregressiveTargetVariable(bool deserializing) : base(deserializing) { }
+    private AutoregressiveTargetVariable(AutoregressiveTargetVariable original, Cloner cloner)
+      : base(original, cloner) {
     }
-    [Storable]
-    private int maxLag;
-    public int MaxLag {
-      get { return maxLag; }
-      set { maxLag = value; }
-    }
-    [StorableConstructor]
-    private LaggedVariable(bool deserializing) : base(deserializing) { }
-    private LaggedVariable(LaggedVariable original, Cloner cloner)
-      : base(original, cloner) {
-      minLag = original.minLag;
-      maxLag = original.maxLag;
-    }
-    public LaggedVariable()
-      : base("LaggedVariable", "Represents a variable value with a time offset.") {
-      minLag = -1; maxLag = -1;
-    }
-
-    public override ISymbolicExpressionTreeNode CreateTreeNode() {
-      return new LaggedVariableTreeNode(this);
-    }
-
+    public AutoregressiveTargetVariable() : base("Autoregressive Target Variable", "Represents the target variable with a time offset.") { }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new LaggedVariable(this, cloner);
+      return new AutoregressiveTargetVariable(this, cloner);
     }
   }