X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Ftactics%2FtacticChaser.ml;h=de356a3d1f52860237a9582bb57b0ddc991e271f;hb=4167cea65ca58897d1a3dbb81ff95de5074700cc;hp=e917555ce3e63f87a4052c224321f5416205f4c2;hpb=e76b78d1d80796de1b8f6a469741cbd26cd4d822;p=helm.git diff --git a/helm/ocaml/tactics/tacticChaser.ml b/helm/ocaml/tactics/tacticChaser.ml index e917555ce..de356a3d1 100644 --- a/helm/ocaml/tactics/tacticChaser.ml +++ b/helm/ocaml/tactics/tacticChaser.ml @@ -23,15 +23,15 @@ * http://cs.unibo.it/helm/. *) -(******************************************************************************) -(* *) -(* PROJECT HELM *) -(* *) -(* Claudio Sacerdoti Coen *) -(* 18/02/2003 *) -(* *) -(* *) -(******************************************************************************) +(*****************************************************************************) +(* *) +(* PROJECT HELM *) +(* *) +(* Claudio Sacerdoti Coen *) +(* 18/02/2003 *) +(* *) +(* *) +(*****************************************************************************) module MQI = MQueryInterpreter module MQIC = MQIConn @@ -75,10 +75,10 @@ match list_of_must with if let time = Unix.gettimeofday() in (try - ignore + ignore(ProofEngineTypes.apply_tactic (PrimitiveTactics.apply_tac ~term:(MQueryMisc.term_of_cic_textual_parser_uri - (MQueryMisc.cic_textual_parser_uri_of_string uri)) + (MQueryMisc.cic_textual_parser_uri_of_string uri))) status); let time1 = Unix.gettimeofday() in prerr_endline (Printf.sprintf "%1.3f" (time1 -. time) ); @@ -121,36 +121,21 @@ let matchConclusion2 mqi_handle ?(output_html = (fun _ -> ())) ~choose_must() st match mqi_handle.MQIConn.pgc with MQIConn.MySQL_C conn -> conn | _ -> assert false in - let result = Match_concl.cmatch conn ty in - (* Stampa il risultato della query - List.iter - (fun (n,u) -> prerr_endline ((string_of_int n) ^ " " ^u)) result; - *) - let uris = - List.map - (fun (n,u) -> - (n,MQueryMisc.wrong_xpointer_format_from_wrong_xpointer_format' u)) - result in + let uris = Match_concl.cmatch conn ty in + (* List.iter + (fun (n,u) -> prerr_endline ((string_of_int n) ^ " " ^u)) uris; *) (* delete all .var uris *) - let isvar (_,s) = - let len = String.length s in - let suffix = String.sub s (len-4) 4 in - not (suffix = ".var") in - let uris = List.filter isvar uris in + let uris = List.filter UriManager.is_var uris in (* delete all not "cic:/Coq" uris *) (* let uris = (* TODO ristretto per ragioni di efficienza *) List.filter (fun _,uri -> Pcre.pmatch ~pat:"^cic:/Coq/" uri) uris in *) - (* - let uris = - List.filter (fun _,uri -> not (Pcre.pmatch ~pat:"^cic:/Coq/ring" uri)) uris in - *) (* concl_cost are the costants in the conclusion of the proof while hyp_const are the constants in the hypothesis *) - let (_,concl_const) = NewConstraints.constants_of ty in - prerr_endline ("Ne sono rimasti " ^ string_of_int (List.length uris)); + let (main_concl,concl_const) = NewConstraints.mainandcons ty in + prerr_endline ("Ne sono rimasti" ^ string_of_int (List.length uris)); let hyp t set = match t with Some (_,Cic.Decl t) -> (NewConstraints.StringSet.union set (NewConstraints.constants_concl t)) @@ -160,7 +145,12 @@ let matchConclusion2 mqi_handle ?(output_html = (fun _ -> ())) ~choose_must() st List.fold_right hyp ey NewConstraints.StringSet.empty in prerr_endline (NewConstraints.pp_StringSet (NewConstraints.StringSet.union hyp_const concl_const)); (* uris with new constants in the proof are filtered *) - let uris = List.filter (Filter_auto.filter_new_constants conn (NewConstraints.StringSet.union hyp_const concl_const)) uris in + let all_const = NewConstraints.StringSet.union hyp_const concl_const in + let uris = + if (List.length uris < (Filter_auto.power 2 (List.length (NewConstraints.StringSet.elements all_const)))) + then + (prerr_endline("metodo vecchio");List.filter (Filter_auto.filter_new_constants conn all_const) uris) + else Filter_auto.filter_uris conn all_const uris main_concl in (* let uris = (* ristretto all cache *) @@ -170,6 +160,11 @@ let matchConclusion2 mqi_handle ?(output_html = (fun _ -> ())) ~choose_must() st in prerr_endline "HO FILTRATO2"; *) + let uris = + List.map + (fun (n,u) -> + (n,MQueryMisc.wrong_xpointer_format_from_wrong_xpointer_format' u)) + uris in let uris' = let rec filter_out = function @@ -177,20 +172,22 @@ let matchConclusion2 mqi_handle ?(output_html = (fun _ -> ())) ~choose_must() st | (m,uri)::tl -> let tl' = filter_out tl in try - (m, - (prerr_endline ("STO APPLICANDO " ^ uri); - (PrimitiveTactics.apply_tac + prerr_endline ("STO APPLICANDO " ^ uri); + let res = (m, + (ProofEngineTypes.apply_tactic( PrimitiveTactics.apply_tac ~term:(MQueryMisc.term_of_cic_textual_parser_uri - (MQueryMisc.cic_textual_parser_uri_of_string uri)) - status)))::tl' + (MQueryMisc.cic_textual_parser_uri_of_string uri))) + status))::tl' in + prerr_endline ("OK");res (* with ProofEngineTypes.Fail _ -> tl' *) (* patch to cover CSC's exportation bug *) - with _ -> tl' + with _ -> prerr_endline ("FAIL");tl' in - prerr_endline ("Ne sono rimasti " ^ string_of_int (List.length uris)); + prerr_endline ("Ne sono rimasti 2 " ^ string_of_int (List.length uris)); filter_out uris in - prerr_endline ("Ne sono rimasti " ^ string_of_int (List.length uris')); + prerr_endline ("Ne sono rimasti 3 " ^ string_of_int (List.length uris')); + uris' ;; @@ -214,7 +211,6 @@ let choose_must list_of_must only = List.nth list_of_must 0 *) let searchTheorems mqi_handle (proof,goal) = -(*prerr_endline "1";*) let subproofs = matchConclusion2 mqi_handle ~choose_must() (proof, goal) in let res = @@ -229,6 +225,33 @@ let searchTheorems mqi_handle (proof,goal) = subproofs in (* now we may drop the prefix tag *) - List.map snd res + (*let res' = + List.map snd res in*) + let order_goal_list proof goal1 goal2 = + let _,metasenv,_,_ = proof in + let (_, ey1, ty1) = CicUtil.lookup_meta goal1 metasenv in + let (_, ey2, ty2) = CicUtil.lookup_meta goal2 metasenv in +(* + prerr_endline "PRIMA DELLA PRIMA TYPE OF " ; +*) + let ty_sort1,u = (*TASSI: FIXME *) + CicTypeChecker.type_of_aux' metasenv ey1 ty1 CicUniv.empty_ugraph in +(* + prerr_endline (Printf.sprintf "PRIMA DELLA SECONDA TYPE OF %s \n### %s @@@%s " (CicMetaSubst.ppmetasenv metasenv []) (CicMetaSubst.ppcontext [] ey2) (CicMetaSubst.ppterm [] ty2)); +*) + let ty_sort2,u1 = CicTypeChecker.type_of_aux' metasenv ey2 ty2 u in +(* + prerr_endline "DOPO LA SECONDA TYPE OF " ; +*) + let b,u2 = + CicReduction.are_convertible ey1 (Cic.Sort Cic.Prop) ty_sort1 u1 in + let prop1 = if b then 0 else 1 in + let b,_ = CicReduction.are_convertible ey2 (Cic.Sort Cic.Prop) ty_sort2 u2 in + let prop2 = if b then 0 else 1 in + prop1 - prop2 in + List.map ( + fun (level,(proof,goallist)) -> + (proof, (List.stable_sort (order_goal_list proof) goallist)) + ) res ;;