* http://cs.unibo.it/helm/.
*)
-(******************************************************************************)
-(* *)
-(* PROJECT HELM *)
-(* *)
-(* Claudio Sacerdoti Coen <sacerdot@cs.unibo.it> *)
-(* 18/02/2003 *)
-(* *)
-(* *)
-(******************************************************************************)
+(*****************************************************************************)
+(* *)
+(* PROJECT HELM *)
+(* *)
+(* Claudio Sacerdoti Coen <sacerdot@cs.unibo.it> *)
+(* 18/02/2003 *)
+(* *)
+(* *)
+(*****************************************************************************)
module MQI = MQueryInterpreter
module MQIC = MQIConn
[] -> []
|_ ->
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,_ ->
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) );
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 = Match_concl.cmatch conn ty in
+ (* List.iter
+ (fun (n,u) -> prerr_endline ((string_of_int n) ^ " " ^u)) uris; *)
+ (* delete all .var uris *)
+ let uris = List.filter UriManager.is_var uris in
+ (* delete all not "cic:/Coq" uris *)
+ (*
let uris =
(* TODO ristretto per ragioni di efficienza *)
- prerr_endline "STO FILTRANDO2";
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 (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))
+ | Some (_,Cic.Def (t,_)) -> (NewConstraints.StringSet.union set (NewConstraints.constants_concl t))
+ | _ -> set in
+ let hyp_const =
+ 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 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 =
- (* 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";
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
| (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
- uris'
+ prerr_endline ("Ne sono rimasti 3 " ^ string_of_int (List.length uris'));
+
+ uris'
;;
(*funzione che sceglie il penultimo livello di profondita' dei must*)
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 =
else l1 - l2)
subproofs
in
- (* now we may drop the prefix tag *)
- List.map snd res
-
-
+ (* now we may drop the prefix tag *)
+ (*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
;;
projects / helm.git / blobdiff