Changeset 5288 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SimpleArithmeticExpressionInterpreter.cs

Timestamp:

01/12/11 13:19:53 (14 years ago)

Author:

mkommend

Message:

Implemented Power symbol for GP (ticket #1374).

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SimpleArithmeticExpressionInterpreter.cs (modified) (3 diffs)

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

@@ -65 +65 @@
       public const byte Constant = 20;
       public const byte Arg = 21;
+
+      public const byte Power = 22;
     }
 
@@ -89 +91 @@
       { typeof(Constant), OpCodes.Constant },
       { typeof(Argument), OpCodes.Arg },
+      { typeof(Power),OpCodes.Power},
     };
     private const int ARGUMENT_STACK_SIZE = 1024;
@@ -185 +188 @@
             return Math.Tan(Evaluate(dataset, ref row, code, ref pc, argumentStack, ref argStackPointer));
           }
+        case OpCodes.Power: {
+            double x = Evaluate(dataset, ref row, code, ref pc, argumentStack, ref argStackPointer);
+            double y = Evaluate(dataset, ref row, code, ref pc, argumentStack, ref argStackPointer);
+            return Math.Pow(x, y);
+          }
         case OpCodes.Exp: {
             return Math.Exp(Evaluate(dataset, ref row, code, ref pc, argumentStack, ref argStackPointer));