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
| 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
(*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 list_of_must, only = CGMatchConclusion.get_constraints metasenv ey ty in
-match list_of_must with
- [] -> []
-|_ ->
- let must = choose_must list_of_must only in
- let result =
- I.execute mqi_handle
- (G.query_of_constraints
- (Some CGMatchConclusion.universe)
- (must,[],[]) (Some only,None,None)) in
+ 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
- (function uri,_ ->
- MQueryMisc.wrong_xpointer_format_from_wrong_xpointer_format' uri
- ) result
- in
+ 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 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 =
+ (* 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
[] -> []
- | uri::tl ->
- let tl' = filter_out tl in
- try
- ((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'
+ | (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 (string_of_int (List.length uris));
+ 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*)
let searchTheorems mqi_handle (proof,goal) =
(*prerr_endline "1";*)
- let uris' =
+ let subproofs =
matchConclusion2 mqi_handle ~choose_must() (proof, goal) in
-prerr_endline (string_of_int (List.length uris'));
-(*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 (proof,goal)) list_of_termin in*)
-(*prerr_endline "4";*)
-let res =
+ let res =
List.sort
- (fun (_,gl1) (_,gl2) ->
- Pervasives.compare (List.length gl1) (List.length gl2))
- uris'
- 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
+
+
;;
projects / helm.git / blobdiff