X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_paramodulation%2FfoUnif.ml;h=cb3045c1918e9b0c9682e68c939440eb061d5c10;hb=eeffdf0672400325577c1df83e10ad700b223262;hp=3a5c241f515394273795a6fdc62d83b6b3200fa8;hpb=2f77bd6071bd316ed0a91448f4c04e638f853442;p=helm.git diff --git a/helm/software/components/ng_paramodulation/foUnif.ml b/helm/software/components/ng_paramodulation/foUnif.ml index 3a5c241f5..cb3045c19 100644 --- a/helm/software/components/ng_paramodulation/foUnif.ml +++ b/helm/software/components/ng_paramodulation/foUnif.ml @@ -25,11 +25,11 @@ let mem2 a b l = aux false false l ;; -module Founif (B : Terms.Blob) = struct - module Subst = FoSubst (*.Subst(B)*) +module Founif (B : Orderings.Blob) = struct + module Subst = FoSubst module U = FoUtils.Utils(B) - let unification vars locked_vars t1 t2 = + let unification (* vars *) locked_vars t1 t2 = let rec occurs_check subst what where = match where with | Terms.Var i when i = what -> true @@ -78,31 +78,30 @@ module Founif (B : Terms.Blob) = struct raise (UnificationFailure (lazy "Inference.unification.unif")) in let subst = unif Subst.id_subst t1 t2 in - let vars = Subst.filter subst vars in - subst, vars + subst ;; let alpha_eq s t = let rec equiv subst s t = let s = match s with Terms.Var i -> Subst.lookup i subst | _ -> s and t = match t with Terms.Var i -> Subst.lookup i subst | _ -> t - + in match s, t with - | s, t when U.eq_foterm s t -> subst - | Terms.Var i, Terms.Var j - when (not (List.exists (fun (_,k) -> k=t) subst)) -> + | s, t when U.eq_foterm s t -> subst + | Terms.Var i, Terms.Var j + when (not (List.exists (fun (_,k) -> k=t) subst)) -> let subst = Subst.build_subst i t subst in subst - | Terms.Node l1, Terms.Node l2 -> ( + | Terms.Node l1, Terms.Node l2 -> ( try List.fold_left2 - (fun subst' s t -> equiv subst' s t) - subst l1 l2 + (fun subst' s t -> equiv subst' s t) + subst l1 l2 with Invalid_argument _ -> raise (UnificationFailure (lazy "Inference.unification.unif")) ) - | _, _ -> + | _, _ -> raise (UnificationFailure (lazy "Inference.unification.unif")) in equiv Subst.id_subst s t