Merge pull request #364 from Soph1514/first_additions

Max rule

Cargo.toml

@@ -16,6 +16,7 @@ members = [
     "solvers/kissat",
     "solvers/minion",
     "solvers/chuffed",
+
 ]
 
 [workspace.lints.clippy]

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/xyz/input.essence",
+        default_value = "./conjure_oxide/tests/integration/basic/max/input.essence",
         help = "The input Essence file"
     )]
     input_file: PathBuf,

conjure_oxide/tests/generated_tests.rs

@@ -154,6 +154,7 @@ fn assert_vector_operators_have_partially_evaluated(model: &conjure_core::Model)
             Reference(_, _) => (),
             Sum(_, vec) => assert_constants_leq_one(&x, vec),
             Min(_, vec) => assert_constants_leq_one(&x, vec),
+            Max(_, vec) => assert_constants_leq_one(&x, vec),
             Not(_, _) => (),
             Or(_, vec) => assert_constants_leq_one(&x, vec),
             And(_, vec) => assert_constants_leq_one(&x, vec),

conjure_oxide/tests/integration/basic/max/01/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
+  }
+]

conjure_oxide/tests/integration/basic/max/01/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
+              ]
+            }
+          ]
+        }
+      }
+    ]
+  ]
+}