Changeset 365

Timestamp:

07/07/08 15:10:51 (16 years ago)

Author:

gkronber

Message:

implemented #195

Location:

trunk/sources/HeuristicLab.Functions

Files:

• BakedTreeEvaluator.cs (modified) (1 diff)
• Differential.cs (added)
• FunctionView.cs (modified) (1 diff)
• HeuristicLab.Functions.csproj (modified) (1 diff)
• IFunctionVisitor.cs (modified) (1 diff)
• ModelAnalyzerExporter.cs (modified) (1 diff)
• SymbolTable.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Functions/BakedTreeEvaluator.cs

@@ -96 +96 @@
             return currInstr.d_arg0;
           }
+        case EvaluatorSymbolTable.DIFFERENTIAL: {
+            int row = sampleIndex + currInstr.i_arg1;
+            if(row < 1 || row >= dataset.Rows) return double.NaN;
+            else return currInstr.d_arg0 * (dataset.GetValue(row, currInstr.i_arg0) - dataset.GetValue(row - 1, currInstr.i_arg0));
+          }
         case EvaluatorSymbolTable.MULTIPLICATION: {
             double result = EvaluateBakedCode();

trunk/sources/HeuristicLab.Functions/FunctionView.cs

@@ -168 +168 @@
       public void Visit(Cosinus cosinus) {
         name = "Sin";
+      }
+
+      public void Visit(Differential diff) {
+        string timeOffset = "";
+        int sampleOffset = ((ConstrainedIntData)currentBranch.GetLocalVariable(HeuristicLab.Functions.Differential.OFFSET).Value).Data;
+        int variableIndex = ((ConstrainedIntData)currentBranch.GetLocalVariable(HeuristicLab.Functions.Differential.INDEX).Value).Data;
+        double weight = ((ConstrainedDoubleData)currentBranch.GetLocalVariable(HeuristicLab.Functions.Differential.WEIGHT).Value).Data;
+        if(sampleOffset < 0) {
+          timeOffset = "(t" + sampleOffset + ")";
+        } else if(sampleOffset > 0) {
+          timeOffset = "(t+" + sampleOffset + ")";
+        } else {
+          timeOffset = "";
+        }
+        name = "Diff" + variableIndex + timeOffset + " * " + weight;
       }
 

trunk/sources/HeuristicLab.Functions/HeuristicLab.Functions.csproj

@@ -56 +56 @@
     <Compile Include="BakedTreeEvaluator.cs" />
     <Compile Include="Constant.cs" />
+    <Compile Include="Differential.cs" />
     <Compile Include="GreaterThan.cs" />
     <Compile Include="IfThenElse.cs">

trunk/sources/HeuristicLab.Functions/IFunctionVisitor.cs

@@ -33 +33 @@
     void Visit(Constant constant);
     void Visit(Cosinus cosinus);
+    void Visit(Differential differential);
     void Visit(Division division);
     void Visit(Equal equal);

trunk/sources/HeuristicLab.Functions/ModelAnalyzerExporter.cs

@@ -59 +59 @@
     public void Visit(Cosinus cosinus) {
       VisitFunction("Trigonometrics[1]", cosinus);
+    }
+
+    public void Visit(Differential differential) {
+      double weight = ((ConstrainedDoubleData)currentBranch.GetLocalVariable(HeuristicLab.Functions.Differential.WEIGHT).Value).Data;
+      double index = ((ConstrainedIntData)currentBranch.GetLocalVariable(HeuristicLab.Functions.Differential.INDEX).Value).Data;
+      double offset = ((ConstrainedIntData)currentBranch.GetLocalVariable(HeuristicLab.Functions.Differential.OFFSET).Value).Data;
+
+      prefix += currentIndend + "[T]Differential(" + weight.ToString("r") + ";" + index + ";" + -offset + ")";
     }
 

trunk/sources/HeuristicLab.Functions/SymbolTable.cs

@@ -34 +34 @@
     public const int CONSTANT = 4;
     public const int COSINUS = 5;
+    public const int DIFFERENTIAL = 25;
     public const int DIVISION = 6;
     public const int EQU = 7;
@@ -82 +83 @@
       staticTypes[typeof(Variable)] = VARIABLE;
       staticTypes[typeof(Xor)] = XOR;
+      staticTypes[typeof(Differential)] = DIFFERENTIAL;
     }