Merge pull request #287 from Kieranoski702/optimise

Rewriter Optimization
conjure-cp · Apr 2, 2024 · fea3f18 · fea3f18
2 parents 0244f5e + 02e9234
commit fea3f18
Show file tree

Hide file tree

Showing 22 changed files with 761 additions and 325 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@ conjure_oxide/tests/**/*.generated.*
 conjure_oxide/tests/**/*.generated-parse.*
 conjure_oxide/tests/**/*.generated-rewrite.*
 conjure_oxide/tests/**/*.generated-minion.*
+conjure_oxide/tests/*.png
 
 *-stats.json
 

diff --git a/conjure_oxide/tests/integration/basic/bool/03/bool-03.expected-parse.serialised.json b/conjure_oxide/tests/integration/basic/bool/03/bool-03.expected-parse.serialised.json
@@ -2,12 +2,12 @@
   "constraints": {
     "Neq": [
       {
-        "dirtyclean": false
+        "clean": false
       },
       {
         "Reference": [
           {
-            "dirtyclean": false
+            "clean": false
           },
           {
             "UserName": "x"
@@ -17,7 +17,7 @@
       {
         "Reference": [
           {
-            "dirtyclean": false
+            "clean": false
           },
           {
             "UserName": "y"

diff --git a/conjure_oxide/tests/integration/basic/bool/03/bool-03.expected-rewrite.serialised.json b/conjure_oxide/tests/integration/basic/bool/03/bool-03.expected-rewrite.serialised.json
@@ -2,13 +2,13 @@
   "constraints": {
     "AllDiff": [
       {
-        "dirtyclean": false
+        "clean": false
       },
       [
         {
           "Reference": [
             {
-              "dirtyclean": false
+              "clean": false
             },
             {
               "UserName": "x"
@@ -18,7 +18,7 @@
         {
           "Reference": [
             {
-              "dirtyclean": false
+              "clean": false
             },
             {
               "UserName": "y"

diff --git a/conjure_oxide/tests/integration/basic/min/01/input.expected-parse.serialised.json b/conjure_oxide/tests/integration/basic/min/01/input.expected-parse.serialised.json
@@ -2,18 +2,18 @@
   "constraints": {
     "Geq": [
       {
-        "dirtyclean": false
+        "clean": false
       },
       {
         "Min": [
           {
-            "dirtyclean": false
+            "clean": false
           },
           [
             {
               "Reference": [
                 {
-                  "dirtyclean": false
+                  "clean": false
                 },
                 {
                   "UserName": "a"
@@ -23,7 +23,7 @@
             {
               "Reference": [
                 {
-                  "dirtyclean": false
+                  "clean": false
                 },
                 {
                   "UserName": "b"
@@ -36,7 +36,7 @@
       {
         "Constant": [
           {
-            "dirtyclean": false
+            "clean": false
           },
           {
             "Int": 3