Generate the .cov file even if the run is stopped by a ctrl-c.

examples/lutin/crazy-rabbit/moving-obstacle.lut

-include "ud.lut"
+include "../crazy-rabbit/ud.lut"
 
 --------------------------------------------------------------------------------
 --

examples/lutin/crazy-rabbit/rabbit.lut

-include "ud.lut"
-include "moving-obstacle.lut"
+include "../crazy-rabbit/ud.lut"
+include "../crazy-rabbit/moving-obstacle.lut"
 
 node rabbit_speed (low, high:real) returns (Speed: real) =
    exist Delta, SpeedLow, SpeedHigh: real in

examples/lutin/ivrogne/Makefile

+export OCAMLOPT=ocamlopt
+LTOP=../../../bin/lurettetop$(EXE)
+LIB=../../../lib
+
+MAIN=rabbit
+
+NEW_LURETTETOP=$(LTOP)  \
+	  --test-length 5000  --step-mode Inside --local-var  --no-sim2chro   \
+	  --do-not-show-step 
+
+
+
+%.cmxs: %.ml
+	 ocamlopt -shared -o $*.cmxs  -I $(LIB) graphics.cmxa ocamlRM.cmx rif_base.cmx $*.ml 
+
+
+clean:
+	rm -rf *.ec *.cm* *.log *~ .*~ *.o *rif0 *rif Data *.pp_luc *.plot *.gp $(MAIN).opt
+
+
+test: trace_ivrogne.cmxs
+	rm -f test.rif0 .lurette_rc
+	$(NEW_LURETTETOP) -go -v 1 --output test.rif0  -seed 3306566  \
+	  -rp "sut:ocaml:trace_ivrogne.cmxs:" \
+	  -rp 'env:lutin:ivrogne.lut:-main:ivrogne2:-L:libm.so:-loc' && \
+	grep -v "lurette chronogram" test.rif0  | \
+	grep -v "lurette Version"   | \
+	grep -v "The execution lasted"| sed -e "s/^M//" > test.rif  &&\
+	rm -f test.res && diff -u -i  test.rif.exp test.rif > test.res
+	[ ! -s test.res ] && make clean 
+
+
+utest:
+	cp $(MAIN).out $(MAIN).out.exp
+

examples/lutin/ivrogne/trace_ivrogne.ml

