Changeset 5051

Timestamp:

12/07/10 10:23:58 (14 years ago)

Author:

mkommend

Message:

Added new symbols for GP (ticket #1256).

Location:

branches/GP.Symbols (TimeLag, Diff, Integral)

Files:

• GP.Symbols.sln (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.3/HeuristicLab.Problems.DataAnalysis.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic/Symbols/TimeLagView.Designer.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic/Symbols/TimeLagView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.3/HeuristicLab.Problems.DataAnalysis-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/FullFunctionalExpressionGrammar.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SimpleArithmeticExpressionInterpreter.cs (modified) (8 diffs)
• HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/Derivative.cs (added)
• HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/Integral.cs (added)
• HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/TimeLag.cs (modified) (1 diff)

branches/GP.Symbols (TimeLag, Diff, Integral)/GP.Symbols.sln

@@ -78 +78 @@
     {6BB69BAC-FB8F-4E57-881A-557F350B7611}.Debug|x64.ActiveCfg = Debug|Any CPU
     {6BB69BAC-FB8F-4E57-881A-557F350B7611}.Debug|x86.ActiveCfg = Debug|Any CPU
+    {6BB69BAC-FB8F-4E57-881A-557F350B7611}.Debug|x86.Build.0 = Debug|Any CPU
     {6BB69BAC-FB8F-4E57-881A-557F350B7611}.Release|Any CPU.ActiveCfg = Release|Any CPU
     {6BB69BAC-FB8F-4E57-881A-557F350B7611}.Release|Any CPU.Build.0 = Release|Any CPU

branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis.Views/3.3/HeuristicLab.Problems.DataAnalysis.Views-3.3.csproj

@@ -256 +256 @@
     <Compile Include="Symbolic\Symbols\LaggedVariableView.Designer.cs">
       <DependentUpon>LaggedVariableView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Symbolic\Symbols\TimeLagView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Symbolic\Symbols\TimeLagView.Designer.cs">
+      <DependentUpon>TimeLagView.cs</DependentUpon>
     </Compile>
     <Compile Include="Symbolic\Symbols\VariableView.cs">

branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic/Symbols/TimeLagView.Designer.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.Problems.DataAnalysis.Views.Symbolic.Symbols {
-  partial class TimeLagView {
+  partial class LaggedSymbolView {
     /// <summary> 
     /// Required designer variable.

branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic/Symbols/TimeLagView.cs

@@ -22 +22 @@
 using System;
 using System.Windows.Forms;
+using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
 using HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols;
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views;
 
 namespace HeuristicLab.Problems.DataAnalysis.Views.Symbolic.Symbols {
-  [View("TimeLag View")]
-  [Content(typeof(TimeLag), true)]
-  public partial class TimeLagView : SymbolView {
-    public new TimeLag Content {
-      get { return (TimeLag)base.Content; }
+  [View("LaggedSymbol View")]
+  [Content(typeof(LaggedSymbol), true)]
+  public partial class LaggedSymbolView : SymbolView {
+    public new LaggedSymbol Content {
+      get { return (LaggedSymbol)base.Content; }
       set { base.Content = value; }
     }
 
-    public TimeLagView() {
+    public LaggedSymbolView() {
       InitializeComponent();
     }

branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis/3.3/HeuristicLab.Problems.DataAnalysis-3.3.csproj

@@ -154 +154 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Symbolic\Symbols\Derivative.cs" />
+    <Compile Include="Symbolic\Symbols\Integral.cs" />
     <Compile Include="TableFileParser.cs" />
     <None Include="HeuristicLab.snk" />

branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/FullFunctionalExpressionGrammar.cs

@@ -62 +62 @@
       var timeLag = new TimeLag();
       timeLag.InitialFrequency = 0.0;
+      var integral = new Integral();
+      integral.InitialFrequency = 0.0;
+      var derivativ = new Derivative();
+      derivativ.InitialFrequency = 0.0;
+
       var constant = new Constant();
       constant.MinValue = -20;
@@ -69 +74 @@
       laggedVariable.InitialFrequency = 0.0;
 
-      var allSymbols = new List<Symbol>() { add, sub, mul, div, mean, sin, cos, tan, log, exp, @if, gt, lt, and, or, not, timeLag, constant, variableSymbol, laggedVariable };
-      var unaryFunctionSymbols = new List<Symbol>() { sin, cos, tan, log, exp, not, timeLag };
+      var allSymbols = new List<Symbol>() { add, sub, mul, div, mean, sin, cos, tan, log, exp, @if, gt, lt, and, or, not, timeLag, integral, derivativ, constant, variableSymbol, laggedVariable };
+      var unaryFunctionSymbols = new List<Symbol>() { sin, cos, tan, log, exp, not, timeLag, integral, derivativ };
       var binaryFunctionSymbols = new List<Symbol>() { gt, lt };
       var functionSymbols = new List<Symbol>() { add, sub, mul, div, mean, and, or };

branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SimpleArithmeticExpressionInterpreter.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -35 +36 @@
   // not thread safe!
   public sealed class SimpleArithmeticExpressionInterpreter : NamedItem, ISymbolicExpressionTreeInterpreter {
+    private struct InstructionEvaluation {
+      int instructionIndex;
+      int row;
+    }
+
     private class OpCodes {
       public const byte Add = 1;
@@ -68 +74 @@
 
       public const byte TimeLag = 22;
+      public const byte Integral = 23;
+      public const byte Derivative = 24;
     }
 
@@ -93 +101 @@
       { typeof(Argument), OpCodes.Arg },
       { typeof(TimeLag), OpCodes.TimeLag},
+      { typeof(Integral), OpCodes.Integral},
+      { typeof(Derivative), OpCodes.Derivative}
     };
     private const int ARGUMENT_STACK_SIZE = 1024;
@@ -102 +112 @@
     private double[] argumentStack = new double[ARGUMENT_STACK_SIZE];
     private int argStackPointer;
+    private Dictionary<InstructionEvaluation, double> cachedEvaluations;
 
     public override bool CanChangeName {
@@ -120 +131 @@
     public SimpleArithmeticExpressionInterpreter()
       : base() {
+      cachedEvaluations = new Dictionary<InstructionEvaluation, double>();
     }
 
     public IEnumerable<double> GetSymbolicExpressionTreeValues(SymbolicExpressionTree tree, Dataset dataset, IEnumerable<int> rows) {
       this.dataset = dataset;
+      cachedEvaluations.Clear();
       var compiler = new SymbolicExpressionTreeCompiler();
       compiler.AddInstructionPostProcessingHook(PostProcessInstruction);
@@ -133 +146 @@
         yield return Evaluate();
       }
+      cachedEvaluations.Clear();
     }
 
@@ -295 +309 @@
         case OpCodes.TimeLag: {
             var timeLagTreeNode = (LaggedTreeNode)currentInstr.dynamicNode;
+            if (row + timeLagTreeNode.Lag < 0 || row + timeLagTreeNode.Lag >= dataset.Rows)
+              return double.NaN;
+
             row += timeLagTreeNode.Lag;
-            if (row < 0 || row >= dataset.Rows) {
-              row -= timeLagTreeNode.Lag;
-              return double.NaN;
-            }
             double result = Evaluate();
             row -= timeLagTreeNode.Lag;
             return result;
+          }
+        case OpCodes.Integral: {
+            int nextPc = pc;
+            var timeLagTreeNode = (LaggedTreeNode)currentInstr.dynamicNode;
+            if (row + timeLagTreeNode.Lag < 0 || row + timeLagTreeNode.Lag >= dataset.Rows)
+              return double.NaN;
+            double sum = 0.0;
+            if (timeLagTreeNode.IterateNodesPrefix().OfType<VariableTreeNode>().Any()) {
+              for (int i = 0; i < Math.Abs(timeLagTreeNode.Lag); i++) {
+                row += Math.Sign(timeLagTreeNode.Lag);
+                sum += Evaluate();
+                pc = nextPc;
+              }
+              row -= timeLagTreeNode.Lag;
+              sum += Evaluate();
+            } else sum = Math.Abs(timeLagTreeNode.Lag) * Evaluate();
+            return sum;
+          }
+
+        //mkommend: derivate calculation taken from: 
+        //http://www.holoborodko.com/pavel/numerical-methods/numerical-derivative/smooth-low-noise-differentiators/
+        //one sided smooth differentiatior, N = 4
+        // y' = 1/8h (f_i + 2f_i-1, -2 f_i-3 - f_i-4)
+        case OpCodes.Derivative: {
+            if (row - 4 < 0) return double.NaN;
+            int nextPc = pc;
+            double f_0 = Evaluate(); row--;
+            pc = nextPc;
+            double f_1 = Evaluate(); row -= 2;
+            pc = nextPc;
+            double f_3 = Evaluate(); row--;
+            pc = nextPc;
+            double f_4 = Evaluate();
+            row += 4;
+
+            return (f_0 + 2 * f_1 - 2 * f_3 - f_4) / 8; // h = 1
           }
         default: throw new NotSupportedException();

branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/TimeLag.cs

@@ -31 +31 @@
     private TimeLag(bool deserializing) : base(deserializing) { }
     private TimeLag(TimeLag original, Cloner cloner) : base(original, cloner) { }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new TimeLag(this, cloner);
-    }
+    public override IDeepCloneable Clone(Cloner cloner) { return new TimeLag(this, cloner); }
+
     public TimeLag() : base("TimeLag", "Represents a symblol whose evaluation is shifted.") { }
   }