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

Fix for restart increments

Browse source
This commit is contained in:
Guillaume Bury 2015-03-16 15:50:20 +01:00
parent f604401e47
commit a2e2e15137
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
solver/mcsolver.ml
View file

@ -800,7 +800,7 @@ module Make (L : Log_intf.S)(E : Expr_intf.S)
| None -> (* No Conflict *) | None -> (* No Conflict *)
if nb_assigns() = St.nb_vars () (* env.nb_init_vars *) then raise Sat; if nb_assigns() = St.nb_vars () (* env.nb_init_vars *) then raise Sat;
if n_of_conflicts >= 0 && !conflictC >= n_of_conflicts then begin if n_of_conflicts > 0 && !conflictC >= n_of_conflicts then begin
L.debug 1 "Restarting..."; L.debug 1 "Restarting...";
env.progress_estimate <- progress_estimate(); env.progress_estimate <- progress_estimate();
cancel_until 0; cancel_until 0;
@ -846,14 +846,14 @@ module Make (L : Log_intf.S)(E : Expr_intf.S)
begin try begin try
search (to_int !n_of_conflicts) (to_int !n_of_learnts) search (to_int !n_of_conflicts) (to_int !n_of_learnts)
with with
| Restart -> () | Restart ->
n_of_conflicts := !n_of_conflicts *. env.restart_inc;
n_of_learnts := !n_of_learnts *. env.learntsize_inc
| Sat -> | Sat ->
let tag = ref false in let tag = ref false in
Th.if_sat (full_slice tag); Th.if_sat (full_slice tag);
if not !tag then raise Sat if not !tag then raise Sat
end; end
n_of_conflicts := !n_of_conflicts *. env.restart_inc;
n_of_learnts := !n_of_learnts *. env.learntsize_inc
done done
with with
| Sat -> () | Sat -> ()