lurette 0.77 Thu, 29 Aug 2002 11:46:51 +0200 by jahier

Parent-Version:      0.76
Version-Log:

source/lurettetop.ml:
   Building every temporary files in /tmp/lurette2313/.

Project-Description: Lurette

.lurette.prcs_aux

@@ -6,12 +6,12 @@
 (source/env_state.ml 19663 1027092697 51_env_state. 1.24)
 (source/graph.ml 2563 1027066799 14_graph.ml 1.7)
 (bin/Makefile.ima_exe 2013 1027066799 b/41_Makefile.i 1.3)
-(source/util.ml 14262 1027943375 35_util.ml 1.23)
-(test/time.exp 5577 1028297733 b/48_time.exp 1.2)
+(source/util.ml 14262 1030614411 35_util.ml 1.24)
+(test/time.exp 5577 1030614411 b/48_time.exp 1.3)
 (source/solver.ml 24274 1027436332 39_solver.ml 1.25)
 (test/test_gen_stubs.h 1818 1020068208 b/45_test_gen_s 1.1)
 (source/command_line.ml 4388 1019207707 b/20_command_li 1.7)
-(source/lurette.ml 12268 1030525986 12_lurette.ml 1.45)
+(source/lurette.ml 12162 1030614411 12_lurette.ml 1.47)
 (source/solver.mli 1003 1027092697 38_solver.mli 1.13)
 (source/env.mli 2028 1027349504 15_env.mli 1.15)
 (test/heater_float.rif.exp 1453 1028297733 b/30_heater_flo 1.5)
@@ -27,17 +27,17 @@
 (source/parse_env.mli 1025 1027066799 40_parse_env. 1.9)
 (source/sim2chro.mli 1455 1027943375 b/23_sim2chro.m 1.5)
 (test/passerelle.ima 972 1027066799 b/17_passerelle 1.7)
-(source/ima_exe.ml 11851 1027349504 b/32_ima_exe.ml 1.15)
+(source/ima_exe.ml 11903 1030614411 b/32_ima_exe.ml 1.16)
 (doc/automata_format 0 1007379917 b/3_automata_f 1.1)
 (source/eval.ml 7755 1027066799 49_eval.ml 1.13)
-(source/gen_stubs.ml 33500 1027943375 24_generate_l 1.28)
+(source/gen_stubs.ml 33359 1030614411 24_generate_l 1.30)
 (source/parse_env.ml 22104 1027066799 41_parse_env. 1.20)
 (doc/ocamldoc.hva 313 1008328137 b/13_ocamldoc.h 1.1)
 (source/automata.mli 3397 1027349504 b/46_automata.m 1.2)
 (source/sim2chro.ml 2720 1027943375 b/24_sim2chro.m 1.10)
 (doc/Interface_draft 5232 1003928781 19_Interface_ 1.1)
 (source/formula.mli 3638 1027066799 44_formula.ml 1.14)
-(test/time.res 5577 1028297733 b/49_time.res 1.5)
+(test/time.res 5577 1030614411 b/49_time.res 1.6)
 (TAGS 9825 1007379917 21_TAGS 1.6)
 (source/command_line.mli 1421 1017929190 b/21_command_li 1.6)
 (source/env_state.mli 6453 1027092697 50_env_state. 1.21)
@@ -47,19 +47,19 @@
 (test/usager.ima 493 1027066799 b/14_usager.env 1.8)
 (README 74 1011881677 10_README 1.2)
 (test/ControleurPorte.c 9407 1012914629 b/19_Controleur 1.1)
-(OcamlMakefile 24994 1028297733 17_OcamlMakef 1.34)
+(OcamlMakefile 25078 1030614411 17_OcamlMakef 1.35)
 (source/command_line_ima_exe.ml 2792 1021651153 b/33_command_li 1.4)
 (test/ControleurPorte.rif.exp 4756 1028297733 b/29_Controleur 1.8)
