Merge pull request #172 from mikeTheLightning/fix-issue-171

GeneratorGrammarFuzzer: Fix order of expansions with explicit ordering (#171)
uds-se · Jan 8, 2024 · 1d57242 · 1d57242
2 parents 8bf6898 + 5c234ab
commit 1d57242
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/docs/beta/code/GeneratorGrammarFuzzer.py b/docs/beta/code/GeneratorGrammarFuzzer.py
@@ -875,7 +875,7 @@ def choose_tree_expansion(self, tree: DerivationTree,
                 print("Expandable child #%d %s has order %d" %
                       (k, expandable_child[0], given_order[j]))
 
-            if min_given_order is None or given_order[j] < min_given_order:
+            if min_given_order is None or given_order[j] < given_order[min_given_order]:
                 min_given_order = k
 
         assert min_given_order is not None

diff --git a/docs/beta/notebooks/GeneratorGrammarFuzzer.ipynb b/docs/beta/notebooks/GeneratorGrammarFuzzer.ipynb
@@ -3506,7 +3506,7 @@
     "                print(\"Expandable child #%d %s has order %d\" %\n",
     "                      (k, expandable_child[0], given_order[j]))\n",
     "\n",
-    "            if min_given_order is None or given_order[j] < min_given_order:\n",
+    "            if min_given_order is None or given_order[j] < given_order[min_given_order]:\n",
     "                min_given_order = k\n",
     "\n",
     "        assert min_given_order is not None\n",
@@ -5031,4 +5031,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}
diff --git a/docs/code/GeneratorGrammarFuzzer.py b/docs/code/GeneratorGrammarFuzzer.py
@@ -875,7 +875,7 @@ def choose_tree_expansion(self, tree: DerivationTree,
                 print("Expandable child #%d %s has order %d" %
                       (k, expandable_child[0], given_order[j]))
 
-            if min_given_order is None or given_order[j] < min_given_order:
+            if min_given_order is None or given_order[j] < given_order[min_given_order]:
                 min_given_order = k
 
         assert min_given_order is not None

diff --git a/docs/notebooks/GeneratorGrammarFuzzer.ipynb b/docs/notebooks/GeneratorGrammarFuzzer.ipynb
@@ -3506,7 +3506,7 @@
     "                print(\"Expandable child #%d %s has order %d\" %\n",
     "                      (k, expandable_child[0], given_order[j]))\n",
     "\n",
-    "            if min_given_order is None or given_order[j] < min_given_order:\n",
+    "            if min_given_order is None or given_order[j] < given_order[min_given_order]:\n",
     "                min_given_order = k\n",
     "\n",
     "        assert min_given_order is not None\n",
@@ -5031,4 +5031,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}
diff --git a/notebooks/GeneratorGrammarFuzzer.ipynb b/notebooks/GeneratorGrammarFuzzer.ipynb
@@ -1977,7 +1977,7 @@
     "                print(\"Expandable child #%d %s has order %d\" %\n",
     "                      (k, expandable_child[0], given_order[j]))\n",
     "\n",
-    "            if min_given_order is None or given_order[j] < min_given_order:\n",
+    "            if min_given_order is None or given_order[j] < given_order[min_given_order]:\n",
     "                min_given_order = k\n",
     "\n",
     "        assert min_given_order is not None\n",