X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=components%2Ftactics%2FautoTactic.ml;h=e8d034a3298a9630fa0c8b1efe693579a1045ed2;hb=115915f23df4f56832d68b2f6b5b80c5afe019fc;hp=cdfcf8c73ec560dfaf887bb9540e0267e4503659;hpb=46f89a89b444b0f1e6b25773c59127ccfbe07d0e;p=helm.git diff --git a/components/tactics/autoTactic.ml b/components/tactics/autoTactic.ml index cdfcf8c73..e8d034a32 100644 --- a/components/tactics/autoTactic.ml +++ b/components/tactics/autoTactic.ml @@ -286,7 +286,7 @@ let auto_tac_old ?(depth=default_depth) ?(width=default_width) ~(dbd:HMysql.dbd) debug_print (lazy "AUTO_TAC HA FINITO"); let _,_,p,_ = proof in debug_print (lazy (CicPp.ppterm p)); - Printf.printf "tempo: %.9f\n" (t2 -. t1); + debug_print (lazy (Printf.sprintf "tempo: %.9f\n" (t2 -. t1))); (proof,[]) | _ -> assert false in @@ -317,22 +317,22 @@ let int params name default = raise (ProofEngineTypes.Fail (lazy (name ^ " must be an integer"))) ;; -let auto_tac ~params ~(dbd:HMysql.dbd) (proof, goal) = +let auto_tac ~params ~(dbd:HMysql.dbd) ~universe (proof, goal) = (* argument parsing *) let int = int params in let bool = bool params in - let newauto = bool "new" false in + let oldauto = bool "old" false in let use_only_paramod = bool "paramodulation" false in - let newauto = if use_only_paramod then true else newauto in + let oldauto = if use_only_paramod then false else oldauto in let depth = int "depth" ((AutoTypes.default_flags()).AutoTypes.maxdepth) in let width = int "width" ((AutoTypes.default_flags()).AutoTypes.maxwidth) in - if not newauto then + if oldauto then auto_tac_old ~depth ~width ~dbd () (proof,goal) else - ProofEngineTypes.apply_tactic (Auto.auto_tac ~dbd ~params) (proof,goal) + ProofEngineTypes.apply_tactic (Auto.auto_tac ~dbd ~params ~universe) (proof,goal) -let auto_tac ~params ~dbd = - ProofEngineTypes.mk_tactic (auto_tac ~params ~dbd) +let auto_tac ~params ~dbd ~universe= + ProofEngineTypes.mk_tactic (auto_tac ~params ~dbd ~universe) ;; let pp_proofterm = Equality.pp_proofterm;;