X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Ftactics%2Fparamodulation%2Futils.ml;h=86c9c1430105e0948c4ba3274284b9b9b03caded;hb=e78cf74f8976cf0ca554f64baa9979d0423ee927;hp=affd4897f5b7a351906554746b4debc93accb3c3;hpb=cc23f034c9419186602d9250456241f2eba90d7c;p=helm.git

diff --git a/helm/software/components/tactics/paramodulation/utils.ml b/helm/software/components/tactics/paramodulation/utils.ml
index affd4897f..86c9c1430 100644
--- a/helm/software/components/tactics/paramodulation/utils.ml
+++ b/helm/software/components/tactics/paramodulation/utils.ml
@@ -25,7 +25,7 @@
 
 (* $Id$ *)
 
-let time = true;;
+let time = false;;
 let debug = false;;
 let debug_metas = false;; 
 let debug_res = false;;
@@ -114,6 +114,8 @@ let rec remove_local_context =
     | 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 
 
 
@@ -506,12 +508,21 @@ let rec aux_ordering ?(recursion=true) t1 t2 =
   | 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
 
@@ -552,7 +563,7 @@ let nonrec_kbo_w (t1, w1) (t2, w2) =
 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)); 
   *)