Implement ordering variables in the CNF struct

conjure-cp · Nov 28, 2023 · cb858d2 · cb858d2
1 parent ae37d66
commit cb858d2
Show file tree

Hide file tree

Showing 3 changed files with 415 additions and 259 deletions.
diff --git a/conjure_oxide/src/ast.rs b/conjure_oxide/src/ast.rs
@@ -28,6 +28,12 @@ impl Model {
  pub fn add_variable(&mut self, name: Name, decision_var: DecisionVariable) {
  self.variables.insert(name, decision_var);
  }
+
+ pub fn add_constraint(&mut self, expression: Expression) {
+ // ToDo (gs248) - there is no checking whatsoever
+ // We need to properly validate the expression but this is just for testing
+ self.constraints.push(expression);
+ }
 }
 
 impl Default for Model {
@@ -90,11 +96,13 @@ pub enum Expression {
 
  Sum(Vec<Expression>),
 
+ Not(Box<Expression>),
+ Or(Vec<Expression>),
+ And(Vec<Expression>),
+
  Eq(Box<Expression>, Box<Expression>),
  Neq(Box<Expression>, Box<Expression>),
  Geq(Box<Expression>, Box<Expression>),
- Not(Box<Expression>),
- Or(Vec<Expression>),
  Leq(Box<Expression>, Box<Expression>),
  Gt(Box<Expression>, Box<Expression>),
  Lt(Box<Expression>, Box<Expression>),