Changeset 5288 for trunk

Timestamp:

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

Author:

mkommend

Message:

Implemented Power symbol for GP (ticket #1374).

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3

Files:

• HeuristicLab.Problems.DataAnalysis-3.3.csproj (modified) (2 diffs)
• Symbolic/FullFunctionalExpressionGrammar.cs (modified) (2 diffs)
• Symbolic/SimpleArithmeticExpressionInterpreter.cs (modified) (3 diffs)
• Symbolic/Symbols/Power.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/Exponential.cs) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/HeuristicLab.Problems.DataAnalysis-3.3.csproj

@@ -12 +12 @@
     <AssemblyName>HeuristicLab.Problems.DataAnalysis-3.3</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile></TargetFrameworkProfile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
@@ -107 +108 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Symbolic\Symbols\Power.cs" />
     <Compile Include="TableFileParser.cs" />
     <None Include="HeuristicLab.snk" />

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

@@ -53 +53 @@
       var tan = new Tangent();
       var log = new Logarithm();
+      var pow = new Power();
       var exp = new Exponential();
       var @if = new IfThenElse();
@@ -67 +68 @@
       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, constant, variableSymbol, laggedVariable };
+      var allSymbols = new List<Symbol>() { add, sub, mul, div, mean, sin, cos, tan, log, pow, exp, @if, gt, lt, and, or, not, constant, variableSymbol, laggedVariable };
       var unaryFunctionSymbols = new List<Symbol>() { sin, cos, tan, log, exp, not };
-      var binaryFunctionSymbols = new List<Symbol>() { gt, lt };
+      var binaryFunctionSymbols = new List<Symbol>() { pow, gt, lt };
       var functionSymbols = new List<Symbol>() { add, sub, mul, div, mean, and, or };
       var terminalSymbols = new List<Symbol>() { variableSymbol, constant, laggedVariable };

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));

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

@@ -26 +26 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
   [StorableClass]
-  [Item("Exponential", "Symbol that represents the exponential function.")]
-  public sealed class Exponential : Symbol {
+  [Item("Power", "Symbol that represents the power function.")]
+  public sealed class Power : Symbol {
     [StorableConstructor]
-    private Exponential(bool deserializing) : base(deserializing) { }
-    private Exponential(Exponential original, Cloner cloner) : base(original, cloner) { }
+    private Power(bool deserializing) : base(deserializing) { }
+    private Power(Power original, Cloner cloner) : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new Exponential(this, cloner);
+      return new Power(this, cloner);
     }
-    public Exponential() : base("Exponential", "Symbol that represents the exponential function.") { }
+    public Power() : base("Power", "Symbol that represents the power function.") { }
   }
 }