Merge pull request #566 from conjure-cp/pr/nik/make-all-minion-constr…

…aints-flat/02 refactor: make all Minion expressions flat
conjure-cp · Jan 6, 2025 · e5ff7e2 · e5ff7e2
2 parents 3b43bda + 6ce102d
commit e5ff7e2
Show file tree

Hide file tree

Showing 84 changed files with 1,548 additions and 3,502 deletions.
diff --git a/conjure_oxide/tests/generated_tests.rs b/conjure_oxide/tests/generated_tests.rs
@@ -328,9 +328,6 @@ fn assert_vector_operators_have_partially_evaluated(model: &conjure_core::Model)
             Max(_, ref vec) => assert_constants_leq_one(&node, vec),
             Or(_, ref vec) => assert_constants_leq_one(&node, vec),
             And(_, ref vec) => assert_constants_leq_one(&node, vec),
-            SumEq(_, ref vec, _) => assert_constants_leq_one(&node, vec),
-            SumGeq(_, ref vec, _) => assert_constants_leq_one(&node, vec),
-            SumLeq(_, ref vec, _) => assert_constants_leq_one(&node, vec),
             _ => (),
         };
     }

diff --git a/conjure_oxide/tests/integration/basic/div/01/input.expected-rewrite.serialised.json b/conjure_oxide/tests/integration/basic/div/01/input.expected-rewrite.serialised.json
@@ -8,7 +8,7 @@
         },
         [
           {
-            "DivEqUndefZero": [
+            "MinionDivEqUndefZero": [
               {
                 "clean": false,
                 "etype": null

diff --git a/conjure_oxide/tests/integration/basic/div/02/input.expected-rewrite.serialised.json b/conjure_oxide/tests/integration/basic/div/02/input.expected-rewrite.serialised.json
@@ -1,49 +1,23 @@
 {
   "constraints": [
     {
-      "Ineq": [
+      "FlatIneq": [
         {
           "clean": false,
           "etype": null
         },
         {
-          "Atomic": [
-            {
-              "clean": false,
-              "etype": null
-            },
-            {
-              "Literal": {
-                "Int": 2
-              }
-            }
-          ]
+          "Literal": {
+            "Int": 2
+          }
         },
         {
-          "Atomic": [
-            {
-              "clean": false,
-              "etype": null
-            },
-            {
-              "Reference": {
-                "UserName": "a"
-              }
-            }
-          ]
+          "Reference": {
+            "UserName": "a"
+          }
         },
         {
-          "Atomic": [
-            {
-              "clean": false,
-              "etype": null
-            },
-            {
-              "Literal": {
-                "Int": 0
-              }
-            }
-          ]
+          "Int": 0
         }
       ]
     }

diff --git a/conjure_oxide/tests/integration/basic/div/03/input.expected-rewrite.serialised.json b/conjure_oxide/tests/integration/basic/div/03/input.expected-rewrite.serialised.json
@@ -8,7 +8,7 @@
         },
         [
           {
-            "DivEqUndefZero": [
+            "MinionDivEqUndefZero": [
               {
                 "clean": false,
                 "etype": null

diff --git a/conjure_oxide/tests/integration/basic/div/04/input.expected-rewrite.serialised.json b/conjure_oxide/tests/integration/basic/div/04/input.expected-rewrite.serialised.json
@@ -79,7 +79,7 @@
       ]
     },
     {
-      "DivEqUndefZero": [
+      "MinionDivEqUndefZero": [
         {
           "clean": false,
           "etype": null

diff --git a/conjure_oxide/tests/integration/basic/div/05/div-05.expected-rewrite.serialised.json b/conjure_oxide/tests/integration/basic/div/05/div-05.expected-rewrite.serialised.json
@@ -79,7 +79,7 @@
       ]
     },
     {
-      "DivEqUndefZero": [
+      "MinionDivEqUndefZero": [
         {
           "clean": false,
           "etype": null

diff --git a/conjure_oxide/tests/integration/basic/div/06/div-06.expected-rewrite.serialised.json b/conjure_oxide/tests/integration/basic/div/06/div-06.expected-rewrite.serialised.json
@@ -79,7 +79,7 @@
       ]
     },
     {
-      "DivEqUndefZero": [
+      "MinionDivEqUndefZero": [
         {
           "clean": false,
           "etype": null

diff --git a/conjure_oxide/tests/integration/basic/max/02/input-expected-rule-trace-human.txt b/conjure_oxide/tests/integration/basic/max/02/input-expected-rule-trace-human.txt
@@ -1,15 +1,15 @@
-(Max([2, a]) <= 2), 
-   ~~> leq_to_ineq ([("Minion", 4100)]) 
-Ineq(Max([2, a]), 2, 0) 
-
---
-
 Max([2, a]), 
    ~~> max_to_var ([("Base", 100)]) 
 __0 
 
 --
 
+(__0 <= 2), 
+   ~~> leq_to_ineq ([("Minion", 4100)]) 
+Ineq(__0, 2, 0) 
+
+--
+
 (__0 >= 2), 
    ~~> geq_to_ineq ([("Minion", 4100)]) 
 Ineq(2, __0, 0) 

diff --git a/conjure_oxide/tests/integration/basic/max/02/input.expected-rewrite.serialised.json b/conjure_oxide/tests/integration/basic/max/02/input.expected-rewrite.serialised.json
@@ -1,143 +1,65 @@
 {
   "constraints": [
     {
-      "Ineq": [
+      "FlatIneq": [
         {
           "clean": false,
           "etype": null
         },
         {
-          "Atomic": [
-            {
-              "clean": false,
-              "etype": null
-            },
-            {
-              "Reference": {
-                "MachineName": 0
-              }
-            }
-          ]
+          "Reference": {
+            "MachineName": 0
+          }
         },
         {
-          "Atomic": [
-            {
-              "clean": false,
-              "etype": null
-            },
-            {
-              "Literal": {
-                "Int": 2
-              }
-            }
-          ]
+          "Literal": {
+            "Int": 2
+          }
         },
         {
-          "Atomic": [
-            {
-              "clean": false,
-              "etype": null
-            },
-            {
-              "Literal": {
-                "Int": 0
-              }
-            }
-          ]
+          "Int": 0
         }
       ]
     },
     {
-      "Ineq": [
+      "FlatIneq": [
         {
           "clean": false,
           "etype": null
         },
         {
-          "Atomic": [
-            {
-              "clean": false,
-              "etype": null
-            },
-            {
-              "Literal": {
-                "Int": 2
-              }
-            }
-          ]
+          "Literal": {
+            "Int": 2
+          }
         },
         {
-          "Atomic": [
-            {
-              "clean": false,
-              "etype": null
-            },
-            {
-              "Reference": {
-                "MachineName": 0
-              }
-            }
-          ]
+          "Reference": {
+            "MachineName": 0
+          }
         },
         {
-          "Atomic": [
-            {
-              "clean": false,
-              "etype": null
-            },
-            {
-              "Literal": {
-                "Int": 0
-              }
-            }
-          ]
+          "Int": 0
         }
       ]
     },
     {
-      "Ineq": [
+      "FlatIneq": [
         {
           "clean": false,
           "etype": null
         },
         {
-          "Atomic": [
-            {
-              "clean": false,
-              "etype": null
-            },
-            {
-              "Reference": {
-                "UserName": "a"
-              }
-            }
-          ]
+          "Reference": {
+            "UserName": "a"
+          }
         },
         {
-          "Atomic": [
-            {
-              "clean": false,
-              "etype": null
-            },
-            {
-              "Reference": {
-                "MachineName": 0
-              }
-            }
-          ]
+          "Reference": {
+            "MachineName": 0
+          }
         },
         {
-          "Atomic": [
-            {
-              "clean": false,
-              "etype": null
-            },
-            {
-              "Literal": {
-                "Int": 0
-              }
-            }
-          ]
+          "Int": 0
         }
       ]
     },

diff --git a/conjure_oxide/tests/integration/basic/min/01/input-expected-rule-trace-human.txt b/conjure_oxide/tests/integration/basic/min/01/input-expected-rule-trace-human.txt
@@ -1,15 +1,15 @@
-(Min([a, b]) >= 3), 
-   ~~> geq_to_ineq ([("Minion", 4100)]) 
-Ineq(3, Min([a, b]), 0) 
-
---
-
 Min([a, b]), 
    ~~> min_to_var ([("Base", 2000)]) 
 __0 
 
 --
 
+(__0 >= 3), 
+   ~~> geq_to_ineq ([("Minion", 4100)]) 
+Ineq(3, __0, 0) 
+
+--
+
 (__0 <= a), 
    ~~> leq_to_ineq ([("Minion", 4100)]) 
 Ineq(__0, a, 0)