Print detailed statisticts of the run.

diff --git a/src/run.ml b/src/run.ml
index ca162a1..8a9bf9e 100644 (file)
--- a/src/run.ml
+++ b/src/run.ml
@@ -17,6 +17,25 @@ INCLUDE "utils.ml"
 open Format
 open Misc
 
+type stats = { run : int;
+               tree_size : int;
+               cache2_access : int;
+               cache2_hit : int;
+               cache5_access : int;
+               cache5_hit : int;
+             }
+
+let cache2_hit = ref 0
+let cache2_access = ref 0
+let cache5_hit = ref 0
+let cache5_access = ref 0
+let reset_stat_counters () =
+  cache2_hit := 0;
+  cache2_access := 0;
+  cache5_hit := 0;
+  cache5_access := 0
+
+
 module Make (T : Tree.S) =
  struct
 
@@ -152,7 +171,7 @@ END
 
    let html tree node i config msg =
      let config = config.NodeStatus.node in
-     Html.trace ~msg:msg 
+     Html.trace ~msg:msg
        (T.preorder tree node) i
        config.todo
        config.sat
@@ -171,6 +190,7 @@ END
 
    let get_form cache2 auto tag q =
      let phi =
+       incr cache2_access;
        Cache.N2.find cache2 (tag.QName.id :> int) (q :> int)
      in
      if phi == dummy_form then
@@ -181,7 +201,10 @@ END
            (tag.QName.id :> int)
            (q :> int) phi
        in phi
-     else phi
+     else begin
+       incr cache2_hit;
+       phi
+     end
 
    type trivalent = False | True | Unknown
    let of_bool = function false -> False | true -> True
@@ -199,14 +222,12 @@ END
 
  (* Define as macros to get lazyness *)
 DEFINE OR_(t1,t2) =
-     let __t1 = (t1) in
      match t1 with
        False -> (t2)
      | True -> True
      | Unknown -> if (t2) == True then True else Unknown
 
 DEFINE AND_(t1,t2) =
-     let __t1 = (t1) in
      match t1 with
        False -> False
      | True -> (t2)
@@ -283,7 +304,8 @@ DEFINE AND_(t1,t2) =
      let ssid = (ss.NodeStatus.id :> int) in
      let tagid = (tag.QName.id :> int) in
      let res = Cache.N5.find cache5 tagid ssid fcsid nssid psid in
-     if res != dummy_status then res
+     incr cache5_access;
+     if res != dummy_status then begin incr cache5_hit; res end
      else let new_status = loop ss in
           Cache.N5.add cache5 tagid ssid fcsid nssid psid new_status;
           new_status
@@ -461,14 +483,17 @@ DEFINE AND_(t1,t2) =
       let node_id = T.preorder tree node in
       status.(node_id) <- status0) list
 
-
+  let tree_size = ref 0
+  let pass = ref 0
   let compute_run auto tree nodes =
+    pass := 0;
+    tree_size := T.size tree;
     let run = make auto tree in
     prepare_run run nodes;
     while run.redo do
       top_down run
     done;
-
+    pass := run.pass;
     IFTRACE(Html.gen_trace auto (module T : Tree.S with type t = T.t) tree);
 
     run
@@ -481,4 +506,13 @@ DEFINE AND_(t1,t2) =
     let r = compute_run auto tree nodes in
     get_results r
 
+  let stats () = { 
+    tree_size = !tree_size;
+    run = !pass;
+    cache2_access = !cache2_access;
+    cache2_hit = !cache2_hit;
+    cache5_access = !cache5_access;
+    cache5_hit = !cache5_hit;
+  }
+
 end

diff --git a/src/run.mli b/src/run.mli
index 1efe4a7..579dd8a 100644 (file)
--- a/src/run.mli
+++ b/src/run.mli
@@ -12,9 +12,16 @@
 (*  ../LICENSE.                                                        *)
 (*                                                                     *)
 (***********************************************************************)
-
+type stats = { run : int;
+               tree_size : int;
+               cache2_access : int;
+               cache2_hit : int;
+               cache5_access : int;
+               cache5_hit : int;
+             }
 module Make (T : Tree.S) :
   sig
     val eval : Ata.t -> T.t -> T.node list -> T.node list
     val full_eval : Ata.t -> T.t -> T.node list -> (State.t * T.node list) list
+    val stats : unit -> stats
   end

diff --git a/src/tatoo.ml b/src/tatoo.ml
index d8c3e09..ca16227 100644 (file)
--- a/src/tatoo.ml
+++ b/src/tatoo.ml
@@ -120,6 +120,12 @@ let main () =
     in
     time f () ("evaluating query in " ^ msg ^ " mode")
   in
+  let s = Naive.stats () in
+  Run.(
+  Logger.msg `STATS "@[tree size: %d@\ntraversals: %d@\ncache2 hit ratio: %f@\ncache5 hit ratio: %f@]"
+    s.tree_size s.run
+    (float s.cache2_hit /. float s.cache2_access)
+    (float s.cache5_hit /. float s.cache5_access));
   time (fun () ->
     let count = ref 1 in
     List.iter (fun results ->