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

Timestamp:

10/27/17 18:42:04 (7 years ago)

Author:

gkronber

Message:

#2796 comments, simplifications, reviewed tests for structure enumeration (not working)

File:

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

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

@@ -43 +43 @@
   // 
   internal class Automaton {
-    // TODO: refactor so that State is an enumerable type
 
     // there is a single final state (ExprEnd)
     // states with lower values are closer to the final state 
     // (this is helpful when we try to navigate to the final state)
+
+    // we cannot use an enum type here because the set of states is dynamic (including states for variables)
     public const int StateExprEnd = 1;
     public const int StateTermEnd = 2;
@@ -81 +82 @@
     public const int FirstDynamicState = 25;
     // more states for individual variables are created dynamically
+    public readonly List<string> stateNames = new List<string>() {
+       string.Empty,
+      "ExprEnd",
+      "TermEnd",
+      "FactorEnd",
+      "VariableFactorEnd",
+      "ExpFactorEnd",
+      "LogFactorEnd",
+      "InvFactorEnd",
+      "ExpFEnd",
+      "LogTEnd",
+      "InvTEnd",
+      "LogTFEnd",
+      "InfTFEnd",
+      "LogTFStart",
+      "InvTFStart",
+      "ExpFStart",
+      "LogTStart",
+      "InvTStart",
+      "VariableFactorStart",
+      "ExpFactorStart",
+      "LogFactorStart",
+      "InvFactorStart",
+      "FactorStart",
+      "TermStart",
+      "Expr",
+    };
+
 
     private const int StartState = StateExpr;
     public int CurrentState { get; private set; }
 
-    public readonly List<string> stateNames;
     private List<int>[] followStates;
     private List<Action>[,] actions; // not every follow state is possible but this representation should be efficient
@@ -99 +127 @@
        bool allowMultipleTerms = false) {
       int nVars = vars.Length;
-      stateNames = new List<string>() { string.Empty, "Expr", "ExprEnd", "TermStart", "TermEnd", "FactorStart", "FactorEnd", "VarFactorStart", "VarFactorEnd", "ExpFactorStart", "ExpFactorEnd", "LogFactorStart", "LogFactorEnd", "InvFactorStart", "InvFactorEnd", "ExpFStart", "ExpFEnd", "LogTStart", "LogTEnd", "LogTFStart", "LogTFEnd", "InvTStart", "InvTEnd", "InvTFStart", "InvTFEnd" };
       codeGenerator = new CodeGenerator();
       this.constraintHandler = constraintHandler;
@@ -369 +396 @@
     }
 
-    private readonly int[] followStatesBuf = new int[1000];
-    public void FollowStates(int state, out int[] buf, out int nElements) {
+    public void FollowStates(int state, ref int[] buf, out int nElements) {
       var fs = followStates[state];
       int j = 0;
@@ -376 +402 @@
         var s = fs[i];
         if (constraintHandler.IsAllowedFollowState(state, s)) {
-          followStatesBuf[j++] = s;
+          buf[j++] = s;
         }
       }
-      buf = followStatesBuf;
       nElements = j;
     }
@@ -446 +471 @@
 
     internal string GetActionString(int fromState, int toState) {
-      return actionStrings[fromState,toState] != null ? string.Join(" , ", actionStrings[fromState, toState]) : ""; 
+      return actionStrings[fromState, toState] != null ? string.Join(" , ", actionStrings[fromState, toState]) : "";
     }
 
@@ -454 +479 @@
         writer.WriteLine("digraph {");
         // writer.WriteLine("rankdir=LR");
-        for (int s = StartState; s < stateNames.Count; s++) {
+        for (int s = 1; s < stateNames.Count; s++) {
           for (int i = 0; i < followStates[s].Count; i++) {
             if (followStates[s][i] <= 0) continue;