From: Lucca Hirschi <lucca.hirschi@gmail.com>
Date: Wed, 4 Jul 2012 12:48:49 +0000 (+0200)
Subject: Merge branch 'lucca-master' into HEAD
X-Git-Tag: Core~7
X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=commitdiff_plain;h=445457b2dc5ca11cb3d305c346fe7937f29ba2a9

Merge branch 'lucca-master' into HEAD

Conflicts:
	src/run.ml
---

445457b2dc5ca11cb3d305c346fe7937f29ba2a9
diff --cc src/run.ml
index de2ba81,8333689..444cce7
--- a/src/run.ml
+++ b/src/run.ml
@@@ -11,43 -11,20 +11,40 @@@
  (*                                                                     *)
  (***********************************************************************)
  
- INCLUDE "utils.ml"
 -
 -(* Il faut tout paramétrer par tr!!!! je ne sais pas comment faire >< **)
--
  module Node  =
  struct
 -  type t = Tree.node
 -  let tr = Tree.load_xml_string ""
 -  let compare n1 n2 = (Tree.preorder tr n2) - (Tree.preorder tr n1)
 +  type t = int
 +  let hash n = n
 +  let compare n1 n2 = n1 - n2
 +  let equal n1 n2 = n1 = n2
  end
    
 -module NodeMap = Map.Make (Node)
 -
 -type t = StateSet.t NodeMap.t
 -
 -let compute tree asta = NodeMap.empty
 -
 -let print fmt run = ()
 +module NodeHash = Hashtbl.Make (Node)
 +  
 +type t = (StateSet.t*StateSet.t) NodeHash.t
 +(** Map from node to query and recognizing states *)
 +    
 +let compute tree asta =
 +  let size_tree = 10000 in              (* todo *)
 +  let map = NodeHash.create size_tree in
 +  
 +  
 +  map
 +    
 +let print fmt run =
 +  let print_d_set fmt (s_1,s_2) = 
 +    Format.fprintf fmt "@[<hov 0>(%a,@ %a)@]"
 +      StateSet.print s_1 StateSet.print s_2 in
 +  let print_map fmt run = 
 +    let pp = Format.fprintf fmt in
 +    if NodeHash.length run = 0
 +    then Format.fprintf fmt "ø"
 +    else
 +      NodeHash.iter (fun cle set -> pp "|  %i-->%a@ " cle print_d_set set)
 +        run in
 +  let print_box fmt run =
 +    let pp = Format.fprintf fmt in
 +    pp "@[<v 0># Mapping: %a@ @]"
 +      print_map run
 +  in
 +  Format.fprintf fmt "@[<v 1>##### RUN #####@, %a@ @]@." print_box run
-