Merge pull request #217 from plaans/feat/plan-optimizer

feat(ape): plan optimization MVP

Author: arbimo

.github/workflows/aries.yml

@@ -50,6 +50,8 @@ jobs:
         run: ./ci/sat.py debug
       - name: Scheduler testing
         run: ./ci/scheduling.py
+      - name: APE validator
+        run: ./ci/ape-val.sh
       - name: GG solving
         run: ./ci/gg.py
       - name: PDDL Solving (PDDL & HDDL)

Cargo.lock

@@ -60,7 +60,7 @@ tokio = { default-features = false, version = "1.49.0", features = [
     "macros",
 ] }
 tokio-stream = { default-features = false, version = "0.1" }
-tracing = { version = "0.1", features = ["release_max_level_debug"] }
+tracing = { version = "0.1", features = ["release_max_level_info"] }
 tracing-subscriber = "0.3"
 transitive = "1.2.0"
 vec_map = "0.8"

Cargo.toml

@@ -1,7 +1,7 @@
 use aries::model::Label;
 use aries::model::Model;
 use aries::model::lang::IVar;
-use aries::model::lang::linear::NFLinearSumItem;
+use aries::model::lang::linear::ScaledVar;
 
 use crate::aries::Post;
 use crate::aries::constraint::LinEq;
