Fixes (IntVar -> IntVar*, create vec<IntVar>* instead of using nullptr)

conjure-cp · Nov 2, 2023 · ac3c4c8 · ac3c4c8
1 parent 7906d9d
commit ac3c4c8
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/solvers/chuffed/build.rs b/solvers/chuffed/build.rs
@@ -72,6 +72,8 @@ fn bind() {
  .allowlist_function("var_sym_break")
  .allowlist_function("new_dummy_problem")
  .allowlist_function("get_idx")
+ .allowlist_function("make_vec_intvar")
+ .allowlist_function("destroy_vec_intvar")
  .allowlist_function("p_addVars")
  .allowlist_function("p_setcallback")
  .allowlist_function("branch_IntVar")

diff --git a/solvers/chuffed/src/lib.rs b/solvers/chuffed/src/lib.rs
@@ -7,8 +7,8 @@ pub mod bindings {
 
 pub mod wrappers {
  use crate::bindings::{
- all_different, branch_IntVar, createVar, createVars, vec, ConLevel, IntVar, ValBranch,
- VarBranch,
+ all_different, branch_IntVar, createVar, createVars, make_vec_intvar, vec, ConLevel,
+ IntVar, ValBranch, VarBranch,
  };
  use core::ptr;
 
@@ -25,7 +25,7 @@ pub mod wrappers {
 
  // createVars void createVars(vec<IntVar*>& x, int n, int min, int max, bool el)
  pub fn create_vars(n: i32, min: i32, max: i32, el: bool) -> *mut vec<*mut IntVar> {
- let ptr: *mut vec<*mut IntVar> = ptr::null_mut();
+ let ptr: *mut vec<*mut IntVar> = unsafe { make_vec_intvar() };
 
  unsafe {
  createVars(ptr, n, min, max, el);

diff --git a/solvers/chuffed/wrapper.cpp b/solvers/chuffed/wrapper.cpp
@@ -7,7 +7,15 @@ void p_addVars(DummyProblem *p, vec<IntVar *> *_searchVars) {
 void p_setcallback(DummyProblem *p, void (*_callback)(vec<IntVar *> *)) {
  p->setcallback(_callback);
 }
-IntVar get_idx(vec<IntVar *> *x, int i) { return **x[i]; }
+IntVar* get_idx(vec<IntVar *> *x, int i) { return *x[i]; }
+
+vec<IntVar*>* make_vec_intvar() {
+ return new vec<IntVar*>();
+}
+
+void destroy_vec_intvar(vec<IntVar*>* v) {
+ delete v;
+}
 
 void branch_IntVar(vec<IntVar *> *x, VarBranch var_branch,
  ValBranch val_branch) {

diff --git a/solvers/chuffed/wrapper.h b/solvers/chuffed/wrapper.h
@@ -17,7 +17,10 @@ class DummyProblem {
 DummyProblem *new_dummy_problem();
 void p_addVars(DummyProblem *p, vec<IntVar *> *_searchVars);
 void p_setcallback(DummyProblem *p, void (*_callback)(vec<IntVar *> *));
-IntVar get_idx(vec<IntVar *> *x, int i);
+IntVar* get_idx(vec<IntVar *> *x, int i);
+
+vec<IntVar*>* make_vec_intvar();
+void destroy_vec_intvar(vec<IntVar*>* v);
 
 void branch_IntVar(vec<IntVar *> *x, VarBranch var_branch,
  ValBranch val_branch);