Free cookie consent management tool by TermsFeed Policy Generator

Changeset 5393 for trunk


Ignore:
Timestamp:
01/28/11 15:26:44 (14 years ago)
Author:
mkommend
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/TypeCoherentExpressionGrammar.cs

    r5333 r5393  
    2020#endregion
    2121
     22using System.Collections.Generic;
    2223using System.Linq;
    23 using System.Collections.Generic;
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
     
    5555      var log = new Logarithm();
    5656      var pow = new Power();
     57      pow.InitialFrequency = 0.0;
     58      var root = new Root();
     59      root.InitialFrequency = 0.0;
    5760      var exp = new Exponential();
    5861      var @if = new IfThenElse();
     
    6265      var or = new Or();
    6366      var not = new Not();
     67
     68      var timeLag = new TimeLag();
     69      timeLag.InitialFrequency = 0.0;
     70      var integral = new Integral();
     71      integral.InitialFrequency = 0.0;
     72      var derivative = new Derivative();
     73      derivative.InitialFrequency = 0.0;
     74
    6475      var constant = new Constant();
    6576      constant.MinValue = -20;
     
    95106       */
    96107
    97       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 };
     108      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 };
    98109
    99       var unaryFunctionSymbols = new List<Symbol>() { sin, cos, tan, log, exp, };
    100       var binaryFunctionSymbols = new List<Symbol>() { add, sub, mul, div, mean, pow };
     110      var unaryFunctionSymbols = new List<Symbol>() { sin, cos, tan, log, exp, timeLag, integral, derivative };
     111      var binaryFunctionSymbols = new List<Symbol>() { add, sub, mul, div, mean, pow, root };
    101112
    102113      var unaryBooleanFunctionSymbols = new List<Symbol>() { not };
Note: See TracChangeset for help on using the changeset viewer.