@@ -40,11 +40,11 @@ impl<Lbl: Label> Post<Lbl> for Abs {
         let plus_a = self.a;
 
         let sum = vec![
-            NFLinearSumItem {
+            ScaledVar {
                 var: plus_a.into(),
                 factor: 1,
             },
-            NFLinearSumItem {
+            ScaledVar {
                 var: minus_a.into(),
                 factor: 1,
             },

aries_fzn/src/aries/constraint/abs.rs

@@ -1,7 +1,7 @@
 use aries::core::IntCst;
 use aries::model::Label;
 use aries::model::Model;
-use aries::model::lang::linear::NFLinearSumItem;
+use aries::model::lang::linear::ScaledVar;
 
 use crate::aries::Post;
 use crate::aries::constraint::LinGe;
@@ -13,16 +13,16 @@ use crate::aries::constraint::LinLe;
 /// where `v[i]` are variables, `b` and `c[i]` constants.
 #[derive(Debug)]
 pub struct LinEq {
-    sum: Vec<NFLinearSumItem>,
+    sum: Vec<ScaledVar>,
     b: IntCst,
 }
 
 impl LinEq {
-    pub fn new(sum: Vec<NFLinearSumItem>, b: IntCst) -> Self {
+    pub fn new(sum: Vec<ScaledVar>, b: IntCst) -> Self {
         Self { sum, b }
     }
 
-    pub fn sum(&self) -> &Vec<NFLinearSumItem> {
+    pub fn sum(&self) -> &Vec<ScaledVar> {
         &self.sum
     }
 

aries_fzn/src/aries/constraint/lin_eq.rs

@@ -2,7 +2,7 @@ use aries::core::IntCst;
 use aries::model::Label;
 use aries::model::Model;
 use aries::model::lang::BVar;
-use aries::model::lang::linear::NFLinearSumItem;
+use aries::model::lang::linear::ScaledVar;
 
 use crate::aries::Post;
 use crate::aries::constraint::LinGeHalf;
@@ -16,17 +16,17 @@ use crate::aries::constraint::LinLeHalf;
 /// `b` and `c[i]` constants.
 #[derive(Debug)]
 pub struct LinEqHalf {
-    sum: Vec<NFLinearSumItem>,
+    sum: Vec<ScaledVar>,
     b: IntCst,
     r: BVar,
 }
 
 impl LinEqHalf {
-    pub fn new(sum: Vec<NFLinearSumItem>, b: IntCst, r: BVar) -> Self {
+    pub fn new(sum: Vec<ScaledVar>, b: IntCst, r: BVar) -> Self {
         Self { sum, b, r }
     }
 
-    pub fn sum(&self) -> &Vec<NFLinearSumItem> {
+    pub fn sum(&self) -> &Vec<ScaledVar> {
         &self.sum
     }
 

aries_fzn/src/aries/constraint/lin_eq_half.rs

@@ -2,7 +2,7 @@ use aries::core::IntCst;
 use aries::model::Label;
 use aries::model::Model;
 use aries::model::lang::BVar;
-use aries::model::lang::linear::NFLinearSumItem;
+use aries::model::lang::linear::ScaledVar;
 
 use crate::aries::Post;
 use crate::aries::constraint::AndReif;
@@ -17,17 +17,17 @@ use crate::aries::constraint::LinLeReif;
 /// `b` and `c[i]` constants.
 #[derive(Debug)]
 pub struct LinEqReif {
-    sum: Vec<NFLinearSumItem>,
+    sum: Vec<ScaledVar>,
     b: IntCst,
     r: BVar,
 }
 
 impl LinEqReif {
-    pub fn new(sum: Vec<NFLinearSumItem>, b: IntCst, r: BVar) -> Self {
+    pub fn new(sum: Vec<ScaledVar>, b: IntCst, r: BVar) -> Self {
         Self { sum, b, r }
     }
 
-    pub fn sum(&self) -> &Vec<NFLinearSumItem> {
+    pub fn sum(&self) -> &Vec<ScaledVar> {
         &self.sum
     }
 

aries_fzn/src/aries/constraint/lin_eq_reif.rs

@@ -1,7 +1,7 @@
 use aries::core::IntCst;
 use aries::model::Label;
 use aries::model::Model;
-use aries::model::lang::linear::NFLinearSumItem;
+use aries::model::lang::linear::ScaledVar;
 
 use crate::aries::Post;
 use crate::aries::constraint::LinLe;
@@ -12,16 +12,16 @@ use crate::aries::constraint::LinLe;
 /// where `v[i]` are variables, `b` and `c[i]` constants.
 #[derive(Debug)]
 pub struct LinGe {
-    items: Vec<NFLinearSumItem>,
+    items: Vec<ScaledVar>,
     lb: IntCst,
 }
 
 impl LinGe {
-    pub fn new(items: Vec<NFLinearSumItem>, lb: IntCst) -> Self {
+    pub fn new(items: Vec<ScaledVar>, lb: IntCst) -> Self {
         Self { items, lb }
     }
 
-    pub fn items(&self) -> &Vec<NFLinearSumItem> {
+    pub fn items(&self) -> &Vec<ScaledVar> {
         &self.items
     }
 
@@ -32,7 +32,7 @@ impl LinGe {
 
 impl<Lbl: Label> Post<Lbl> for LinGe {
     fn post(&self, model: &mut Model<Lbl>) {
-        let minus = |i: &NFLinearSumItem| NFLinearSumItem {
+        let minus = |i: &ScaledVar| ScaledVar {
             var: i.var,
             factor: -i.factor,
         };

aries_fzn/src/aries/constraint/lin_ge.rs

@@ -2,7 +2,7 @@ use aries::core::IntCst;
 use aries::model::Label;
 use aries::model::Model;
 use aries::model::lang::BVar;
-use aries::model::lang::linear::NFLinearSumItem;
+use aries::model::lang::linear::ScaledVar;
 
 use crate::aries::Post;
 use crate::aries::constraint::LinLeHalf;
@@ -15,17 +15,17 @@ use crate::aries::constraint::LinLeHalf;
 /// `lb` and `c[i]` constants.
 #[derive(Debug)]
 pub struct LinGeHalf {
-    sum: Vec<NFLinearSumItem>,
+    sum: Vec<ScaledVar>,
     lb: IntCst,
     r: BVar,
 }
 
 impl LinGeHalf {
-    pub fn new(sum: Vec<NFLinearSumItem>, lb: IntCst, r: BVar) -> Self {
+    pub fn new(sum: Vec<ScaledVar>, lb: IntCst, r: BVar) -> Self {
         Self { sum, lb, r }
     }
 
-    pub fn sum(&self) -> &Vec<NFLinearSumItem> {
+    pub fn sum(&self) -> &Vec<ScaledVar> {
         &self.sum
     }
 

aries_fzn/src/aries/constraint/lin_ge_half.rs

@@ -2,7 +2,7 @@ use aries::core::IntCst;
 use aries::model::Label;
 use aries::model::Model;
 use aries::model::lang::BVar;
-use aries::model::lang::linear::NFLinearSumItem;
+use aries::model::lang::linear::ScaledVar;
 
 use crate::aries::Post;
 use crate::aries::constraint::LinLeReif;
@@ -15,17 +15,17 @@ use crate::aries::constraint::LinLeReif;
 /// `lb` and `c[i]` constants.
 #[derive(Debug)]
 pub struct LinGeReif {
-    sum: Vec<NFLinearSumItem>,
+    sum: Vec<ScaledVar>,
     lb: IntCst,
     r: BVar,
 }
 
 impl LinGeReif {
-    pub fn new(sum: Vec<NFLinearSumItem>, lb: IntCst, r: BVar) -> Self {
+    pub fn new(sum: Vec<ScaledVar>, lb: IntCst, r: BVar) -> Self {
         Self { sum, lb, r }
     }
 
-    pub fn sum(&self) -> &Vec<NFLinearSumItem> {
+    pub fn sum(&self) -> &Vec<ScaledVar> {
         &self.sum
     }