Changeset 15403 for branches/MCTS-SymbReg-2796/HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/Automaton.cs

Timestamp:

10/04/17 22:00:52 (7 years ago)

Author:

gkronber

Message:

#2796 worked on MCTS symb reg

Location:

branches/MCTS-SymbReg-2796

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/Automaton.cs (modified) (3 diffs)

branches/MCTS-SymbReg-2796/HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/Automaton.cs

@@ -96 +96 @@
     }
 
-    // reverse notation ops
-    // Expr -> c 0 Term { '+' Term } '+' '*' c '+' 'exit'
+    // reverse notation 
+    // Expr -> 0 Term { '+' Term } '+' 'exit'
     // Term -> c Fact { '*' Fact } '*'
     // Fact -> VarFact | ExpFact | LogFact | InvFact
@@ -120 +120 @@
       actionStrings = new List<string>[nStates, nStates];
 
-      // Expr -> c 0 Term { '+' Term } '+' '*' c '+' 'exit'
+      // Expr -> 0 Term { '+' Term } '+' 'exit'
       AddTransition(StateExpr, StateTermStart, () => {
         codeGenerator.Reset();
-        codeGenerator.Emit1(OpCodes.LoadParamN);
         codeGenerator.Emit1(OpCodes.LoadConst0);
         constraintHandler.Reset();
-      }, "c 0, Reset");
+      }, "0, Reset");
       AddTransition(StateTermEnd, StateExprEnd, () => {
         codeGenerator.Emit1(OpCodes.Add);
-        codeGenerator.Emit1(OpCodes.Mul);
-        codeGenerator.Emit1(OpCodes.LoadParamN);
-        codeGenerator.Emit1(OpCodes.Add);
         codeGenerator.Emit1(OpCodes.Exit);
-      }, "+*c+ exit");
+      }, "+ exit");
       if (allowMultipleTerms)
         AddTransition(StateTermEnd, StateTermStart, () => {
@@ -353 +349 @@
     private readonly int[] followStatesBuf = new int[1000];
     public void FollowStates(int state, out int[] buf, out int nElements) {
-      // for loop instead of where iterator
       var fs = followStates[state];
       int j = 0;