- let rec given_clause bag maxvar nb_iter timeout actives passives g_actives g_passives =
- (* prerr_endline "Bag :"; prerr_endline (Pp.pp_bag bag);
- prerr_endline "Active table :";
- (List.iter (fun x -> prerr_endline (Pp.pp_unit_clause x))
- (fst actives)); *)
- let nb_iter = nb_iter + 1 in
- if nb_iter = max_nb_iter then
- raise (Failure ("No iterations left !",bag,maxvar,nb_iter));
- if Unix.gettimeofday () > timeout then
- raise (Failure ("Timeout !",bag,maxvar,nb_iter));
+ let rec given_clause
+ bag maxvar iterno max_steps timeout
+ actives passives g_actives g_passives
+ =
+ let iterno = iterno + 1 in
+ if iterno = max_steps then
+ raise (Failure ("No iterations left !",bag,maxvar,iterno));
+ (* timeout check: gettimeofday called only if timeout set *)
+ (match timeout with
+ | None -> ()
+ | Some timeout ->
+ if Unix.gettimeofday () > timeout then
+ raise (Failure ("Timeout !",bag,maxvar,iterno)));