X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2Fautomath%2FautOutput.ml;h=668de746284d75241dc97711b4c76b487a2c6cd0;hb=e22808c929a9cebf5e4e2b7428ff0cbf89e1f92a;hp=26a2d7b16976348eabbf25201a1cdc54c4d01961;hpb=13c3708fc59d999727ee214e8ece1f03661a9737;p=helm.git

diff --git a/helm/software/lambda-delta/automath/autOutput.ml b/helm/software/lambda-delta/automath/autOutput.ml
index 26a2d7b16..668de7462 100644
--- a/helm/software/lambda-delta/automath/autOutput.ml
+++ b/helm/software/lambda-delta/automath/autOutput.ml
@@ -10,8 +10,10 @@
       V_______________________________________________________________ *)
 
 module P = Printf
+module C = Cps
 module L = Log
 module A = Aut
+module R = AutProcess
 
 type counters = {
    sections: int;
@@ -23,56 +25,58 @@ type counters = {
    grefs:    int;
    appls:    int;
    absts:    int;
-   pars:     int
+   pars:     int;
+   xnodes:   int
 }
 
 let initial_counters = {
    sections = 0; contexts = 0; blocks = 0; decls = 0; defs = 0;
-   sorts = 0; grefs = 0; appls = 0; absts = 0; pars = 0
+   sorts = 0; grefs = 0; appls = 0; absts = 0; pars = 0; xnodes = 0
 }
 
 let rec count_term f c = function
    | A.Sort _         -> 
-      f {c with sorts = succ c.sorts}
+      f {c with sorts = succ c.sorts; xnodes = succ c.xnodes}
    | A.GRef (_, ts)   -> 
       let c = {c with grefs = succ c.grefs} in
       let c = {c with pars = c.pars + List.length ts} in
-      Cps.list_fold_left f count_term c ts
+      let c = {c with xnodes = succ c.xnodes + List.length ts} in
+      C.list_fold_left f count_term c ts
    | A.Appl (v, t)    -> 
-      let c = {c with appls = succ c.appls} in
+      let c = {c with appls = succ c.appls; xnodes = succ c.xnodes} in
       let f c = count_term f c t in
       count_term f c v
    | A.Abst (_, w, t) -> 
-      let c = {c with absts = succ c.absts} in
+      let c = {c with absts = succ c.absts; xnodes = succ c.xnodes} in
       let f c = count_term f c t in
       count_term f c w
 
-let count_item f c = function
+let count_entity f c = function
    | A.Section _        ->
       f {c with sections = succ c.sections}
    | A.Context _        ->
       f {c with contexts = succ c.contexts}
    | A.Block (_, w)     -> 
-      let c = {c with blocks = succ c.blocks} in
+      let c = {c with blocks = succ c.blocks; xnodes = succ c.xnodes} in
       count_term f c w
    | A.Decl (_, w)      -> 
-      let c = {c with decls = succ c.decls} in
+      let c = {c with decls = succ c.decls; xnodes = succ c.xnodes} in
       count_term f c w
    | A.Def (_, w, _, t) -> 
-      let c = {c with defs = succ c.defs} in
+      let c = {c with defs = succ c.defs; xnodes = succ c.xnodes} in
       let f c = count_term f c t in
       count_term f c w
 
 let print_counters f c =
    let terms = c.sorts + c.grefs + c.appls + c.absts in
-   let items = c.sections + c.contexts + c.blocks + c.decls + c.defs in
+   let entities = c.sections + c.contexts + c.blocks + c.decls + c.defs in
    L.warn (P.sprintf "  Automath representation summary");
-   L.warn (P.sprintf "    Total book items:         %7u" items);
-   L.warn (P.sprintf "      Section items:          %7u" c.sections);
-   L.warn (P.sprintf "      Context items:          %7u" c.contexts);
-   L.warn (P.sprintf "      Block items:            %7u" c.blocks);
-   L.warn (P.sprintf "      Declaration items:      %7u" c.decls);
-   L.warn (P.sprintf "      Definition items:       %7u" c.defs);
+   L.warn (P.sprintf "    Total book entities:      %7u" entities);
+   L.warn (P.sprintf "      Section entities:       %7u" c.sections);
+   L.warn (P.sprintf "      Context entities:       %7u" c.contexts);
+   L.warn (P.sprintf "      Block entities:         %7u" c.blocks);
+   L.warn (P.sprintf "      Declaration entities:   %7u" c.decls);
+   L.warn (P.sprintf "      Definition entities:    %7u" c.defs);
    L.warn (P.sprintf "    Total Parameter items:    %7u" c.pars);
    L.warn (P.sprintf "      Application items:      %7u" c.pars);
    L.warn (P.sprintf "    Total term items:         %7u" terms);
@@ -80,4 +84,17 @@ let print_counters f c =
    L.warn (P.sprintf "      Reference items:        %7u" c.grefs);
    L.warn (P.sprintf "      Application items:      %7u" c.appls);
    L.warn (P.sprintf "      Abstraction items:      %7u" c.absts);
+   L.warn (P.sprintf "    Global Int. Complexity:   unknown");
+   L.warn (P.sprintf "      + Abbreviation nodes:   %7u" c.xnodes);
    f ()
+
+let print_process_counters f c =
+   let f iao iar iac iag =
+      L.warn (P.sprintf "  Automath process summary");
+      L.warn (P.sprintf "    Implicit after opening:   %7u" iao);
+      L.warn (P.sprintf "    Implicit after reopening: %7u" iar);
+      L.warn (P.sprintf "    Implicit after closing:   %7u" iac);
+      L.warn (P.sprintf "    Implicit after global:    %7u" iag);
+      f ()
+   in
+   R.get_counters f c