add test for partial evaluation of or, and

conjure_oxide/tests/integration/eprime-minion/partial-eval-or-and/config.toml

@@ -0,0 +1 @@
+extra_rewriter_asserts=["vector_operators_have_partially_evaluated"]

conjure_oxide/tests/integration/eprime-minion/partial-eval-or-and/input.eprime

@@ -0,0 +1,8 @@
+language ESSENCE' 1.0
+
+find a,b,c : bool such that
+
+a \/ b \/ false,
+$ this alldiff should not end up in the final model
+allDiff([1,2,3]) \/ true,
+(c /\ true)

conjure_oxide/tests/integration/eprime-minion/partial-eval-or-and/input.expected-minion.solutions.json

@@ -0,0 +1,17 @@
+[
+  {
+    "UserName(a)": 0,
+    "UserName(b)": 1,
+    "UserName(c)": 1
+  },
+  {
+    "UserName(a)": 1,
+    "UserName(b)": 0,
+    "UserName(c)": 1
+  },
+  {
+    "UserName(a)": 1,
+    "UserName(b)": 1,
+    "UserName(c)": 1
+  }
+]

conjure_oxide/tests/integration/eprime-minion/partial-eval-or-and/input.expected-parse.serialised.json

@@ -0,0 +1,124 @@
+{
+  "constraints": {
+    "And": [
+      {
+        "clean": false,
+        "etype": null
+      },
+      [
+        {
+          "Or": [
+            {
+              "clean": false,
+              "etype": null
+            },
+            [
+              {
+                "Or": [
+                  {
+                    "clean": false,
+                    "etype": null
+                  },
+                  [
+                    {
+                      "Reference": [
+                        {
+                          "clean": false,
+                          "etype": null
+                        },
+                        {
+                          "UserName": "a"
+                        }
+                      ]
+                    },
+                    {
+                      "Reference": [
+                        {
+                          "clean": false,
+                          "etype": null
+                        },
+                        {
+                          "UserName": "b"
+                        }
+                      ]
+                    }
+                  ]
+                ]
+              },
+              {
+                "Constant": [
+                  {
+                    "clean": false,
+                    "etype": null
+                  },
+                  {
+                    "Bool": false
+                  }
+                ]
+              }
+            ]
+          ]
+        },
+        {
+          "And": [
+            {
+              "clean": false,
+              "etype": null
+            },
+            [
+              {
+                "Reference": [
+                  {
+                    "clean": false,
+                    "etype": null
+                  },
+                  {
+                    "UserName": "c"
+                  }
+                ]
+              },
+              {
+                "Constant": [
+                  {
+                    "clean": false,
+                    "etype": null
+                  },
+                  {
+                    "Bool": true
+                  }
+                ]
+              }
+            ]
+          ]
+        }
+      ]
+    ]
+  },
+  "next_var": 0,
+  "variables": [
+    [
+      {
+        "UserName": "a"
+      },
+      {
+        "domain": "BoolDomain"
+      }
+    ],
+    [
+      {
+        "UserName": "b"
+      },
+      {
+        "domain": "BoolDomain"
+      }
+    ],
+    [
+      {
+        "UserName": "c"
+      },
+      {
+        "domain": "BoolDomain"
+      }
+    ]
+  ]
+}

conjure_oxide/tests/integration/eprime-minion/partial-eval-or-and/input.expected-rewrite.serialised.json

@@ -0,0 +1,91 @@
+{
+  "constraints": {
+    "And": [
+      {
+        "clean": false,
+        "etype": null
+      },
+      [
+        {
+          "Or": [
+            {
+              "clean": false,
+              "etype": null
+            },
+            [
+              {
+                "WatchedLiteral": [
+                  {
+                    "clean": false,
+                    "etype": null
+                  },
+                  {
+                    "UserName": "a"
+                  },
+                  {
+                    "Bool": true
+                  }
+                ]
+              },
+              {
+                "WatchedLiteral": [
+                  {
+                    "clean": false,
+                    "etype": null
+                  },
+                  {
+                    "UserName": "b"
+                  },
+                  {
+                    "Bool": true
+                  }
+                ]
+              }
+            ]
+          ]
+        },
+        {
+          "WatchedLiteral": [
+            {
+              "clean": false,
+              "etype": null
+            },
+            {
+              "UserName": "c"
+            },
+            {
+              "Bool": true
+            }
+          ]
+        }
+      ]
+    ]
+  },
+  "next_var": 0,
+  "variables": [
+    [
+      {
+        "UserName": "a"
+      },
+      {
+        "domain": "BoolDomain"
+      }
+    ],
+    [
+      {
+        "UserName": "b"
+      },
+      {
+        "domain": "BoolDomain"
+      }
+    ],
+    [
+      {
+        "UserName": "c"
+      },
+      {
+        "domain": "BoolDomain"
+      }
+    ]
+  ]
+}