Changeset 4022 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic

Timestamp:

07/09/10 17:01:36 (14 years ago)

Author:

gkronber

Message:

Worked on symbolic regression classes to prepare for time series prognosis plugin. #1081

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic

Files:

• SimpleArithmeticExpressionInterpreter.cs (modified) (3 diffs)
• Symbols/LaggedVariable.cs (modified) (3 diffs)
• Symbols/LaggedVariableTreeNode.cs (modified) (5 diffs)
• Symbols/Variable.cs (modified) (2 diffs)
• Symbols/VariableTreeNode.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SimpleArithmeticExpressionInterpreter.cs

@@ -21 +21 @@
 
 using System;
+using System.Linq;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Common;
@@ -97 +98 @@
     private Instruction[] code;
     private int pc;
+    private double[] argumentStack = new double[ARGUMENT_STACK_SIZE];
+    private int argStackPointer;
 
     public override bool CanChangeName {
@@ -140 +143 @@
     }
 
-    private double[] argumentStack = new double[ARGUMENT_STACK_SIZE];
-    private int argStackPointer;
-
-    public double Evaluate() {
-      var currentInstr = code[pc++];
+    private double Evaluate() {
+      Instruction currentInstr = code[pc++];
       switch (currentInstr.opCode) {
         case OpCodes.Add: {

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/LaggedVariable.cs

@@ -34 +34 @@
   [StorableClass]
   [Item("LaggedVariable", "Represents a variable value with a time offset.")]
-  public sealed class LaggedVariable : Symbol {
-    #region Properties
-    [Storable]
-    private double weightNu;
-    public double WeightNu {
-      get { return weightNu; }
-      set { weightNu = value; }
-    }
-    [Storable]
-    private double weightSigma;
-    public double WeightSigma {
-      get { return weightSigma; }
-      set {
-        if (weightSigma < 0.0) throw new ArgumentException("Negative sigma is not allowed.");
-        weightSigma = value;
-      }
-    }
-    [Storable]
-    private double weightManipulatorNu;
-    public double WeightManipulatorNu {
-      get { return weightManipulatorNu; }
-      set { weightManipulatorNu = value; }
-    }
-    [Storable]
-    private double weightManipulatorSigma;
-    public double WeightManipulatorSigma {
-      get { return weightManipulatorSigma; }
-      set {
-        if (weightManipulatorSigma < 0.0) throw new ArgumentException("Negative sigma is not allowed.");
-        weightManipulatorSigma = value;
-      }
-    }
-    private List<string> variableNames;
-    [Storable]
-    public IEnumerable<string> VariableNames {
-      get { return variableNames; }
-      set {
-        if (value == null) throw new ArgumentNullException();
-        variableNames.Clear();
-        variableNames.AddRange(value);
-      }
-    }
+  public sealed class LaggedVariable : Variable {
+    //#region Properties
+    //[Storable]
+    //private double weightNu;
+    //public double WeightNu {
+    //  get { return weightNu; }
+    //  set { weightNu = value; }
+    //}
+    //[Storable]
+    //private double weightSigma;
+    //public double WeightSigma {
+    //  get { return weightSigma; }
+    //  set {
+    //    if (weightSigma < 0.0) throw new ArgumentException("Negative sigma is not allowed.");
+    //    weightSigma = value;
+    //  }
+    //}
+    //[Storable]
+    //private double weightManipulatorNu;
+    //public double WeightManipulatorNu {
+    //  get { return weightManipulatorNu; }
+    //  set { weightManipulatorNu = value; }
+    //}
+    //[Storable]
+    //private double weightManipulatorSigma;
+    //public double WeightManipulatorSigma {
+    //  get { return weightManipulatorSigma; }
+    //  set {
+    //    if (weightManipulatorSigma < 0.0) throw new ArgumentException("Negative sigma is not allowed.");
+    //    weightManipulatorSigma = value;
+    //  }
+    //}
+    //private List<string> variableNames;
+    //[Storable]
+    //public IEnumerable<string> VariableNames {
+    //  get { return variableNames; }
+    //  set {
+    //    if (value == null) throw new ArgumentNullException();
+    //    variableNames.Clear();
+    //    variableNames.AddRange(value);
+    //  }
+    //}
     [Storable]
     private int minLag;
@@ -88 +88 @@
       set { maxLag = value; }
     }
-    #endregion
+    //#endregion
     public LaggedVariable()
       : base("LaggedVariable", "Represents a variable value with a time offset.") {
-      weightNu = 1.0;
-      weightSigma = 1.0;
-      weightManipulatorNu = 0.0;
-      weightManipulatorSigma = 1.0;
-      variableNames = new List<string>();
-      minLag = 0; maxLag = 0;
+      //weightNu = 1.0;
+      //weightSigma = 1.0;
+      //weightManipulatorNu = 0.0;
+      //weightManipulatorSigma = 1.0;
+      //variableNames = new List<string>();
+      minLag = -1; maxLag = -1;
     }
 
@@ -105 +105 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       LaggedVariable clone = (LaggedVariable)base.Clone(cloner);
-      clone.weightNu = weightNu;
-      clone.weightSigma = weightSigma;
-      clone.variableNames = new List<string>(variableNames);
-      clone.weightManipulatorNu = weightManipulatorNu;
-      clone.weightManipulatorSigma = weightManipulatorSigma;
+      //clone.weightNu = weightNu;
+      //clone.weightSigma = weightSigma;
+      //clone.variableNames = new List<string>(variableNames);
+      //clone.weightManipulatorNu = weightManipulatorNu;
+      //clone.weightManipulatorSigma = weightManipulatorSigma;
       clone.minLag = minLag;
       clone.maxLag = maxLag;

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/LaggedVariableTreeNode.cs

@@ -30 +30 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
   [StorableClass]
-  public sealed class LaggedVariableTreeNode : SymbolicExpressionTreeTerminalNode {
+  public sealed class LaggedVariableTreeNode : VariableTreeNode {
     public new LaggedVariable Symbol {
       get { return (LaggedVariable)base.Symbol; }
-    }
-    [Storable]
-    private double weight;
-    public double Weight {
-      get { return weight; }
-      set { weight = value; }
-    }
-    [Storable]
-    private string variableName;
-    public string VariableName {
-      get { return variableName; }
-      set { variableName = value; }
     }
     [Storable]
@@ -58 +46 @@
     private LaggedVariableTreeNode(LaggedVariableTreeNode original)
       : base(original) {
-      weight = original.weight;
-      variableName = original.variableName;
       lag = original.lag;
     }
@@ -73 +59 @@
     public override void ResetLocalParameters(IRandom random) {
       base.ResetLocalParameters(random);
-      weight = NormalDistributedRandom.NextDouble(random, Symbol.WeightNu, Symbol.WeightSigma);
-      variableName = Symbol.VariableNames.SelectRandom(random);
       lag = random.Next(Symbol.MinLag, Symbol.MaxLag + 1);
     }
@@ -80 +64 @@
     public override void ShakeLocalParameters(IRandom random, double shakingFactor) {
       base.ShakeLocalParameters(random, shakingFactor);
-      double x = NormalDistributedRandom.NextDouble(random, Symbol.WeightManipulatorNu, Symbol.WeightManipulatorSigma);
-      weight = weight + x * shakingFactor;
-      variableName = Symbol.VariableNames.SelectRandom(random);
-      lag = lag + random.Next(-1, 2);
+      lag = Math.Min(Symbol.MaxLag, Math.Max(Symbol.MinLag, lag + random.Next(-1, 2)));
     }
 
@@ -92 +73 @@
 
     public override string ToString() {
-      return weight.ToString("E4") + " " + variableName + " (t" + (lag > 0 ? "+" : "") + lag + ")";
+      return base.ToString() +
+        " (t" + (lag > 0 ? "+" : "") + lag + ")";
     }
   }

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/Variable.cs

@@ -34 +34 @@
   [StorableClass]
   [Item("Variable", "Represents a variable value.")]
-  public sealed class Variable : Symbol {
+  public class Variable : Symbol {
     #region Properties
     [Storable]
@@ -94 +94 @@
     }
     #endregion
-    public Variable()
-      : base("Variable", "Represents a variable value.") {
+    public Variable() : this("Variable", "Represents a variable value.") { }
+    public Variable(string name, string description)
+      : base(name, description) {
       weightNu = 1.0;
       weightSigma = 1.0;

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/VariableTreeNode.cs

@@ -30 +30 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
   [StorableClass]
-  public sealed class VariableTreeNode : SymbolicExpressionTreeTerminalNode {
+  public class VariableTreeNode : SymbolicExpressionTreeTerminalNode {
     public new Variable Symbol {
       get { return (Variable)base.Symbol; }
@@ -48 +48 @@
 
 
-    private VariableTreeNode() { }
+    protected VariableTreeNode() { }
 
     // copy constructor
-    private VariableTreeNode(VariableTreeNode original)
+    protected VariableTreeNode(VariableTreeNode original)
       : base(original) {
       weight = original.weight;