-(Makefile.lurette 551 1030525986 b/38_Makefile.l 1.7)
-(source/show_env.ml 3653 1027349504 43_show_env.m 1.11)
+(Makefile.lurette 609 1030614411 b/38_Makefile.l 1.8)
+(source/show_env.ml 3603 1030532285 43_show_env.m 1.12)
 (source/gne.mli 1079 1027066799 b/36_gne.mli 1.2)
 (source/automata.ml 15708 1027349504 b/47_automata.m 1.2)
 (bin/Makefile.lurette_lib 1765 1030525986 c/2_Makefile.l 1.1)
-(bin/Makefile.gen_stubs 467 1020068208 b/42_Makefile.g 1.1)
+(bin/Makefile.gen_stubs 472 1030532285 b/42_Makefile.g 1.2)
 (doc/synthese 2556 1007379917 b/2_synthese 1.1)
 (test/ControleurPorte.h 2306 1012914629 b/18_Controleur 1.1)
 (source/show_env.mli 1091 1027066799 42_show_env.m 1.7)
-(test/Makefile 164 1027943375 c/0_Makefile 1.2)
+(test/Makefile 104 1030614411 c/0_Makefile 1.3)
 (test/temp_int.ima 647 1027066799 b/50_temp_int.e 1.1)
 (source/gne.ml 8173 1027066799 b/37_gne.ml 1.2)
 (test/tram_simple.h 1746 1013519411 b/25_tram_simpl 1.1)
@@ -68,12 +68,12 @@
 (test/heater_float.lus 175 1020068208 b/44_heater_flo 1.1)
 (test/vrai_tram.c 3060 1027066799 b/8_vrai_tram. 1.3)
 (source/print.mli 773 1027066799 46_print.mli 1.10)
-(source/lurettetop.ml 15695 1030525986 c/1_lurettetop 1.2)
+(source/lurettetop.ml 16570 1030614411 c/1_lurettetop 1.3)
 (test/heater_int.lus 170 1020068208 b/43_heater_int 1.1)
 (source/graph.mli 2218 1027066799 13_graph.mli 1.9)
 (test/heater_int.rif.exp 860 1028297733 b/28_heater_int 1.6)
 (source/formula.ml 7287 1027066799 45_formula.ml 1.16)
 (source/lurette.mli 448 1016027474 11_lurette.ml 1.12)
-(source/print.ml 5954 1027066799 47_print.ml 1.17)
+(source/print.ml 5883 1030532285 47_print.ml 1.18)
 (test/vrai_tram.h 2468 1027066799 b/7_vrai_tram. 1.3)
 (bin/Makefile.show_ima 1039 1027066799 b/40_Makefile.s 1.4)

Makefile.lurette

@@ -11,6 +11,8 @@ ifndef OCAMLFLAGS
 endif
 
 LIBS = str lurette_lib # mlpoly  
+INCDIRS = /home/jahier/include
+LIBDIRS = /home/jahier/lib
 
 
 SOURCES_C = $(SUT) sut_stub.c  sut_idl_stub.idl \

OcamlMakefile

@@ -5,7 +5,7 @@
 #                            For updates see:
 #             http://miss.wu-wien.ac.at/~mottl/ocaml_sources
 #
-#        $Id: OcamlMakefile 1.34 Fri, 02 Aug 2002 16:15:33 +0200 jahier $
+#        $Id: OcamlMakefile 1.35 Thu, 29 Aug 2002 11:46:51 +0200 jahier $
 #
 ###########################################################################
 # Set these variables to the names of the sources to be processed and
@@ -571,6 +571,9 @@ test: test1 test2 test3
 ima:
 	pushd ~/lurette/bin ; make -k dc -f Makefile.ima_exe OCAMLFLAGS=""; popd
 