+
+
+(**************************************************************************)
+(* Utilities *)
+
+let draw x y =
+(*   if Sys.argv.(3) = "dot" then *)
+(*     Graphics.plot (truncate x) (truncate y) *)
+(*   else *)
+    Graphics.lineto (truncate x) (truncate y)
+
+let zoom = 5.0
+
+open Data
+let get_float var sol =  
+  match (try List.assoc var sol with Not_found -> assert false) 
+  with (F f) -> f | _ -> 
+    Printf.printf "*** error when parsing float\n";
+    flush stdout;
+    assert false
+ 
+let get_bool var sol =  
+  match (try List.assoc var sol with Not_found -> assert false) 
+  with (B b) -> b | _ -> 
+    Printf.printf "*** error when parsing bool\n";
+    flush stdout;
+    assert false
+
+
+(**************************************************************************)
+let _ = 
+  Graphics.open_graph " ";  Graphics.clear_graph ();  
+  Graphics.set_window_title "Le trajet de l'ivrogne";  
+  Graphics.moveto 100 100
+(*   ignore (Graphics.read_key ()) *)
+;;
+
+(**************************************************************************)
+
+let init  _ = ()
+let kill  _ = ()
+
+type var_type = string
+
+let (inputs :(string * string) list) = [
+  "x", "real";  
+  "y", "real";  
+  "p1", "real";  
+  "p2", "real";  
+  "p3", "real";  
+  "p4", "real"
+]
+
+let mems_i = []
+
+let mems_o = [
+  "x_min", Data.F 0.0;  "x_max", Data.F 100.0;  
+  "y_min", Data.F 0.0;  "y_max", Data.F 100.0
+]
+  
+let (outputs :(string * string) list) = 
+  [
+    "x_min", "real";  "x_max", "real";  
+    "y_min", "real";  "y_max", "real"
+  ]
+
+let cross_product(ux,uy,vx,vy)  = (ux*.vy-.uy*.vx);;
+
+
+let image = ref (Graphics.get_image 0 0 (Graphics.size_x ()) (Graphics.size_y ()))
+
+
+let cross_product(ux,uy,vx,vy) = (ux*.vy-.uy*.vx)
+let is_inside(px,py,p1x,p1y,p2x,p2y,p3x,p3y,p4x,p4y) = 
+  let p1p_x = px-.p1x in
+  let p1p_y = py-.p1y in
+  let p2p_x = px-.p2x in
+  let p2p_y = py-.p2y in
+  let p3p_x = px-.p3x in
+  let p3p_y = py-.p3y in
+  let p4p_x = px-.p4x in
+  let p4p_y = py-.p4y in
+  let p2p1_x = p1x-.p2x in
+  let p2p1_y = p1y-.p2y in
+  let p1p4_x = p4x-.p1x in
+  let p1p4_y = p4y-.p1y in
+  let p4p3_x = p3x-.p4x in
+  let p4p3_y = p3y-.p4y in
+  let p3p2_x = p2x-.p3x in
+  let p3p2_y = p2y-.p3y in
+    cross_product(p2p1_x, p2p1_y, p2p_x, p2p_y) < 0.0 &&
+    cross_product(p1p4_x, p1p4_y, p1p_x, p1p_y) < 0.0 &&
+    cross_product(p4p3_x, p4p3_y, p4p_x, p4p_y) < 0.0 &&
+    cross_product(p3p2_x, p3p2_y, p3p_x, p3p_y) < 0.0   
+        
+let (step :  Data.subst list -> Data.subst list)=
+  fun drunk_outs -> 
+    let x_min = (F (float_of_int 0))
+    and x_max = (F (float_of_int (Graphics.size_x ())))
+    and y_min = (F (float_of_int 0))
+    and y_max = (F (float_of_int (Graphics.size_y ()))) in
+    let bounds = [("x_min", x_min);("x_max",x_max);("y_min",y_min);("y_max",y_max)] in 
+
+
+    (* Drawing the new point onto the Graphics window *)
+    let x = get_float "x" drunk_outs
+    and y = get_float "y" drunk_outs
+    and p1 = get_float "p1" drunk_outs
+    and p2 = get_float "p2" drunk_outs
+    and p3 = get_float "p3" drunk_outs
+    and p4 = get_float "p4" drunk_outs
+    in
+
+    let p1 = truncate p1
+    and p2 = truncate p2
+    and p3 = truncate p3
+    and p4 = truncate p4
+    in
+    let max_x, max_y =  (Graphics.size_x ()),  (Graphics.size_y ()) in
+    let pc p maxi = p * maxi / 100 in
+    let point_list = [(pc p1 max_x, max_y);(max_x,pc p2 max_y);
+                      (pc p3 max_x, 0);(0, pc p4 max_y)] in 
+    let poly = Array.of_list point_list in
+
+      Graphics.draw_image !image 0 0;
+	   draw x y; 
+      image := Graphics.get_image 0 0 max_x max_y;
+      Graphics.set_color (Graphics.rgb 0 0 0);
+      Graphics.draw_poly poly;
+      bounds
+
+let _ = 
+  OcamlRM.add_inputs "trace_ivrogne.cmxs" inputs;
+  OcamlRM.add_outputs "trace_ivrogne.cmxs" outputs;
+  OcamlRM.add_kill "trace_ivrogne.cmxs" kill;
+  OcamlRM.add_step "trace_ivrogne.cmxs" step;
+  OcamlRM.add_mems "trace_ivrogne.cmxs" mems_i mems_o
+
+

source/common/coverage.ml

@@ -119,8 +119,8 @@ let (dump : string -> string -> t -> unit) =
     let time = Unix.localtime (Unix.time ()) in
     let date = (
       (string_of_int time.Unix.tm_mday) ^ "/" ^
-	(string_of_int (time.Unix.tm_mon+1)) ^  "/" ^
-	(string_of_int (1900+time.Unix.tm_year))
+	     (string_of_int (time.Unix.tm_mon+1)) ^  "/" ^
+	     (string_of_int (1900+time.Unix.tm_year))
     )
     and time_str = (
       (string_of_int time.Unix.tm_hour) ^  ":" ^