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

Timestamp:

10/11/17 08:15:19 (7 years ago)

Author:

gkronber

Message:

#2796 worked on MCTS for symbreg

File:

• branches/MCTS-SymbReg-2796/HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/Automaton.cs (modified) (11 diffs)

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

@@ -139 +139 @@
         codeGenerator.Emit1(OpCodes.LoadConst0);
         constraintHandler.Reset();
-      }, "0, Reset");
+      }, "0");
       AddTransition(StateTermEnd, StateExprEnd, () => {
         codeGenerator.Emit1(OpCodes.Add);
@@ -155 +155 @@
           constraintHandler.StartTerm();
         },
-        "c, StartTerm");
+        "c");
       AddTransition(StateFactorEnd, StateTermEnd,
         () => {
@@ -161 +161 @@
           constraintHandler.EndTerm();
         },
-        "*, EndTerm");
+        "*");
 
       AddTransition(StateFactorEnd, StateFactorStart,
@@ -172 +172 @@
         AddTransition(StateFactorStart, StateVariableFactorStart, () => {
           constraintHandler.StartFactor(StateVariableFactorStart);
-        }, "StartFactor");
+        }, "");
       if (allowExp)
         AddTransition(StateFactorStart, StateExpFactorStart, () => {
           constraintHandler.StartFactor(StateExpFactorStart);
-        }, "StartFactor");
+        }, "");
       if (allowLog)
         AddTransition(StateFactorStart, StateLogFactorStart, () => {
           constraintHandler.StartFactor(StateLogFactorStart);
-        }, "StartFactor");
+        }, "");
       if (allowInv)
         AddTransition(StateFactorStart, StateInvFactorStart, () => {
           constraintHandler.StartFactor(StateInvFactorStart);
-        }, "StartFactor");
-      AddTransition(StateVariableFactorEnd, StateFactorEnd, () => { constraintHandler.EndFactor(); }, "EndFactor");
-      AddTransition(StateExpFactorEnd, StateFactorEnd, () => { constraintHandler.EndFactor(); }, "EndFactor");
-      AddTransition(StateLogFactorEnd, StateFactorEnd, () => { constraintHandler.EndFactor(); }, "EndFactor");
-      AddTransition(StateInvFactorEnd, StateFactorEnd, () => { constraintHandler.EndFactor(); }, "EndFactor");
+        }, "");
+      AddTransition(StateVariableFactorEnd, StateFactorEnd, () => { constraintHandler.EndFactor(); }, "");
+      AddTransition(StateExpFactorEnd, StateFactorEnd, () => { constraintHandler.EndFactor(); }, "");
+      AddTransition(StateLogFactorEnd, StateFactorEnd, () => { constraintHandler.EndFactor(); }, "");
+      AddTransition(StateInvFactorEnd, StateFactorEnd, () => { constraintHandler.EndFactor(); }, "");
 
       // VarFact -> var_1 ... var_n
@@ -202 +202 @@
             constraintHandler.AddVarToCurrentFactor(varState);
           },
-          "var_" + varIdx + ", AddVar");
+          "var_" + varIdx + "");
         AddTransition(curDynVarState, StateVariableFactorEnd);
         curDynVarState++;
@@ -234 +234 @@
             constraintHandler.AddVarToCurrentFactor(varState);
           },
-          "var_" + varIdx + ", AddVar");
+          "var_" + varIdx + "");
         AddTransition(curDynVarState, StateExpFEnd,
           () => {
@@ -249 +249 @@
           constraintHandler.StartNewTermInPoly();
         },
-        "0, StartTermInPoly");
+        "0");
       AddTransition(StateLogTEnd, StateLogFactorEnd,
         () => {
@@ -289 +289 @@
             constraintHandler.AddVarToCurrentFactor(varState);
           },
-          "var_" + varIdx + ", AddVar");
+          "var_" + varIdx + "");
         AddTransition(curDynVarState, StateLogTFEnd);
         curDynVarState++;
@@ -300 +300 @@
           constraintHandler.StartNewTermInPoly();
         },
-        "c, StartTermInPoly");
+        "c");
       AddTransition(StateInvTEnd, StateInvFactorEnd,
         () => {
@@ -338 +338 @@
             constraintHandler.AddVarToCurrentFactor(varState);
           },
-          "var_" + varIdx + ", AddVar");
+          "var_" + varIdx + "");
         AddTransition(curDynVarState, StateInvTFEnd);
         curDynVarState++;
@@ -442 +442 @@
       codeGenerator.Reset();
       constraintHandler.Reset();
+    }
+
+    internal string GetActionString(int fromState, int toState) {
+      return actionStrings[fromState,toState] != null ? string.Join(" , ", actionStrings[fromState, toState]) : ""; 
     }