Merge pull request #267 from scipopt/fix-266

mmghannam · web-flow · commit 9f547fb00814 · 2025-11-20T07:52:32.000+01:00
Add primal and dual limits to supported model statuses, update scip-sys
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -1,7 +1,7 @@
 name: russcip_pipelines
 
 env:
-  version: 9.2.1
+  version: 9.2.4
   RUST_VERSION: 1.88.0
 
 on:
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,7 +15,7 @@ from-source = ["scip-sys/from-source"]
 datastore = ["anymap3"]
 
 [dependencies]
-scip-sys = "0.1.22"
+scip-sys = "0.1.25"
 anymap3 = { version = "1.0.1", optional = true }
 
 [dev-dependencies]
diff --git a/src/status.rs b/src/status.rs
@@ -20,6 +20,10 @@ pub enum Status {
     MemoryLimit,
     /// The solving process was interrupted because the gap limit was reached.
     GapLimit,
+    /// The solving process was interrupted because the primal limit was reached.
+    PrimalLimit,
+    /// The solving process was interrupted because the dual limit was reached.
+    DualLimit,
     /// The solving process was interrupted because the solution limit was reached.
     SolutionLimit,
     /// The solving process was interrupted because the solution improvement limit was reached.
@@ -50,6 +54,8 @@ impl From<SCIP_Status> for Status {
             ffi::SCIP_Status_SCIP_STATUS_TIMELIMIT => Status::TimeLimit,
             ffi::SCIP_Status_SCIP_STATUS_MEMLIMIT => Status::MemoryLimit,
             ffi::SCIP_Status_SCIP_STATUS_GAPLIMIT => Status::GapLimit,
+            ffi::SCIP_Status_SCIP_STATUS_PRIMALLIMIT => Status::PrimalLimit,
+            ffi::SCIP_Status_SCIP_STATUS_DUALLIMIT => Status::DualLimit,
             ffi::SCIP_Status_SCIP_STATUS_SOLLIMIT => Status::SolutionLimit,
             ffi::SCIP_Status_SCIP_STATUS_BESTSOLLIMIT => Status::BestSolutionLimit,
             ffi::SCIP_Status_SCIP_STATUS_RESTARTLIMIT => Status::RestartLimit,
@@ -166,6 +172,34 @@ mod tests {
         assert_eq!(model.status(), Status::BestSolutionLimit);
     }
 
+    #[test]
+    fn primal_limit() {
+        let mut model = Model::new()
+            .hide_output()
+            .include_default_plugins()
+            .read_prob("data/test/gen-ip054.mps")
+            .unwrap();
+        model = model.set_int_param("presolving/maxrounds", 0).unwrap();
+        model = model.set_real_param("limits/primal", 100000.).unwrap();
+        let model = model.solve();
+
+        assert_eq!(model.status(), Status::PrimalLimit);
+    }
+
+    #[test]
+    fn dual_limit() {
+        let mut model = Model::new()
+            .hide_output()
+            .include_default_plugins()
+            .read_prob("data/test/gen-ip054.mps")
+            .unwrap();
+        model = model.set_int_param("presolving/maxrounds", 0).unwrap();
+        model = model.set_real_param("limits/dual", -100000.).unwrap();
+        let model = model.solve();
+
+        assert_eq!(model.status(), Status::DualLimit);
+    }
+
     #[test]
     fn unknown() {
         assert_eq!(Model::new().status(), Status::Unknown);
