Changeset 9262 for branches/sluengo/HeuristicLab.Problems.TradeRules/Grammar.cs

Timestamp:

02/28/13 23:48:00 (11 years ago)

Author:

sluengo

Message:

 

File:

• branches/sluengo/HeuristicLab.Problems.TradeRules/Grammar.cs (modified) (6 diffs)

branches/sluengo/HeuristicLab.Problems.TradeRules/Grammar.cs

@@ -41 +41 @@
     private const string BooleanConstant = "Boolean Constant";
     private const string TradeMean = "Average Trade";
-    private const string MACDIndicator = "MACD Indicator";
+    private const string Indicators = "Indicators";
     private const string SerialTime = "Serial Operators";
       
@@ -64 +64 @@
 
         var mean = new AverageTrade();
-        var expMovAverage = new EMA();
         var macd = new MACD();
-        var RSI = new RSI();
+        var rsi = new RSI();
 
         var gt = new GreaterThan();
@@ -91 +90 @@
         var booleanConstantsSymbols = new GroupSymbol(BooleanConstant, new List<ISymbol> { boolean });
         var meanTradeSymbols = new GroupSymbol(TradeMean, new List<ISymbol> { mean});
-        var indicatorTradeSymbols = new GroupSymbol(MACDIndicator, new List<ISymbol> { macd,RSI, expMovAverage });
+        var indicatorTradeSymbols = new GroupSymbol(Indicators, new List<ISymbol> { macd,rsi});
         
         var serialTime = new GroupSymbol(SerialTime, new List<ISymbol> {max,min, lag });
@@ -110 +109 @@
         SetSubtreeCount(arithmeticSymbols, 2, 2);
         SetSubtreeCount(terminalSymbols, 0, 0);
-
         SetSubtreeCount(booleanConstantsSymbols, 0, 0);
         SetSubtreeCount(meanTradeSymbols, 1, 1);
         SetSubtreeCount(macd, 3, 3);
-        SetSubtreeCount(RSI, 1, 1);
-        SetSubtreeCount(expMovAverage, 1, 1);
+        SetSubtreeCount(rsi, 1, 1);
         SetSubtreeCount(comparisonSymbols, 2, 2);
         SetSubtreeCount(and, 2, 2);
@@ -124 +121 @@
 
       #region allowed child symbols configuration
-        //AddAllowedChildSymbol(StartSymbol, booleanOperationSymbols);
-        //AddAllowedChildSymbol(StartSymbol, comparisonSymbols);
-        AddAllowedChildSymbol(StartSymbol, expMovAverage);
+        AddAllowedChildSymbol(StartSymbol, booleanOperationSymbols);
+        AddAllowedChildSymbol(StartSymbol, comparisonSymbols);
 
         AddAllowedChildSymbol(booleanOperationSymbols, comparisonSymbols);
         AddAllowedChildSymbol(booleanOperationSymbols, booleanConstantsSymbols);
-        //AddAllowedChildSymbol(booleanOperationSymbols, indicatorTradeSymbols);
+        AddAllowedChildSymbol(booleanOperationSymbols, indicatorTradeSymbols);
+        AddAllowedChildSymbol(booleanOperationSymbols, booleanOperationSymbols);
 
         AddAllowedChildSymbol(comparisonSymbols, meanTradeSymbols);
@@ -142 +139 @@
         AddAllowedChildSymbol(arithmeticSymbols, serialTime);
 
+        AddAllowedChildSymbol(indicatorTradeSymbols, constantint);
         AddAllowedChildSymbol(serialTime, constantint);
-
-        AddAllowedChildSymbol(meanTradeSymbols, constantint);
-        AddAllowedChildSymbol(indicatorTradeSymbols, constantint);
+        AddAllowedChildSymbol(meanTradeSymbols, constantint);   
       #endregion
     }