Changeset 5393

Timestamp:

01/28/11 15:26:44 (14 years ago)

Author:

mkommend

Message:

Added new symbols to type coherent grammar (ticket #1387).

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/TypeCoherentExpressionGrammar.cs (modified) (4 diffs)

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

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using System.Linq;
-using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -55 +55 @@
       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();
@@ -62 +65 @@
       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 derivative = new Derivative();
+      derivative.InitialFrequency = 0.0;
+
       var constant = new Constant();
       constant.MinValue = -20;
@@ -95 +106 @@
        */
 
-      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 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, };
-      var binaryFunctionSymbols = new List<Symbol>() { add, sub, mul, div, mean, pow };
+      var unaryFunctionSymbols = new List<Symbol>() { sin, cos, tan, log, exp, timeLag, integral, derivative };
+      var binaryFunctionSymbols = new List<Symbol>() { add, sub, mul, div, mean, pow, root };
 
       var unaryBooleanFunctionSymbols = new List<Symbol>() { not };