Ignore:
Timestamp:
12/07/10 14:11:12 (11 years ago)
Author:
mkommend
Message:

Implemented VariableCondition symbol (ticket #1325).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/FullFunctionalExpressionGrammar.cs

    r5051 r5060  
    6060      var or = new Or();
    6161      var not = new Not();
     62
    6263      var timeLag = new TimeLag();
    6364      timeLag.InitialFrequency = 0.0;
    6465      var integral = new Integral();
    6566      integral.InitialFrequency = 0.0;
    66       var derivativ = new Derivative();
    67       derivativ.InitialFrequency = 0.0;
     67      var derivative = new Derivative();
     68      derivative.InitialFrequency = 0.0;
     69
     70      var variableCondition = new VariableCondition();
     71      variableCondition.InitialFrequency = 0.0;
    6872
    6973      var constant = new Constant();
     
    7478      laggedVariable.InitialFrequency = 0.0;
    7579
    76       var allSymbols = new List<Symbol>() { add, sub, mul, div, mean, sin, cos, tan, log, exp, @if, gt, lt, and, or, not, timeLag, integral, derivativ, constant, variableSymbol, laggedVariable };
    77       var unaryFunctionSymbols = new List<Symbol>() { sin, cos, tan, log, exp, not, timeLag, integral, derivativ };
    78       var binaryFunctionSymbols = new List<Symbol>() { gt, lt };
     80      var allSymbols = new List<Symbol>() { add, sub, mul, div, mean, sin, cos, tan, log, exp, @if, gt, lt,
     81        and, or, not, timeLag, integral, derivative, variableCondition, constant, variableSymbol, laggedVariable };
     82      var unaryFunctionSymbols = new List<Symbol>() { sin, cos, tan, log, exp, not, timeLag, integral, derivative };
     83      var binaryFunctionSymbols = new List<Symbol>() { gt, lt, variableCondition };
    7984      var functionSymbols = new List<Symbol>() { add, sub, mul, div, mean, and, or };
    8085      var terminalSymbols = new List<Symbol>() { variableSymbol, constant, laggedVariable };
Note: See TracChangeset for help on using the changeset viewer.