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

diff --git a/helm/software/components/acic_procedural/proceduralClassify.ml b/helm/software/components/acic_procedural/proceduralClassify.ml
index 6fd8a5e60..6da59eed1 100644
--- a/helm/software/components/acic_procedural/proceduralClassify.ml
+++ b/helm/software/components/acic_procedural/proceduralClassify.ml
@@ -23,24 +23,31 @@
  * http://cs.unibo.it/helm/.
  *)
 
-module C = Cic
-module R = CicReduction
-module D = Deannotate
-module I = CicInspect
+module UM  = UriManager
+module C   = Cic
+module D   = Deannotate
+module I   = CicInspect
+module PEH = ProofEngineHelpers
 
-type conclusion = (int * int) option
+module H   = ProceduralHelpers
+
+type dependences = (I.S.t * bool) list
+
+type conclusion = (int * int * UM.uri * int) option
 
 (* debugging ****************************************************************)
 
-let string_of_entry inverse =
-   if I.S.mem 0 inverse then "C" 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) =
@@ -50,37 +57,50 @@ let out_table b =
    in
    Array.iteri map b;
    prerr_newline ()
-   
-(****************************************************************************)
 
-let id x = x
+(* dummy dependences ********************************************************)
 
-let split c t =
-   let add s v c = Some (s, C.Decl v) :: c in
-   let rec aux whd a n c = function
-      | C.Prod (s, v, t)  -> aux false (v :: a) (succ n) (add s v c) t
-      | v when whd        -> v :: a, n
-      | v                 -> aux true a n c (R.whd ~delta:true c v)
-    in
-    aux false [] 0 c t
+let make l =
+   let map _ = I.S.empty, false in
+   List.rev_map map l
 
-let classify_conclusion = function
-   | C.Rel i                -> Some (i, 0)
-   | C.Appl (C.Rel i :: tl) -> Some (i, List.length tl)
-   | _                      -> None
+(* classification ***********************************************************)
 
+let classify_conclusion vs = 
+   let rec get_argsno = function
+      | c, C.Appl (t :: vs) -> 
+         let hd, argsno = get_argsno (c, t) in 
+         hd, argsno + List.length vs
+      | _, t                -> t, 0
+   in
+   let inside i = i > 1 && i <= List.length vs in
+   match vs with
+      | v0 :: v1 :: _ ->
+         let hd0, a0 = get_argsno v0 in
+	 let hd1, a1 = get_argsno v1 in
+	 begin match hd0, hd1 with
+	    | C.Rel i, C.MutInd (u, n, _) when inside i -> Some (i, a0, u, n)
+	    | _                                         -> None
+	 end
+      | _             -> None
+ 
 let classify c t =
 try   
-   let vs, h = split c t in
-   let rc = classify_conclusion (List.hd vs) in
-   let map (b, h) v = (I.get_rels_from_premise h v, I.S.empty) :: b, succ h in
+   let vs, h = PEH.split_with_whd (c, t) in
+   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, 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
    let mk_closure b h =
-      let map j = if j < h then I.S.union (fst b.(j)) else id in 
+      let map j = if j < h then I.S.union (H.fst3 b.(j)) else H.identity in 
       for i = pred h downto 0 do
-         let direct, unused = b.(i) in
-	 b.(i) <- I.S.fold map direct direct, unused 
+         let direct, unused, fa = b.(i) in
+	 b.(i) <- I.S.fold map direct direct, unused, fa 
       done; b
    in
    let b = mk_closure b h in
@@ -88,13 +108,32 @@ try
       if I.S.is_empty direct then () else
       let j = I.S.choose direct in
       if j < h then
-         let unused, inverse = b.(j) in 
-         b.(j) <- unused, I.S.add i inverse
+         let unused, inverse, fa = b.(j) in 
+         b.(j) <- unused, I.S.add i inverse, fa
        else ();
        mk_inverse i (I.S.remove j direct)
    in
-   let map i (direct, _) = mk_inverse i direct in
+   let map i (direct, _, _) = mk_inverse i direct in
    Array.iteri map b;
 (*   out_table b; *)
-   List.rev_map snd (List.tl (Array.to_list b)), rc
+   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