X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Ftactics%2FtacticChaser.ml;h=edb69bf5025ba8ea6824190d27f51f07a66bf9d9;hb=5930f13b2d863abbff240ffa985bcc064c7a5ab8;hp=a4ce74bb51a118256452907dcd71758c7b22d369;hpb=f654787b2156ede958a1d35ca8daf239de1b7b89;p=helm.git diff --git a/helm/ocaml/tactics/tacticChaser.ml b/helm/ocaml/tactics/tacticChaser.ml index a4ce74bb5..edb69bf50 100644 --- a/helm/ocaml/tactics/tacticChaser.ml +++ b/helm/ocaml/tactics/tacticChaser.ml @@ -40,7 +40,7 @@ module U = MQGUtil module G = MQueryGenerator (* search arguments on which Apply tactic doesn't fail *) -let matchConclusion mqi_handle ?(output_html = (fun _ -> ())) ~choose_must() ~status = +let matchConclusion mqi_handle ?(output_html = (fun _ -> ())) ~choose_must() status = let ((_, metasenv, _, _), metano) = status in let (_, ey ,ty) = CicUtil.lookup_meta metano metasenv in let list_of_must, only = CGMatchConclusion.get_constraints metasenv ey ty in @@ -48,11 +48,13 @@ 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,_ -> @@ -64,7 +66,7 @@ match list_of_must with prerr_endline "STO FILTRANDO"; List.filter (fun uri -> Pcre.pmatch ~pat:"^cic:/Coq/" uri) uris in - prerr_endline "HO FILTRATO"; + prerr_endline "HO FILTRATO"; let uris',exc = let rec filter_out = function @@ -72,15 +74,20 @@ match list_of_must with | uri::tl -> let tl',exc = filter_out tl in try - if + if + let time = Unix.gettimeofday() in (try ignore - (PrimitiveTactics.apply_tac - ~term:(MQueryMisc.term_of_cic_textual_parser_uri - (MQueryMisc.cic_textual_parser_uri_of_string uri)) - ~status); - true - with ProofEngineTypes.Fail _ -> false) + (PrimitiveTactics.apply_tac + ~term:(MQueryMisc.term_of_cic_textual_parser_uri + (MQueryMisc.cic_textual_parser_uri_of_string uri)) + status); + let time1 = Unix.gettimeofday() in + prerr_endline (Printf.sprintf "%1.3f" (time1 -. time) ); + true + with ProofEngineTypes.Fail _ -> + let time1 = Unix.gettimeofday() in + prerr_endline (Printf.sprintf "%1.3f" (time1 -. time)); false) then uri::tl',exc else @@ -108,16 +115,86 @@ match list_of_must with ;; +(*matchConclusion modificata per evitare una doppia apply*) +let matchConclusion2 mqi_handle ?(output_html = (fun _ -> ())) ~choose_must() status = + let ((_, metasenv, _, _), metano) = status in + let (_, ey ,ty) = CicUtil.lookup_meta metano metasenv in + let conn = + match mqi_handle.MQIConn.pgc with + MQIConn.MySQL_C conn -> conn + | _ -> assert false in + let result = Match_concl.cmatch conn ty in + 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 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 = + (* TODO ristretto per ragioni di efficienza *) + prerr_endline "STO FILTRANDO2"; + List.filter (fun _,uri -> Pcre.pmatch ~pat:"^cic:/Coq/" uri) uris in +(* + let uris = + (* TODO ristretto per ragioni di efficienza *) + prerr_endline "STO FILTRANDO2"; + List.filter (fun uri -> Pcre.pmatch ~pat:"^cic:/Coq/" uri) uris + in + let uris = + (* ristretto all cache *) + prerr_endline "SOLO CACHE"; + List.filter + (fun uri -> CicEnvironment.in_cache (UriManager.uri_of_string uri)) uris + in + prerr_endline "HO FILTRATO2"; +*) + let uris' = + let rec filter_out = + function + [] -> [] + | (m,uri)::tl -> + let tl' = filter_out tl in + try + (m, + (prerr_endline ("STO APPLICANDO " ^ uri); + (PrimitiveTactics.apply_tac + ~term:(MQueryMisc.term_of_cic_textual_parser_uri + (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)); + filter_out uris + in + uris' +;; + (*funzione che sceglie il penultimo livello di profondita' dei must*) -(* +(* let choose_must list_of_must only= let n = (List.length list_of_must) - 1 in List.nth list_of_must n ;;*) +(* questa prende solo il main *) +let choose_must list_of_must only = + List.nth list_of_must 0 + +(* livello 1 let choose_must list_of_must only = - List.nth list_of_must 0 + try + List.nth list_of_must 1 + 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*) @@ -140,14 +217,14 @@ let position n = (*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 ~status:(proof,goal) = +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() ~status:(proof, goal) + mqi_handle ~choose_must() (proof, goal) in let list_of_termin = List.map @@ -160,7 +237,7 @@ in let list_proofgoal = List.map (function term -> - PrimitiveTactics.apply_tac ~term ~status:(proof,goal)) + PrimitiveTactics.apply_tac ~term (proof,goal)) list_of_termin in let (list_of_subgoal: int list list) = @@ -182,35 +259,29 @@ in (* modifico la str in modo che sia accettata da apply*) in*) - PrimitiveTactics.apply_tac ~term:uri' ~status:(proof,goal) + PrimitiveTactics.apply_tac ~term:uri' (proof,goal) ;; *) -let searchTheorems mqi_handle ~status:(proof,goal) = -prerr_endline "1"; - let uris' = - matchConclusion mqi_handle ~choose_must() ~status:(proof, goal) in -prerr_endline "2"; - 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 -prerr_endline "3"; - let list_proofgoal = - List.map - (function term -> - PrimitiveTactics.apply_tac ~term ~status:(proof,goal)) list_of_termin in -prerr_endline "4"; -let res = +let searchTheorems mqi_handle (proof,goal) = +(*prerr_endline "1";*) + let subproofs = + matchConclusion2 mqi_handle ~choose_must() (proof, goal) in + let res = List.sort - (fun (_,gl1) (_,gl2) -> - Pervasives.compare (List.length gl1) (List.length gl2)) - list_proofgoal - in -prerr_endline "5"; -res + (fun (n1,(_,gl1)) (n2,(_,gl2)) -> + let l1 = List.length gl1 in + let l2 = List.length gl2 in + (* if the list of subgoals have the same lenght we use the + prefix tag, where higher tags have precedence *) + if l1 = l2 then n2 - n1 + else l1 - l2) + subproofs + in + (* now we may drop the prefix tag *) + List.map snd res + + ;;