X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Ftactics%2FtacticChaser.ml;h=831ccc6f4bedaf2cc4f32d77f4067aa25486948b;hb=3bb4ce11fb9d4c6375483a80344beb94c4517dd7;hp=d3ba1d2a3e1130ac9abc7e3d6a0071169fe8c2b1;hpb=6150b8ef905aaea17b47ff466c067054f976cd8f;p=helm.git diff --git a/helm/ocaml/tactics/tacticChaser.ml b/helm/ocaml/tactics/tacticChaser.ml index d3ba1d2a3..831ccc6f4 100644 --- a/helm/ocaml/tactics/tacticChaser.ml +++ b/helm/ocaml/tactics/tacticChaser.ml @@ -48,13 +48,11 @@ match list_of_must with [] -> [] |_ -> let must = choose_must list_of_must only in - prerr_endline "123"; let result = I.execute mqi_handle (G.query_of_constraints (Some CGMatchConclusion.universe) (must,[],[]) (Some only,None,None)) in - prerr_endline "456"; let uris = List.map (function uri,_ -> @@ -77,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) ); @@ -124,8 +122,10 @@ let matchConclusion2 mqi_handle ?(output_html = (fun _ -> ())) ~choose_must() st 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) -> @@ -136,15 +136,17 @@ let matchConclusion2 mqi_handle ?(output_html = (fun _ -> ())) ~choose_must() st 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 isvar 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 + *) (* 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 1 " ^ 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)) @@ -154,7 +156,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 *) @@ -171,20 +178,21 @@ let matchConclusion2 mqi_handle ?(output_html = (fun _ -> ())) ~choose_must() st | (m,uri)::tl -> let tl' = filter_out tl in try + prerr_endline ("STO APPLICANDO " ^ uri); (m, - (prerr_endline ("STO APPLICANDO " ^ uri); - (PrimitiveTactics.apply_tac + (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' (* with ProofEngineTypes.Fail _ -> tl' *) (* patch to cover CSC's exportation bug *) with _ -> 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' ;; @@ -207,76 +215,7 @@ let choose_must list_of_must only = with _ -> List.nth list_of_must 0 *) -(* OLD CODE: TO BE REMOVED -(*Funzione position prende una lista e un elemento e mi ritorna la posizione dell'elem nella lista*) -(*Mi serve per ritornare la posizione del teo che produce meno subgoal*) - -exception NotInTheList;; - - -let position n = - let rec aux k = - function - [] -> raise NotInTheList - | m::_ when m=n -> k - | _::tl -> aux (k+1) tl in - aux 1 -;; - - - -(*function taking a status and returning a new status after having searching a theorem to apply ,theorem which *) -(*generate the less number of subgoals*) - -let searchTheorem (proof,goal) = - let mqi_flags = [MQIC.Postgres ; MQIC.Stat ; MQIC.Warn ; MQIC.Log] (* default MathQL interpreter options *) - in - let mqi_handle = MQIC.init mqi_flags prerr_string -in - let uris' = - matchConclusion - mqi_handle ~choose_must() (proof, goal) - in - let list_of_termin = - List.map - (function string -> - (MQueryMisc.term_of_cic_textual_parser_uri - (MQueryMisc.cic_textual_parser_uri_of_string string)) - ) - uris' - in - let list_proofgoal = - List.map - (function term -> - PrimitiveTactics.apply_tac ~term (proof,goal)) - list_of_termin - in - let (list_of_subgoal: int list list) = - List.map snd list_proofgoal - in - let list_of_num = - List.map List.length list_of_subgoal - in - let list_sort = - List.sort Pervasives.compare list_of_num - in (*ordino la lista in modo cresc*) - let min= List.nth list_sort 0 (*prendo il minimo*) - in - let uri' = (*cerco il teo di pos k*) - List.nth list_of_termin (position min list_of_num) - in - (* let teo= - String.sub uri' 4 (String.length uri' - 4) - - (* modifico la str in modo che sia accettata da apply*) - in*) - PrimitiveTactics.apply_tac ~term:uri' (proof,goal) -;; -*) - - let searchTheorems mqi_handle (proof,goal) = -(*prerr_endline "1";*) let subproofs = matchConclusion2 mqi_handle ~choose_must() (proof, goal) in let res = @@ -291,8 +230,30 @@ 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 = CicTypeChecker.type_of_aux' metasenv ey1 ty1 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 = CicTypeChecker.type_of_aux' metasenv ey2 ty2 in +(* + prerr_endline "DOPO LA SECONDA TYPE OF " ; +*) + let prop1 = if CicReduction.are_convertible + ey1 (Cic.Sort Cic.Prop) ty_sort1 then 0 + else 1 in + let prop2 = if CicReduction.are_convertible + ey2 (Cic.Sort Cic.Prop) ty_sort2 then 0 + else 1 in + prop1 - prop2 in + List.map (fun (level,(proof,goallist)) -> (proof, (List.stable_sort (order_goal_list proof) goallist))) res ;;