X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Facic_procedural%2FproceduralClassify.ml;h=6da59eed1cf643ba4d68f4039b2b0d89dfb42642;hb=dcdbb979433a61e2ef2842d96604098728824416;hp=4f9f99fcee76117056a100bd8f1a13dfb9fcfd24;hpb=c465c17581bf606e0330cbd89b238279c184ad35;p=helm.git

diff --git a/helm/software/components/acic_procedural/proceduralClassify.ml b/helm/software/components/acic_procedural/proceduralClassify.ml
index 4f9f99fce..6da59eed1 100644
--- a/helm/software/components/acic_procedural/proceduralClassify.ml
+++ b/helm/software/components/acic_procedural/proceduralClassify.ml
@@ -23,6 +23,7 @@
  * http://cs.unibo.it/helm/.
  *)
 
+module UM  = UriManager
 module C   = Cic
 module D   = Deannotate
 module I   = CicInspect
@@ -30,21 +31,23 @@ module PEH = ProofEngineHelpers
 
 module H   = ProceduralHelpers
 
-type dependence = I.S.t * bool
+type dependences = (I.S.t * bool) list
 
-type conclusion = (int * int) option
+type conclusion = (int * int * UM.uri * int) option
 
 (* debugging ****************************************************************)
 
-let string_of_entry (inverse, b) =
-   if I.S.mem 0 inverse then begin if b then "CF" else "C" end else
+let string_of_entry synth (inverse, b) =
+   if I.overlaps synth inverse then begin if b then "CF" else "C" end else
    if I.S.is_empty inverse then "I" else "P"
 
-let to_string (classes, rc) =
-   let linearize = String.concat " " (List.map string_of_entry classes) in
+let to_string synth (classes, rc) =
+   let linearize = 
+      String.concat " " (List.map (string_of_entry synth) classes)
+   in
    match rc with
-      | None        -> linearize
-      | Some (i, j) -> Printf.sprintf "%s %u %u" linearize i j
+      | None              -> linearize
+      | Some (i, j, _, _) -> Printf.sprintf "%s %u %u" linearize i j
 
 let out_table b =
    let map i (_, inverse) =
@@ -55,6 +58,12 @@ let out_table b =
    Array.iteri map b;
    prerr_newline ()
 
+(* dummy dependences ********************************************************)
+
+let make l =
+   let map _ = I.S.empty, false in
+   List.rev_map map l
+
 (* classification ***********************************************************)
 
 let classify_conclusion vs = 
@@ -67,11 +76,11 @@ let classify_conclusion vs =
    let inside i = i > 1 && i <= List.length vs in
    match vs with
       | v0 :: v1 :: _ ->
-         let hd0, argsno0 = get_argsno v0 in
-	 let hd1, argsno1 = get_argsno v1 in
+         let hd0, a0 = get_argsno v0 in
+	 let hd1, a1 = get_argsno v1 in
 	 begin match hd0, hd1 with
-	    | C.Rel i, C.MutInd _ when inside i -> Some (i, argsno0)
-	    | _                                 -> None
+	    | C.Rel i, C.MutInd (u, n, _) when inside i -> Some (i, a0, u, n)
+	    | _                                         -> None
 	 end
       | _             -> None
  
@@ -81,8 +90,9 @@ try
    let rc = classify_conclusion vs in
    let map (b, h) (c, v) = 
       let _, argsno = PEH.split_with_whd (c, v) in
+      let isf = argsno > 0 (* || H.is_sort v *) in
       let iu = H.is_unsafe h (List.hd vs) in
-      (I.get_rels_from_premise h v, I.S.empty, argsno > 0 && iu) :: b, succ h
+      (I.get_rels_from_premise h v, I.S.empty, isf && iu) :: b, succ h
    in
    let l, h = List.fold_left map ([], 0) vs in
    let b = Array.of_list (List.rev l) in
@@ -109,3 +119,21 @@ try
    let extract (x, y, z) = y, z in
    List.rev_map extract (List.tl (Array.to_list b)), rc
 with Invalid_argument _ -> failwith "Classify.classify"
+
+(* adjusting the inferrable arguments that do not occur in the goal *********)
+
+let adjust c vs ?goal classes = 
+   let list_xmap2 map l1 l2 = 
+      let rec aux a = function
+         | hd1 :: tl1, hd2 :: tl2 -> aux (map hd1 hd2 :: a) (tl1,tl2)
+	 | _, l2                  -> List.rev_append l2 a
+      in
+      List.rev (aux [] (l1, l2))
+   in
+   let map where what (i, b) = 
+      let what = H.cic what in
+      (i, b || not (H.occurs c ~what ~where))
+   in
+   match goal with
+      | None      -> classes
+      | Some goal -> list_xmap2 (map goal) vs classes