(* $Id$ *)
-let time = true;;
+let time = false;;
let debug = false;;
let debug_metas = false;;
let debug_res = false;;
| C.Meta _ as t -> TermSet.singleton t
| C.Appl l ->
List.fold_left (fun res t -> TermSet.union res (aux t)) TermSet.empty l
+ | C.Lambda(n,s,t) ->
+ TermSet.union (aux s) (aux t)
+ | C.Prod(n,s,t) ->
+ TermSet.union (aux s) (aux t)
+ | C.LetIn(n,s,ty,t) ->
+ TermSet.union (aux s) (TermSet.union (aux ty) (aux t))
| t -> TermSet.empty (* TODO: maybe add other cases? *)
in
aux term
;;
+let rec remove_local_context =
+ function
+ | Cic.Meta (i,_) -> Cic.Meta (i,[])
+ | Cic.Appl l ->
+ Cic.Appl(List.map remove_local_context l)
+ | Cic.Prod (n,s,t) ->
+ Cic.Prod (n,remove_local_context s, remove_local_context t)
+ | t -> t
+
(************************* rpo ********************************)
let number = [
| C.Cast (t1, t2)
| C.Lambda (_, t1, t2)
| C.Prod (_, t1, t2)
- | C.LetIn (_, t1, t2) ->
+ | C.LetIn (_, t1, _, t2) ->
let w1 = aux t1 in
let w2 = aux t2 in
w1 + w2 + 1
module IntSet = Set.Make(OrderedInt)
+let goal_symbols = ref TermSet.empty
+
+let set_of_map m =
+ TermMap.fold (fun k _ s -> TermSet.add k s) m TermSet.empty
+;;
+
+let set_goal_symbols term =
+ let m = symbols_of_term term in
+ goal_symbols := (set_of_map m)
+;;
+
+let symbols_of_eq (ty,left,right,_) =
+ let sty = set_of_map (symbols_of_term ty) in
+ let sl = set_of_map (symbols_of_term left) in
+ let sr = set_of_map (symbols_of_term right) in
+ TermSet.union sty (TermSet.union sl sr)
+;;
+
+let distance sgoal seq =
+ let s = TermSet.diff seq sgoal in
+ TermSet.cardinal s
+;;
+
let compute_equality_weight (ty,left,right,o) =
let factor = 2 in
match o with
w1 + w2 + (factor * (List.length m1)) + (factor * (List.length m2))
;;
+let compute_equality_weight e =
+ let w = compute_equality_weight e in
+ let d = 0 in (* distance !goal_symbols (symbols_of_eq e) in *)
+(*
+ prerr_endline (Printf.sprintf "dist %s --- %s === %d"
+ (String.concat ", " (List.map (CicPp.ppterm) (TermSet.elements
+ !goal_symbols)))
+ (String.concat ", " (List.map (CicPp.ppterm) (TermSet.elements
+ (symbols_of_eq e))))
+ d
+ );
+*)
+ w + d
+;;
+
(* old
let compute_equality_weight (ty,left,right,o) =
let metasw = ref 0 in
| C.Const _, _ -> Lt
| _, C.Const _ -> Gt
- | C.MutInd (u1, _, _), C.MutInd (u2, _, _) -> compare_uris u1 u2
+ | C.MutInd (u1, tno1, _), C.MutInd (u2, tno2, _) ->
+ let res = compare_uris u1 u2 in
+ if res <> Eq then res
+ else
+ let res = compare tno1 tno2 in
+ if res = 0 then Eq else if res < 0 then Lt else Gt
| C.MutInd _, _ -> Lt
| _, C.MutInd _ -> Gt
- | C.MutConstruct (u1, _, _, _), C.MutConstruct (u2, _, _, _) ->
- compare_uris u1 u2
+ | C.MutConstruct (u1, tno1, cno1, _), C.MutConstruct (u2, tno2, cno2, _) ->
+ let res = compare_uris u1 u2 in
+ if res <> Eq then res
+ else
+ let res = compare (tno1,cno1) (tno2,cno2) in
+ if res = 0 then Eq else if res < 0 then Lt else Gt
| C.MutConstruct _, _ -> Lt
| _, C.MutConstruct _ -> Gt
let nonrec_kbo t1 t2 =
let w1 = weight_of_term t1 in
let w2 = weight_of_term t2 in
- (*
+ (*
prerr_endline ("weight1 :"^(string_of_weight w1));
prerr_endline ("weight2 :"^(string_of_weight w2));
*)
if t = t' then t else
begin
let simpl_order = !compare_terms t t' in
- if debug then
- prerr_endline ("comparing "^(CicPp.ppterm t)^(CicPp.ppterm t'));
+ debug_print (lazy ("comparing "^(CicPp.ppterm t)^(CicPp.ppterm t')));
if simpl_order = Gt then (if debug then prerr_endline "GT";t')
else (if debug then prerr_endline "NO_GT";t)
end
;;
-type equality_sign = Negative | Positive;;
-
-let string_of_sign = function
- | Negative -> "Negative"
- | Positive -> "Positive"
-;;
-
-
type pos = Left | Right
let string_of_pos = function
| Right -> "Right"
;;
-let eq_URI () =
- match LibraryObjects.eq_URI () with
- None -> assert false
- | Some uri -> uri
-
-let eq_ind_URI () = LibraryObjects.eq_ind_URI ~eq:(eq_URI ())
-let eq_ind_r_URI () = LibraryObjects.eq_ind_r_URI ~eq:(eq_URI ())
-let sym_eq_URI () = LibraryObjects.sym_eq_URI ~eq:(eq_URI ())
-let eq_XURI () =
- let s = UriManager.string_of_uri (eq_URI ()) in
- UriManager.uri_of_string (s ^ "#xpointer(1/1/1)")
-let trans_eq_URI () = LibraryObjects.trans_eq_URI ~eq:(eq_URI ())
-
let metas_of_term t =
List.map fst (CicUtil.metas_of_term t)
;;