Added a max rule. Provided a solved example with max(a,b)

conjure-cp · Oct 11, 2024 · 84f05cc · 84f05cc
1 parent 453ff60
commit 84f05cc
Show file tree

Hide file tree

Showing 9 changed files with 491 additions and 1 deletion.
diff --git a/conjure_oxide/src/main.rs b/conjure_oxide/src/main.rs
@@ -28,7 +28,7 @@ use conjure_oxide::SolverFamily;
 struct Cli {
     #[arg(
         value_name = "INPUT_ESSENCE",
-        default_value = "./conjure_oxide/tests/integration/experiment/triangles.essence",
+        default_value = "./conjure_oxide/tests/integration/experiment/input.essence",
         help = "The input Essence file"
     )]
     input_file: PathBuf,

diff --git a/conjure_oxide/tests/integration/experiment/input.essence b/conjure_oxide/tests/integration/experiment/input.essence
diff --git a/conjure_oxide/tests/integration/experiment/works/max/input.essence b/conjure_oxide/tests/integration/experiment/works/max/input.essence
@@ -0,0 +1,2 @@
+find a,b : int(1..4)
+such that max([a,b]) >= 2
diff --git a/conjure_oxide/tests/integration/experiment/works/max/input.expected-minion.solutions.json b/conjure_oxide/tests/integration/experiment/works/max/input.expected-minion.solutions.json
@@ -0,0 +1,77 @@
+[
+  {
+    "MachineName(0)": 2,
+    "UserName(a)": 1,
+    "UserName(b)": 2
+  },
+  {
+    "MachineName(0)": 2,
+    "UserName(a)": 2,
+    "UserName(b)": 1
+  },
+  {
+    "MachineName(0)": 2,
+    "UserName(a)": 2,
+    "UserName(b)": 2
+  },
+  {
+    "MachineName(0)": 3,
+    "UserName(a)": 1,
+    "UserName(b)": 3
+  },
+  {
+    "MachineName(0)": 3,
+    "UserName(a)": 2,
+    "UserName(b)": 3
+  },
+  {
+    "MachineName(0)": 3,
+    "UserName(a)": 3,
+    "UserName(b)": 1
+  },
+  {
+    "MachineName(0)": 3,
+    "UserName(a)": 3,
+    "UserName(b)": 2
+  },
+  {
+    "MachineName(0)": 3,
+    "UserName(a)": 3,
+    "UserName(b)": 3
+  },
+  {
+    "MachineName(0)": 4,
+    "UserName(a)": 1,
+    "UserName(b)": 4
+  },
+  {
+    "MachineName(0)": 4,
+    "UserName(a)": 2,
+    "UserName(b)": 4
+  },
+  {
+    "MachineName(0)": 4,
+    "UserName(a)": 3,
+    "UserName(b)": 4
+  },
+  {
+    "MachineName(0)": 4,
+    "UserName(a)": 4,
+    "UserName(b)": 1
+  },
+  {
+    "MachineName(0)": 4,
+    "UserName(a)": 4,
+    "UserName(b)": 2
+  },
+  {
+    "MachineName(0)": 4,
+    "UserName(a)": 4,
+    "UserName(b)": 3
+  },
+  {
+    "MachineName(0)": 4,
+    "UserName(a)": 4,
+    "UserName(b)": 4
+  }
+]
diff --git a/conjure_oxide/tests/integration/experiment/works/max/input.expected-parse.serialised.json b/conjure_oxide/tests/integration/experiment/works/max/input.expected-parse.serialised.json
@@ -0,0 +1,90 @@
+{
+  "constraints": {
+    "Geq": [
+      {
+        "clean": false,
+        "etype": null
+      },
+      {
+        "Max": [
+          {
+            "clean": false,
+            "etype": null
+          },
+          [
+            {
+              "Reference": [
+                {
+                  "clean": false,
+                  "etype": null
+                },
+                {
+                  "UserName": "a"
+                }
+              ]
+            },
+            {
+              "Reference": [
+                {
+                  "clean": false,
+                  "etype": null
+                },
+                {
+                  "UserName": "b"
+                }
+              ]
+            }
+          ]
+        ]
+      },
+      {
+        "Constant": [
+          {
+            "clean": false,
+            "etype": null
+          },
+          {
+            "Int": 2
+          }
+        ]
+      }
+    ]
+  },
+  "next_var": 0,
+  "variables": [
+    [
+      {
+        "UserName": "a"
+      },
+      {
+        "domain": {
+          "IntDomain": [
+            {
+              "Bounded": [
+                1,
+                4
+              ]
+            }
+          ]
+        }
+      }
+    ],
+    [
+      {
+        "UserName": "b"
+      },
+      {
+        "domain": {
+          "IntDomain": [
+            {
+              "Bounded": [
+                1,
+                4
+              ]
+            }
+          ]
+        }
+      }
+    ]
+  ]
+}