add new vartype

plaans · Sep 1, 2023 · 1451740 · 1451740
1 parent 6661879
commit 1451740
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/planning/planners/src/solver.rs b/planning/planners/src/solver.rs
@@ -217,8 +217,12 @@ impl Heuristic<VarLabel> for ActivityNonTemporalFirstHeuristic {
         match label.as_ref() {
             None => 0,
             Some(VarLabel(_, tpe)) => match tpe {
-                VarType::Presence | VarType::Reification | VarType::Parameter(_) => 0,
-                VarType::ChronicleStart | VarType::ChronicleEnd | VarType::TaskStart(_) | VarType::TaskEnd(_) => 1,
+                VarType::Presence | VarType::Reification | VarType::Parameter(_) | VarType::Arbitrary => 0,
+                VarType::ChronicleStart
+                | VarType::ChronicleEnd
+                | VarType::TaskStart(_)
+                | VarType::TaskEnd(_)
+                | VarType::InternalTimepoint => 1,
                 VarType::Horizon | VarType::EffectEnd | VarType::Cost => 2,
             },
         }

diff --git a/planning/planning/src/chronicles/mod.rs b/planning/planning/src/chronicles/mod.rs
@@ -248,6 +248,10 @@ pub enum VarType {
     Parameter(String),
     Reification,
     Cost,
+    /// Internal timepoint that does not appear in the start and end timepoints, nor in the chronicle start and end.
+    InternalTimepoint,
+    /// Arbitrary variable
+    Arbitrary,
 }
 
 #[derive(Clone)]

diff --git a/planning/planning/src/chronicles/printer.rs b/planning/planning/src/chronicles/printer.rs
@@ -186,6 +186,8 @@ impl<'a> Printer<'a> {
                 VarType::Parameter(name) => print!("{name}"),
                 VarType::Reification => print!("reif_{v:?}"),
                 VarType::Cost => print!("cost_{v:?}"),
+                VarType::Arbitrary => print!("arb_{v:?}"),
+                VarType::InternalTimepoint => print!("t_{v:?}"),
             }
         } else if v == VarRef::ZERO {
             print!("0");

diff --git a/solver/src/core/variable.rs b/solver/src/core/variable.rs
@@ -7,10 +7,12 @@ pub type IntCst = i32;
 
 /// Overflow tolerant min value for integer constants.
 /// It is used as a default for the lower bound of integer variable domains
+//pub const INT_CST_MIN: IntCst = -1000 * 100 / 2 + 1;
 pub const INT_CST_MIN: IntCst = IntCst::MIN / 2 + 1;
 
 /// Overflow tolerant max value for integer constants.
 /// It is used as a default for the upper bound of integer variable domains
+//pub const INT_CST_MAX: IntCst = 1000 * 1000 / 2 - 1;
 pub const INT_CST_MAX: IntCst = IntCst::MAX / 2 - 1;
 
 create_ref_type!(VarRef);