start using the replay

Author: Ioana

_tags

@@ -1,2 +1,2 @@
-true:   package(yojson), package(z3)
+true:   package(yojson), package(z3), package(KappaLib)
 true:   debug, bin_annot

ast.ml

@@ -1,42 +1,24 @@
 let linears s =
   LinearPoset.linearisations(s)
 
-let concretise (s:LinearPoset.t) (rs:Rule.t list) =
-  let () = if (!Parameter.debug_mode) then
+let concretise (s:LinearPoset.t) =
+  let () = if (!Param.debug_mode) then
              (Format.printf "concretise linear poset :";
               List.iter (fun i -> Format.printf "%d " i) s.LinearPoset.seq) in
   let (trace,_) =
     List.fold_left
       (fun (trace,rf) eid ->
         let event = Poset.get_event_by_id eid s.LinearPoset.pos in
-        let rname = Event.get_label event in
-        let rule = Rule.get_rule_by_label rname rs in
-        let m = Transition.get_rhs (Trace.get_first_transition trace) in
+        let step = Event.get_step event in
+        let m = Transition.get_rhs (TraceConcret.get_first_transition trace) in
         let (trans,new_nodes,new_ports) =
-          Transition.make m rule (Event.get_quarks event)
-                          trace.Trace.node_names trace.Trace.port_names in
-        ((Trace.add_transition trace trans new_nodes new_ports),
+          Transition.make m step
+                          trace.TraceConcret.node_names
+                          trace.TraceConcret.port_names in
+        ((TraceConcret.add_transition trace trans new_nodes new_ports),
          ((eid,trans)::rf)))
-      (Trace.empty,[]) s.LinearPoset.seq in
+      (TraceConcret.empty,[]) s.LinearPoset.seq in
   trace
 
-(*let test_concret (s:LinearPoset.t) (rs:Rule.t list) =
-  let () = if (!Parameter.debug_mode) then
-             (Format.printf "concretise linear poset :";
-              List.iter (fun i -> Format.printf "%d " i) s.LinearPoset.seq) in
-  let event = Poset.get_event_by_id 4 s.LinearPoset.pos in
-  let rname = Event.get_label event in
-  let rule = Rule.get_rule_by_label rname rs in
-
-  let () = if (!Parameter.debug_mode) then
-             (Format.printf "info on first event ";
-              Event.print_event event;
-              Rule.print rule) in
-
-  let (trans,_,_) = Transition.make [] rule (Event.get_quarks event) [] [] in
-  let () = if (!Parameter.debug_mode) then
-              Transition.print trans in
-  Trace.empty
- *)
 
-let concret (s:Poset.t) (rs:Rule.t list) = concretise (linears s) rs
+let concret (s:Poset.t) = concretise (linears s)

ast.mli

@@ -1,2 +1,2 @@
 
-val concret : Poset.t -> Rule.t list -> Trace.t
+val concret : Poset.t -> TraceConcret.t

concret.ml

@@ -22,12 +22,8 @@ let get_poset_from_filename s dlist =
 
 let print_posets t =
   List.iteri
-    (fun i p -> Format.printf "\n poset nb %d\n" i; Poset.print_poset p)
-    t.poset_list;
-  Format.printf "events: \n";
-  List.iteri
-    (fun i e -> Format.printf "event nb %d \n" i; Event.print_event e)
-    t.event_list
+    (fun i p -> Format.printf "\nposet nb %d\n" i; Poset.print_poset p)
+    t.poset_list
 
 let print_domain = function
   | Pos p -> (match p.Poset.filename with
@@ -39,20 +35,18 @@ let print_domain_list l =
   List.iter (fun d -> print_domain d) l;
   Format.printf"\n"
 
-
 let add_posets p current_posets =
   { poset_list = p::current_posets.poset_list;
     event_list = p.Poset.events@current_posets.event_list; }
 
-let set_posets file_list =
+let set_posets file_list sigs =
   let posets : t = { poset_list = []; event_list = []; } in
   let posets_file =
     List.fold_left
       (fun t file ->
-        let s = Poset.read_poset_from_file file in
+        let s = Poset.read_poset_from_file file sigs in
         add_posets s t) posets file_list in
-  (*let posets' = add_posets (Poset.test_poset) posets_file in*)
-  let () = if (!Parameter.debug_mode)
-           then (Format.printf "set_posets: \n";
+  let () = if (!Param.debug_mode)
+           then (Format.printf "\nset_posets";
                  print_posets posets_file) in
   posets_file

concret.mli

@@ -15,6 +15,6 @@ val print_posets: t -> unit
 val print_domain : domain -> unit
 val print_domain_list : domain list -> unit
 
-val set_posets : string list -> t
+val set_posets : string list -> Model.t -> t
 
 val get_poset_from_filename : string -> domain list -> domain