simon/sidekick
1
0
Fork 0
mirror of https://github.com/c-cube/sidekick.git synced 2025-12-06 11:15:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename stat

Browse source
This commit is contained in:
Simon Cruanes 2021-12-20 16:40:22 -05:00
parent dbba6719bc
commit 88f57d213a
No known key found for this signature in database
GPG key ID: EBFFF6F283F3A2B4
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/lra/simplex2.ml
View file

@ -1031,14 +1031,11 @@ module Make(Q : RATIONAL)(Var: VAR)
let cert = Unsat_cert.unsat_basic x_i (op, bnd) le bounds in let cert = Unsat_cert.unsat_basic x_i (op, bnd) le bounds in
cert cert
let out_ = open_out "pivots"
(* main satisfiability check. (* main satisfiability check.
page 15, figure 3.2 *) page 15, figure 3.2 *)
let check_exn ~on_propagate:_ (self:t) : unit = let check_exn ~on_propagate:_ (self:t) : unit =
let exception Stop in let exception Stop in
Log.debugf 20 (fun k->k "(@[simplex2.check@ %a@])" pp_stats self); Log.debugf 20 (fun k->k "(@[simplex2.check@ %a@])" pp_stats self);
Printf.fprintf out_ "check\n";
Stat.incr self.stat_check; Stat.incr self.stat_check;
let m = self.matrix in let m = self.matrix in
@ -1076,7 +1073,6 @@ module Make(Q : RATIONAL)(Var: VAR)
Log.debugf 50 Log.debugf 50
(fun k->k "(@[simplex2.pivot@ :basic %a@ :n-basic %a@])" (fun k->k "(@[simplex2.pivot@ :basic %a@ :n-basic %a@])"
Var_state.pp x_i Var_state.pp x_j); Var_state.pp x_i Var_state.pp x_j);
Printf.fprintf out_ "pivot x%d -> x%d\n%!" x_i.idx x_j.idx;
pivot_and_update self x_i x_j bnd.b_val pivot_and_update self x_i x_j bnd.b_val
) else ( ) else (
(* line 10 *) (* line 10 *)
@ -1100,12 +1096,10 @@ module Make(Q : RATIONAL)(Var: VAR)
Log.debugf 50 Log.debugf 50
(fun k->k "(@[simplex2.pivot@ :basic %a@ :n-basic %a@])" (fun k->k "(@[simplex2.pivot@ :basic %a@ :n-basic %a@])"
Var_state.pp x_i Var_state.pp x_j); Var_state.pp x_i Var_state.pp x_j);
Printf.fprintf out_ "pivot x%d -> x%d\n%!" x_i.idx x_j.idx;
pivot_and_update self x_i x_j bnd.b_val pivot_and_update self x_i x_j bnd.b_val
) )
done; done;
with Stop -> with Stop ->
Printf.fprintf out_ "done\n";
Log.debugf 50 (fun k->k "(@[simplex2.check.done@])"); Log.debugf 50 (fun k->k "(@[simplex2.check.done@])");
() ()
@ -1117,7 +1111,7 @@ module Make(Q : RATIONAL)(Var: VAR)
bound_stack=Backtrack_stack.create(); bound_stack=Backtrack_stack.create();
undo_stack=Backtrack_stack.create(); undo_stack=Backtrack_stack.create();
stat_check=Stat.mk_int stat "simplex.check"; stat_check=Stat.mk_int stat "simplex.check";
stat_unsat=Stat.mk_int stat "simplex.unsat"; stat_unsat=Stat.mk_int stat "simplex.conflicts";
stat_define=Stat.mk_int stat "simplex.define"; stat_define=Stat.mk_int stat "simplex.define";
stat_propagate=Stat.mk_int stat "simplex.propagate"; stat_propagate=Stat.mk_int stat "simplex.propagate";
} in } in