+ltop:
+	pushd ~/lurette/bin ; make -k dc -f Makefile.lurettetop OCAMLFLAGS=""; popd
+
 ima_nc:
 	pushd ~/lurette/bin ; make -k clean -f Makefile.ima_exe ; \
 	make -k nc -f Makefile.ima_exe  OCAMLFLAGS="-noassert -unsafe"; popd

lurette.prj

 ;; -*- Prcs -*-
 (Created-By-Prcs-Version 1 3 3)
 (Project-Description "Lurette")
-(Project-Version lurette 0 76)
-(Parent-Version lurette 0 75)
+(Project-Version lurette 0 77)
+(Parent-Version lurette 0 76)
 (Version-Log "
 
-*.ml:
-    Avoid using Sys.command  when possible.
+source/lurettetop.ml:
+   Building every temporary files in /tmp/lurette2313/.
+
 ")
 (New-Version-Log "")
-(Checkin-Time "Wed, 28 Aug 2002 12:58:05 +0200")
+(Checkin-Time "Thu, 29 Aug 2002 11:46:51 +0200")
 (Checkin-Login jahier)
 (Populate-Ignore ())
 (Project-Keywords)
@@ -21,14 +22,14 @@
 
 ;; Sources files for ima_exe
   (source/ima_exe.mli (lurette/b/31_ima_exe.ml 1.1 644))
-  (source/ima_exe.ml (lurette/b/32_ima_exe.ml 1.15 644))
+  (source/ima_exe.ml (lurette/b/32_ima_exe.ml 1.16 644))
 
   (source/command_line_ima_exe.ml (lurette/b/33_command_li 1.4 644))
   (source/command_line_ima_exe.mli (lurette/b/34_command_li 1.3 644))
 
 ;; Sources files for lurette only
   (source/lurette.mli (lurette/11_lurette.ml 1.12 644))
-  (source/lurette.ml (lurette/12_lurette.ml 1.46 644))
+  (source/lurette.ml (lurette/12_lurette.ml 1.47 644))
 
   (source/command_line.ml (lurette/b/20_command_li 1.7 644))
   (source/command_line.mli (lurette/b/21_command_li 1.6 644))
@@ -40,7 +41,7 @@
   (source/env.mli (lurette/15_env.mli 1.15 644))
   (source/env.ml (lurette/16_env.ml 1.29 644))
 
-  (source/util.ml (lurette/35_util.ml 1.23 644))
+  (source/util.ml (lurette/35_util.ml 1.24 644))
 
   (source/solver.mli (lurette/38_solver.mli 1.13 644))
   (source/solver.ml (lurette/39_solver.ml 1.25 644))
@@ -75,15 +76,15 @@
   (source/gne.mli (lurette/b/36_gne.mli 1.2 644))
   (source/gne.ml (lurette/b/37_gne.ml 1.2 644))
 
-  (source/lurettetop.ml (lurette/c/1_lurettetop 1.2 644))
-  (source/gen_stubs.ml (lurette/24_generate_l 1.29 644))
+  (source/lurettetop.ml (lurette/c/1_lurettetop 1.3 644))
+  (source/gen_stubs.ml (lurette/24_generate_l 1.30 644))
 
 ; little script that sets env vars and starts the lurette build
   (make_lurette (lurette/27_make_luret 1.15 755))
 
 ;; Make files
-  (OcamlMakefile (lurette/17_OcamlMakef 1.34 644))
-  (Makefile.lurette (lurette/b/38_Makefile.l 1.7 644))
+  (OcamlMakefile (lurette/17_OcamlMakef 1.35 644))
+  (Makefile.lurette (lurette/b/38_Makefile.l 1.8 644))
 
   (bin/Makefile.show_ima (lurette/b/40_Makefile.s 1.4 644))
   (bin/Makefile.ima_exe (lurette/b/41_Makefile.i 1.3 644))
@@ -105,8 +106,8 @@
   (lurette.depfull.dot (lurette/b/5_lurette.de 1.2 644))
   (TAGS (lurette/21_TAGS 1.6 644))
 
-  (test/time.exp (lurette/b/48_time.exp 1.2 644))
-  (test/time.res (lurette/b/49_time.res 1.5 644))
+  (test/time.exp (lurette/b/48_time.exp 1.3 644))
+  (test/time.res (lurette/b/49_time.res 1.6 644))
 
 ;; Various files used for testing purposes
   (test/usager.ima (lurette/b/14_usager.env 1.8 644))
@@ -131,7 +132,7 @@
   (test/heater_float.lus (lurette/b/44_heater_flo 1.1 644))
   (test/test_gen_stubs.h (lurette/b/45_test_gen_s 1.1 644))
 
-  (test/Makefile (lurette/c/0_Makefile 1.2 644))
+  (test/Makefile (lurette/c/0_Makefile 1.3 644))
 
 
 

source/gen_stubs.ml

@@ -923,8 +923,8 @@ let (gen_a_fake_oracle : string -> unit) =
 let usage = ("\n\nusage: gen_stub <sut> [<oracle>] \n\twhere <sut> " ^
 	     " (reps <oracle>) is the name of the System Under Test C " ^
 	     " file\n\t(resp the oracle file) without its extension.\n " ^
-	     " The oracle is optional; if omitted, a fake oracle that always " ^
-	     " answers true is generated from <sut>.\n ")
+	     " The oracle is optional; if omitted, a fake oracle that always" ^
+	     " answers true is generated.\n ")
 
 
 

