mistake

neuppl · Apr 4, 2024 · e8aa92f · e8aa92f
1 parent 3490a78
commit e8aa92f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -238,7 +238,7 @@ pub fn extract(
 }
 
 #[ocaml::func]
-#[ocaml::sig("rsdd_bdd_ptr -> rsdd_bdd_ptr -> rsdd_var_label list -> int64 -> rsdd_wmc_params_e_u -> rsdd_expected_utility * rsdd_partial_model * int * int")]
+#[ocaml::sig("rsdd_bdd_ptr -> rsdd_bdd_ptr -> rsdd_var_label list -> int64 -> rsdd_wmc_params_e_u -> rsdd_expected_utility * rsdd_partial_model * int64 * int64")]
 pub fn bdd_meu(
     bdd: &'static RsddBddPtr,
     evidence: &'static RsddBddPtr,

diff --git a/src/rsdd.ml b/src/rsdd.ml
@@ -33,7 +33,7 @@ external bdd_high: rsdd_bdd_ptr -> rsdd_bdd_ptr = "bdd_high"
 external bdd_wmc: rsdd_bdd_ptr -> rsdd_wmc_params_r -> float = "bdd_wmc"
 external new_wmc_params_r: (float * float) list -> rsdd_wmc_params_r = "new_wmc_params_r"
 external extract: rsdd_expected_utility -> float * float = "extract"
-external bdd_meu: rsdd_bdd_ptr -> rsdd_bdd_ptr -> rsdd_var_label list -> int64 -> rsdd_wmc_params_e_u -> rsdd_expected_utility * rsdd_partial_model * int * int = "bdd_meu"
+external bdd_meu: rsdd_bdd_ptr -> rsdd_bdd_ptr -> rsdd_var_label list -> int64 -> rsdd_wmc_params_e_u -> rsdd_expected_utility * rsdd_partial_model * int64 * int64 = "bdd_meu"
 external new_wmc_params_eu: ((float * float) * (float * float)) list -> rsdd_wmc_params_e_u = "new_wmc_params_eu"
 external cnf_from_dimacs: string -> rsdd_cnf = "cnf_from_dimacs"
 external bdd_builder_compile_cnf: rsdd_bdd_builder -> rsdd_cnf -> rsdd_bdd_ptr = "bdd_builder_compile_cnf"

diff --git a/src/rsdd.mli b/src/rsdd.mli
@@ -33,7 +33,7 @@ external bdd_high: rsdd_bdd_ptr -> rsdd_bdd_ptr = "bdd_high"
 external bdd_wmc: rsdd_bdd_ptr -> rsdd_wmc_params_r -> float = "bdd_wmc"
 external new_wmc_params_r: (float * float) list -> rsdd_wmc_params_r = "new_wmc_params_r"
 external extract: rsdd_expected_utility -> float * float = "extract"
-external bdd_meu: rsdd_bdd_ptr -> rsdd_bdd_ptr -> rsdd_var_label list -> int64 -> rsdd_wmc_params_e_u -> rsdd_expected_utility * rsdd_partial_model * int * int = "bdd_meu"
+external bdd_meu: rsdd_bdd_ptr -> rsdd_bdd_ptr -> rsdd_var_label list -> int64 -> rsdd_wmc_params_e_u -> rsdd_expected_utility * rsdd_partial_model * int64 * int64 = "bdd_meu"
 external new_wmc_params_eu: ((float * float) * (float * float)) list -> rsdd_wmc_params_e_u = "new_wmc_params_eu"
 external cnf_from_dimacs: string -> rsdd_cnf = "cnf_from_dimacs"
 external bdd_builder_compile_cnf: rsdd_bdd_builder -> rsdd_cnf -> rsdd_bdd_ptr = "bdd_builder_compile_cnf"

diff --git a/test/test.ml b/test/test.ml
@@ -34,10 +34,9 @@ let () =
                                  ((1.0, 0.0), (1.0, 5.0));
                                  ((1.0, 0.0), (1.0, 4.0));
                                  ((1.0, 0.0), (1.0, 0.0));] in
-  let (asdf, _, total_size, times_pruned, avg_size) = bdd_meu total (bdd_true builder) sdfsdf 3L param in
+  let (asdf, _, total_size, times_pruned) = bdd_meu total (bdd_true builder) sdfsdf 3L param in
   let (a,b) = (extract asdf) in
   let asdfasdfasdf = String.concat " " [(Float.to_string a);(Float.to_string b)] in 
-  let asdf' = "Total size: " ^ (Int64.to_string total_size) in
   let asdf'2 = "Times pruned " ^ (Int64.to_string times_pruned) in
-  let asdf'3 = "Avg size: " ^ (Float.to_string avg_size) in
-  print_endline(asdfasdfasdf) ; print_endline(asdf') ; print_endline(asdf'2); print_endline(asdf'3)
+  let asdf'3 = "Size: " ^ (Int64.to_string total_size) in
+  print_endline(asdfasdfasdf); print_endline(asdf'2); print_endline(asdf'3)