Changeset 5384 for trunk

Timestamp:

01/27/11 10:26:09 (14 years ago)

Author:

mkommend

Message:

ticket #1374 - Implemented root symbol and changed power as well as root symbol to use a rounded exponent.

Location:

trunk/sources/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) (3 diffs)
• Symbolic/Symbols/Root.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/Power.cs) (1 diff)

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

@@ -108 +108 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Symbolic\Symbols\Root.cs" />
     <Compile Include="Symbolic\Symbols\Derivative.cs" />
     <Compile Include="Symbolic\Symbols\Integral.cs" />

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

@@ -54 +54 @@
       var log = new Logarithm();
       var pow = new Power();
+      pow.InitialFrequency = 0.0;
+      var root = new Root();
+      root.InitialFrequency = 0.0;
       var exp = new Exponential();
       var @if = new IfThenElse();
@@ -76 +79 @@
       laggedVariable.InitialFrequency = 0.0;
 
-      var allSymbols = new List<Symbol>() { add, sub, mul, div, mean, sin, cos, tan, log, pow, exp, @if, gt, lt, and, or, not, timeLag, integral, derivative, constant, variableSymbol, laggedVariable };
+      var allSymbols = new List<Symbol>() { add, sub, mul, div, mean, sin, cos, tan, log, pow, root, exp, @if, gt, lt, and, or, not, timeLag, integral, derivative, constant, variableSymbol, laggedVariable };
       var unaryFunctionSymbols = new List<Symbol>() { sin, cos, tan, log, exp, not, timeLag, integral, derivative };
 
-      var binaryFunctionSymbols = new List<Symbol>() { pow, gt, lt };
+      var binaryFunctionSymbols = new List<Symbol>() { pow, root, 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

@@ -67 +67 @@
 
       public const byte Power = 22;
-      public const byte TimeLag = 23;
-      public const byte Integral = 24;
-      public const byte Derivative = 25;
+      public const byte Root = 23;
+      public const byte TimeLag = 24;
+      public const byte Integral = 25;
+      public const byte Derivative = 26;
     }
 
@@ -95 +96 @@
       { typeof(Argument), OpCodes.Arg },
       { typeof(Power),OpCodes.Power},
+      { typeof(Root),OpCodes.Root},
       { typeof(TimeLag), OpCodes.TimeLag}, 
       { typeof(Integral), OpCodes.Integral},
-      {typeof(Derivative), OpCodes.Derivative},
+      { typeof(Derivative), OpCodes.Derivative},
     };
     private const int ARGUMENT_STACK_SIZE = 1024;
@@ -196 +198 @@
         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);
+            double y = Math.Round(Evaluate(dataset, ref row, code, ref pc, argumentStack, ref argStackPointer));
             return Math.Pow(x, y);
+          }
+        case OpCodes.Root: {
+            double x = Evaluate(dataset, ref row, code, ref pc, argumentStack, ref argStackPointer);
+            double y = Math.Round(Evaluate(dataset, ref row, code, ref pc, argumentStack, ref argStackPointer));
+            return Math.Pow(x, 1 / y);
           }
         case OpCodes.Exp: {

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

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