source/ima_exe.ml

@@ -234,7 +234,8 @@ let rec (main : unit -> 'a) =
     with 
 	Failure(errmsg) -> output_string stderr errmsg
       | e ->  
-	  Env_state.dump_env_state_stat ();
+(* 	  Env_state.dump_env_state_stat (); *)
+	  print_string  Command_line_ima_exe.usage ;
 	  raise e	
 
 and 

source/lurette.ml

@@ -102,8 +102,8 @@ let rec (main : unit -> 'a) =
 	  res
     with 
 	Failure(errmsg) -> output_string stderr errmsg
-      | e -> 
-	  Env_state.dump_env_state_stat ();
+      | e ->
+	  if options.verbose then Env_state.dump_env_state_stat ();
 	  raise e	
 
 and 

source/lurettetop.ml

@@ -131,25 +131,8 @@ let rec speclist =
 
 
 
-
-(* let pwd = Sys.getcwd () *)
-(*  *)
-(* let (get_fresh_dir : unit -> string) = *)
-(*   fun _ ->  *)
-(*     let rec get_fresh_dir_rec n = *)
-(*       let dir = "/tmp/lurette" ^ (string_of_int n) in *)
-(* 	if *)
-(* 	  not (Sys.file_exists dir) *)
-(* 	then *)
-(* 	  dir *)
-(* 	else *)
-(* 	  get_fresh_dir_rec (n+1) *)
-(*     in *)
-(*       get_fresh_dir_rec 1 *)
-
-
-let (build : unit -> bool) =
-  fun _ ->
+let (build : string -> string -> string -> bool) =
+  fun user_dir lurette_tmp_dir lurette_dir ->
     print_string "  buiding lurette_exe ...\n";
     if (flag.sut = "" or flag.env = "")
     then
@@ -161,12 +144,18 @@ let (build : unit -> bool) =
       )
     else
       let (oracle, oracle2) =  
-	match flag.oracle with None -> "", "always_true" | Some str -> str, str 
+	match flag.oracle 
+	with 
+	    None -> "", (lurette_tmp_dir ^ "/always_true") 
+	  | Some str -> (user_dir ^ str), (user_dir ^ str) 
       in
-      let gen_stubs_cmd = ("gen_stubs " ^ flag.sut ^ "  " ^ oracle ^  "\n") 
-      and make_cmd = ("make " ^ flag.make_opt ^ "\n")
+      let gen_stubs_cmd = 
+	("gen_stubs " ^ user_dir ^ flag.sut ^ " " ^ oracle ^ "\n") 
+      and make_cmd = 
+	("make -I " ^ user_dir ^ " -f " 
+	 ^ lurette_dir ^ "/Makefile.lurette " ^ flag.make_opt ^ "\n")
       in     
-	Unix.putenv "SUT" (flag.sut ^ ".c");
+	Unix.putenv "SUT" (user_dir ^ flag.sut ^ ".c");
 	Unix.putenv "ORACLE" (oracle2 ^ ".c");
 	print_string gen_stubs_cmd ;
 	flush stdout ;
@@ -182,8 +171,8 @@ let (build : unit -> bool) =
 	  )
 
 
