Changeset 5060 for branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis

Timestamp:

12/07/10 14:11:12 (14 years ago)

Author:

mkommend

Message:

Implemented VariableCondition symbol (ticket #1325).

Location:

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

Files:

• HeuristicLab.Problems.DataAnalysis-3.3.csproj (modified) (1 diff)
• Symbolic/FullFunctionalExpressionGrammar.cs (modified) (2 diffs)
• Symbolic/SimpleArithmeticExpressionInterpreter.cs (modified) (4 diffs)
• Symbolic/Symbols/Variable.cs (modified) (1 diff)
• Symbolic/Symbols/VariableCondition.cs (added)
• Symbolic/Symbols/VariableConditionTreeNode.cs (added)
• Symbolic/Symbols/VariableTreeNode.cs (modified) (1 diff)

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

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

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

@@ -60 +60 @@
       var or = new Or();
       var not = new Not();
+
       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 derivative = new Derivative();
+      derivative.InitialFrequency = 0.0;
+
+      var variableCondition = new VariableCondition();
+      variableCondition.InitialFrequency = 0.0;
 
       var constant = new Constant();
@@ -74 +78 @@
       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, 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 allSymbols = new List<Symbol>() { add, sub, mul, div, mean, sin, cos, tan, log, exp, @if, gt, lt,
+        and, or, not, timeLag, integral, derivative, variableCondition, constant, variableSymbol, laggedVariable };
+      var unaryFunctionSymbols = new List<Symbol>() { sin, cos, tan, log, exp, not, timeLag, integral, derivative };
+      var binaryFunctionSymbols = new List<Symbol>() { gt, lt, variableCondition };
       var functionSymbols = new List<Symbol>() { add, sub, mul, div, mean, and, or };
       var terminalSymbols = new List<Symbol>() { variableSymbol, constant, laggedVariable };

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

@@ -71 +71 @@
       public const byte Integral = 23;
       public const byte Derivative = 24;
+
+      public const byte VariableCondition = 25;
     }
 
@@ -97 +99 @@
       { typeof(TimeLag), OpCodes.TimeLag},
       { typeof(Integral), OpCodes.Integral},
-      { typeof(Derivative), OpCodes.Derivative}
+      { typeof(Derivative), OpCodes.Derivative},
+      { typeof(VariableCondition),OpCodes.VariableCondition}
     };
     private const int ARGUMENT_STACK_SIZE = 1024;
@@ -147 +150 @@
         var variableTreeNode = instr.dynamicNode as LaggedVariableTreeNode;
         instr.iArg0 = (ushort)dataset.GetVariableIndex(variableTreeNode.VariableName);
+      } else if (instr.opCode == OpCodes.VariableCondition) {
+        var variableConditionTreeNode = instr.dynamicNode as VariableConditionTreeNode;
+        instr.iArg0 = (ushort)dataset.GetVariableIndex(variableConditionTreeNode.VariableName);
       }
       return instr;
@@ -344 +350 @@
             return (f_0 + 2 * f_1 - 2 * f_3 - f_4) / 8; // h = 1
           }
+
+        //mkommend: this symbol uses the logistic function f(x) = 1 / (1 + e^(-alpha * x) ) 
+        //to determine the relative amounts of the true and false branch see http://en.wikipedia.org/wiki/Logistic_function
+        case OpCodes.VariableCondition: {
+            var variableConditionTreeNode = (VariableConditionTreeNode)currentInstr.dynamicNode;
+            double variableValue = dataset[row, currentInstr.iArg0];
+            double x = variableValue - variableConditionTreeNode.Threshold;
+            double p = 1 / (1 + Math.Exp(-variableConditionTreeNode.Slope * x));
+
+            double trueBranch = Evaluate();
+            double falseBranch = Evaluate();
+
+            return trueBranch * p + falseBranch * (1 - p);
+          }
         default: throw new NotSupportedException();
       }

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

@@ -91 +91 @@
     #endregion
     [StorableConstructor]
-    protected Variable(bool deserializing) : base(deserializing) {
+    protected Variable(bool deserializing)
+      : base(deserializing) {
       variableNames = new List<string>();
     }

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

@@ -55 +55 @@
 
     public override bool HasLocalParameters {
-      get {
-        return true;
-      }
+      get { return true; }
     }