-let (run : unit -> bool) =
-  fun _ ->
+let (run : string -> bool) =
+  fun lurette_tmp_dir ->
     let seed_str = 
       match flag.seed with 
 	  None -> "" 
@@ -199,8 +188,8 @@ let (run : unit -> bool) =
     and dlvr_str = 
       if !(flag.display_local_var) then " --display-local-var " else " -nlv "
     in
-    let run_cmd = 
-      ("./lurette " ^ 
+    let run_cmd =
+      (lurette_tmp_dir ^ "/lurette " ^ 
       (string_of_int flag.step_nb) ^ " " ^
       (string_of_int flag.formula_nb) ^ " " ^
       (string_of_int flag.draw_nb) ^ " " ^
@@ -434,8 +423,8 @@ set_output  <string>
       print_string msg
     
 
-let rec (main_loop : unit -> unit) =
-  fun _ ->
+let rec (main_loop : string -> string -> string -> unit) =
+  fun user_dir lurette_tmp_dir lurette_dir ->
     let _ = print_string "<lurette> " in
     let continue =
       try 
@@ -470,7 +459,7 @@ let rec (main_loop : unit -> unit) =
 		       let _ = Sys.command "make clean" in
 			 true
 		   | Build -> 
-		       let build_ok = build () in
+		       let build_ok = build user_dir lurette_tmp_dir lurette_dir in
 			 if 
 			   not build_ok 
 			 then 
@@ -479,16 +468,18 @@ let rec (main_loop : unit -> unit) =
 			   flag.to_build := false; 
 			 true
 		   | Run -> 
-		       if (not !(flag.to_build) or (build ()))
+		       if (not !(flag.to_build) or (build user_dir lurette_tmp_dir lurette_dir))
 		       then 
 			 (
 			   flag.to_build := false; 
-			   let result =  run () in
+			   Unix.chdir user_dir;
+			   let result =  run lurette_tmp_dir in
 			     if not result  
 			     then output_string stderr "Can not run lurette.\n"
 			 )
 			 else 
 		           print_string "\n*** Cannot build lurette_exe, sorry.\n";
+		       Unix.chdir lurette_tmp_dir;
 		       true
 			 
 		   | Show -> let _ = Sys.command ("show_ima " ^ flag.env) in true
@@ -506,39 +497,69 @@ let rec (main_loop : unit -> unit) =
 	print_string cmd_usage ;
 	true
     in
-      if continue then main_loop () else print_string "bye!\n"
+      if continue then main_loop user_dir lurette_tmp_dir lurette_dir else print_string "bye!\n"
+
+
 
 
+let (get_fresh_dir : unit -> string) = 
+  fun _ ->  
+    let rec get_fresh_dir_rec n = 
+      let dir = "/tmp/lurette" ^ (string_of_int n) in 
+	if 
+	  not (Sys.file_exists dir) 
+	then 
+	  (  
+	    Unix.mkdir dir 0o755;
+	    dir 
+	  )
+	else 
+	  get_fresh_dir_rec (n+1) 
+    in 
+      get_fresh_dir_rec 1 
 
    
 let _ =
-  try
-    Arg.parse speclist 
-	(fun s -> 
-	   if s = "x" 
-	   then flag.env <- (flag.env ^ " x ")
-	   else flag.env <- (flag.env ^ s ^ ".ima ")
-	) 
-	usage;
-    if !(flag.go)
-    then 
-      (
-	if build () 
-	then 
-	  if run () 
-	  then exit 0 
-	  else print_string "Can not run lurette_exe\n"
-	else  print_string "Can not build lurette_exe\n"
-      )
-    else main_loop ()
-  with 
-      Failure(e) ->
-	print_string e;
-	flush stdout ;
-	flush stderr ;
-	exit 2
-    | _ ->
-	exit 2
+  let user_dir = (Unix.getcwd ()) ^ "/"  in 
+  let lurette_tmp_dir = get_fresh_dir () in
+  let lurette_dir = 
+    try Sys.getenv "LURETTE_PATH"
+    with _ -> 
+      print_string "Environment var LURETTE_PATH is unset.\n";
+      exit 2
+  in
+    try
+      Arg.parse speclist 
+	  (fun s -> 
+	     if s = "x" 
+	     then flag.env <- (flag.env ^ " x ")
+	     else flag.env <- (flag.env ^ s ^ ".ima ")
+	  ) 
+	  usage;
+      Unix.chdir lurette_tmp_dir;
+      if !(flag.go)
+      then 
+	(
+	  if build user_dir lurette_tmp_dir lurette_dir
+	  then
+	    (
+	      Unix.chdir user_dir;
+	      if run lurette_tmp_dir 
+	      then exit 0 
+	      else print_string "Can not run lurette_exe\n"
+	    )
+	  else  print_string "Can not build lurette_exe\n"
+	)
+      else main_loop user_dir lurette_tmp_dir lurette_dir;
+      Unix.chdir user_dir
+    with 
+	Failure(e) ->
+	  print_string e;
+	  flush stdout ;
+	  flush stderr ;
+	  exit 2
+      | _ ->
+	  exit 2
     
 
 

source/util.ml

@@ -61,8 +61,8 @@ let (compare_list : 'a list -> 'a -> 'a -> int) =
       if a = b then 0 else compare_list_rec list a b
 
 let _ = assert ((compare_list [3; 5; 4] 4 5) > 0)
-let _ = assert ((compare_list [3; 5; 4] 4 1) > 0)
-let _ = assert ((compare_list [3; 5; 4] 1 11) > 0)
+let _ = assert ((compare_list [3; 5; 4] 4 1) < 0)
+let _ = assert ((compare_list [3; 5; 4] 1 11) < 0)
 
 
 

test/Makefile

 
 
-LURETTE_PATH = /home/jahier/lurette
-export LURETTE_PATH
-
-
 INCDIRS = /home/jahier/include
 LIBDIRS = /home/jahier/lib
 
-
-
 -include $(LURETTE_PATH)/Makefile.lurette
 

test/time.exp

 	Command being timed: "./lurette 10000 1 1 tram.env usager.env porte.env passerelle.env -seed 1015403953 -ns2c --no-oracle"
 	User time (seconds): 9.13
-	System time (seconds): 0.15
-	Percent of CPU this job got: 93%
-	Elapsed (wall clock) time (h:mm:ss or m:ss): 0:09.96
+	System time (seconds): 0.08
+	Percent of CPU this job got: 92%
+	Elapsed (wall clock) time (h:mm:ss or m:ss): 0:09.91
 	Average shared text size (kbytes): 0
 	Average unshared data size (kbytes): 0
 	Average stack size (kbytes): 0
 	Average total size (kbytes): 0
 	Maximum resident set size (kbytes): 0
 	Average resident set size (kbytes): 0
-	Major (requiring I/O) page faults: 561
-	Minor (reclaiming a frame) page faults: 2558
+	Major (requiring I/O) page faults: 187
+	Minor (reclaiming a frame) page faults: 2452
 	Voluntary context switches: 0
 	Involuntary context switches: 0
 	Swaps: 0
@@ -23,18 +23,18 @@
 	Exit status: 0
  
 	Command being timed: "./lurette 10 100 100 tram.env usager.env porte.env passerelle.env -seed 1015403953 -ns2c --no-oracle"
-	User time (seconds): 18.71
-	System time (seconds): 0.13
-	Percent of CPU this job got: 94%
-	Elapsed (wall clock) time (h:mm:ss or m:ss): 0:19.97
+	User time (seconds): 19.03
+	System time (seconds): 0.10
+	Percent of CPU this job got: 95%
+	Elapsed (wall clock) time (h:mm:ss or m:ss): 0:19.94
 	Average shared text size (kbytes): 0
 	Average unshared data size (kbytes): 0
 	Average stack size (kbytes): 0
 	Average total size (kbytes): 0
 	Maximum resident set size (kbytes): 0
 	Average resident set size (kbytes): 0
-	Major (requiring I/O) page faults: 561
-	Minor (reclaiming a frame) page faults: 4819
+	Major (requiring I/O) page faults: 187
+	Minor (reclaiming a frame) page faults: 5033
 	Voluntary context switches: 0
 	Involuntary context switches: 0
 	Swaps: 0
@@ -47,18 +47,18 @@
 	Exit status: 0
  
 	Command being timed: "./lurette 100 50 50 tram.env usager.env porte.env passerelle.env -seed 1015403953 -ns2c --no-oracle"
-	User time (seconds): 42.47
-	System time (seconds): 0.11
-	Percent of CPU this job got: 95%
-	Elapsed (wall clock) time (h:mm:ss or m:ss): 0:44.46
+	User time (seconds): 42.59
+	System time (seconds): 0.04
+	Percent of CPU this job got: 93%
+	Elapsed (wall clock) time (h:mm:ss or m:ss): 0:45.83
 	Average shared text size (kbytes): 0
 	Average unshared data size (kbytes): 0
 	Average stack size (kbytes): 0
 	Average total size (kbytes): 0
 	Maximum resident set size (kbytes): 0
 	Average resident set size (kbytes): 0
-	Major (requiring I/O) page faults: 561
-	Minor (reclaiming a frame) page faults: 3142
+	Major (requiring I/O) page faults: 187
+	Minor (reclaiming a frame) page faults: 3099
 	Voluntary context switches: 0
 	Involuntary context switches: 0
 	Swaps: 0
@@ -71,18 +71,18 @@
 	Exit status: 0
  
 	Command being timed: "./lurette 10000 1 1 temp_float.env -seed 1015403953 -ns2c --no-oracle"
-	User time (seconds): 3.60
-	System time (seconds): 0.08
-	Percent of CPU this job got: 90%
-	Elapsed (wall clock) time (h:mm:ss or m:ss): 0:04.08
+	User time (seconds): 3.62
+	System time (seconds): 0.09
+	Percent of CPU this job got: 88%
+	Elapsed (wall clock) time (h:mm:ss or m:ss): 0:04.19
 	Average shared text size (kbytes): 0
 	Average unshared data size (kbytes): 0
 	Average stack size (kbytes): 0
 	Average total size (kbytes): 0
 	Maximum resident set size (kbytes): 0
 	Average resident set size (kbytes): 0
-	Major (requiring I/O) page faults: 575
-	Minor (reclaiming a frame) page faults: 2556
+	Major (requiring I/O) page faults: 203
+	Minor (reclaiming a frame) page faults: 2447
 	Voluntary context switches: 0
 	Involuntary context switches: 0
 	Swaps: 0
@@ -95,18 +95,18 @@
 	Exit status: 0
  
 	Command being timed: "./lurette 10 100 100 temp_float.env -seed 1015403953 -ns2c --no-oracle"
-	User time (seconds): 7.16
-	System time (seconds): 0.09
+	User time (seconds): 7.14
+	System time (seconds): 0.06
 	Percent of CPU this job got: 95%
-	Elapsed (wall clock) time (h:mm:ss or m:ss): 0:07.57
+	Elapsed (wall clock) time (h:mm:ss or m:ss): 0:07.55
 	Average shared text size (kbytes): 0
 	Average unshared data size (kbytes): 0
 	Average stack size (kbytes): 0
 	Average total size (kbytes): 0
 	Maximum resident set size (kbytes): 0
 	Average resident set size (kbytes): 0
-	Major (requiring I/O) page faults: 575
-	Minor (reclaiming a frame) page faults: 3498
+	Major (requiring I/O) page faults: 203
+	Minor (reclaiming a frame) page faults: 3453
 	Voluntary context switches: 0
 	Involuntary context switches: 0
 	Swaps: 0
@@ -119,18 +119,18 @@
 	Exit status: 0
  
 	Command being timed: "./lurette 10000 1 1 temp_int.env -seed 1015403953 -ns2c --no-oracle"
-	User time (seconds): 3.17
-	System time (seconds): 0.10
-	Percent of CPU this job got: 89%
-	Elapsed (wall clock) time (h:mm:ss or m:ss): 0:03.66
+	User time (seconds): 3.26
+	System time (seconds): 0.09
+	Percent of CPU this job got: 84%
+	Elapsed (wall clock) time (h:mm:ss or m:ss): 0:03.97
 	Average shared text size (kbytes): 0
 	Average unshared data size (kbytes): 0
 	Average stack size (kbytes): 0
 	Average total size (kbytes): 0
 	Maximum resident set size (kbytes): 0
 	Average resident set size (kbytes): 0
-	Major (requiring I/O) page faults: 573
-	Minor (reclaiming a frame) page faults: 2557
+	Major (requiring I/O) page faults: 200
+	Minor (reclaiming a frame) page faults: 2448
 	Voluntary context switches: 0
 	Involuntary context switches: 0
 	Swaps: 0
@@ -143,18 +143,18 @@
 	Exit status: 0
  
 	Command being timed: "./lurette 10 100 100 temp_int.env -seed 1015403953 -ns2c --no-oracle"
-	User time (seconds): 8.17
-	System time (seconds): 0.06
-	Percent of CPU this job got: 93%
-	Elapsed (wall clock) time (h:mm:ss or m:ss): 0:08.82
+	User time (seconds): 8.13
+	System time (seconds): 0.08
+	Percent of CPU this job got: 95%
+	Elapsed (wall clock) time (h:mm:ss or m:ss): 0:08.58
 	Average shared text size (kbytes): 0
 	Average unshared data size (kbytes): 0
 	Average stack size (kbytes): 0
 	Average total size (kbytes): 0
 	Maximum resident set size (kbytes): 0
 	Average resident set size (kbytes): 0
-	Major (requiring I/O) page faults: 573
-	Minor (reclaiming a frame) page faults: 3562
+	Major (requiring I/O) page faults: 200
+	Minor (reclaiming a frame) page faults: 3453
 	Voluntary context switches: 0
 	Involuntary context switches: 0
 	Swaps: 0

test/time.res

 	Command being timed: "./lurette 10000 1 1 tram.env usager.env porte.env passerelle.env -seed 1015403953 -ns2c --no-oracle"
 	User time (seconds): 9.13
-	System time (seconds): 0.15
-	Percent of CPU this job got: 93%
-	Elapsed (wall clock) time (h:mm:ss or m:ss): 0:09.96
+	System time (seconds): 0.08
+	Percent of CPU this job got: 92%
+	Elapsed (wall clock) time (h:mm:ss or m:ss): 0:09.91
 	Average shared text size (kbytes): 0
 	Average unshared data size (kbytes): 0
 	Average stack size (kbytes): 0
 	Average total size (kbytes): 0
 	Maximum resident set size (kbytes): 0
 	Average resident set size (kbytes): 0
-	Major (requiring I/O) page faults: 561