lurette 0.29 Tue, 12 Feb 2002 09:58:15 +0100 by jahier

Parent-Version:      0.28
Version-Log:

Put the names of the environements in the sim2chro window title.

Project-Description: Lurette

.lurette.prcs_aux

@@ -9,7 +9,7 @@
 (source/wtree.ml 9842 1013445149 b/1_wtree.ml 1.6)
 (source/solver.ml 11461 1013445149 39_solver.ml 1.7)
 (source/command_line.ml 3846 1013500921 b/20_command_li 1.2)
-(source/lurette.ml 10158 1013500921 12_lurette.ml 1.17)
+(source/lurette.ml 10371 1013504295 12_lurette.ml 1.18)
 (source/solver.mli 972 1013445149 38_solver.mli 1.6)
 (source/env.mli 2506 1013445149 15_env.mli 1.8)
 (lurette.depfull.dot 49 1007651448 b/5_lurette.de 1.2)
@@ -25,7 +25,7 @@
 (source/eval.ml 7903 1013445149 49_eval.ml 1.4)
 (source/gen_stubs.ml 31372 1013445149 24_generate_l 1.14)
 (source/parse_env.ml 9215 1012914629 41_parse_env. 1.4)
-(test/lurette.rif.exp 4706 1013502799 b/22_lurette.ri 1.1)
+(test/lurette.rif.exp 4746 1013504295 b/22_lurette.ri 1.2)
 (interface/TAGS 1956 1007380262 26_TAGS 1.3)
 (doc/Interface_draft 5232 1003928781 19_Interface_ 1.1)
 (doc/ocamldoc.hva 313 1008328137 b/13_ocamldoc.h 1.1)
@@ -39,7 +39,7 @@
 (source/eval.mli 1668 1013445149 48_eval.mli 1.4)
 (README 74 1011881677 10_README 1.2)
 (test/ControleurPorte.c 9407 1012914629 b/19_Controleur 1.1)
-(OcamlMakefile 16998 1013502799 17_OcamlMakef 1.12)
+(OcamlMakefile 17012 1013504295 17_OcamlMakef 1.13)
 (source/show_env.ml 3167 1013445149 43_show_env.m 1.2)
 (test/tram.env 806 1012914629 b/15_tram.env 1.1)
 (doc/synthese 2556 1007379917 b/2_synthese 1.1)

OcamlMakefile

@@ -5,7 +5,7 @@
 #                            For updates see:
 #             http://miss.wu-wien.ac.at/~mottl/ocaml_sources
 #
-#        $Id: OcamlMakefile 1.12 Tue, 12 Feb 2002 09:33:19 +0100 jahier $
+#        $Id: OcamlMakefile 1.13 Tue, 12 Feb 2002 09:58:15 +0100 jahier $
 #
 ###########################################################################
 
@@ -501,7 +501,7 @@ try:
 test:
 	$(LURETTE_DIR)/make_lurette ControleurPorte vrai_tram; \
 	./lurette 100 10 10 tram.env usager.env porte.env passerelle.env -seed 1013219512 -ns2c ;\
-	diff -u lurette.rif.exp lurette.rif > test.res 
+	diff -u lurette.rif.exp lurette.rif > test.res ; cat test.res
 
 dochtml:
 	ocamldoc -t "Lurette implementation description" -html -d ../doc/html -stars \

lurette.prj

 ;; -*- Prcs -*-
 (Created-By-Prcs-Version 1 3 3)
 (Project-Description "Lurette")
-(Project-Version lurette 0 28)
-(Parent-Version lurette 0 27)
+(Project-Version lurette 0 29)
+(Parent-Version lurette 0 28)
 (Version-Log "
-Add a test flag to Ocamlmake.
+Put the names of the environements in the sim2chro window title.
 ")
 (New-Version-Log "")
-(Checkin-Time "Tue, 12 Feb 2002 09:33:19 +0100")
+(Checkin-Time "Tue, 12 Feb 2002 09:58:15 +0100")
 (Checkin-Login jahier)
 (Populate-Ignore ())
 (Project-Keywords)
@@ -19,7 +19,7 @@ Add a test flag to Ocamlmake.
 
 ;; Sources files
   (source/lurette.mli (lurette/11_lurette.ml 1.10 644))
-  (source/lurette.ml (lurette/12_lurette.ml 1.17 644))
+  (source/lurette.ml (lurette/12_lurette.ml 1.18 644))
 
   (source/graph.mli (lurette/13_graph.mli 1.4 644))
   (source/graph.ml (lurette/14_graph.ml 1.3 644))
@@ -59,7 +59,7 @@ Add a test flag to Ocamlmake.
   (source/gen_stubs.ml (lurette/24_generate_l 1.14 644))
 
 ;; Make files
-  (OcamlMakefile (lurette/17_OcamlMakef 1.12 644))
+  (OcamlMakefile (lurette/17_OcamlMakef 1.13 644))
   (Makefile (lurette/18_Makefile 1.17 644))
   (test/Makefile (../Makefile) :symlink)
   (interface/Makefile (lurette/25_Makefile 1.6 644))
@@ -98,7 +98,7 @@ Add a test flag to Ocamlmake.
   (test/vrai_tram.h (lurette/b/7_vrai_tram. 1.2 644))
   (test/vrai_tram.c (lurette/b/8_vrai_tram. 1.2 644))
 
-  (test/lurette.rif.exp (lurette/b/22_lurette.ri 1.1 644))
+  (test/lurette.rif.exp (lurette/b/22_lurette.ri 1.2 644))
 
 
 )

source/lurette.ml

@@ -228,15 +228,19 @@ and
 	Show_env.generate_env_graph [[]] "environment" ;  
 	Show_env.gv ("environment.ps");        
 	Sim2chro.put_var_decl 
+	  ("lurette chronogram (" ^ 
+	   (fold_left (fun acc str -> (acc ^ " " ^ str)) "" (flatten env_llist)) ^ ")")
 	  Lurette_stub.sut_input_var_name_and_type_list 
 	  Lurette_stub.sut_output_var_name_and_type_list 
 	  stdout options.display_local_var;   
 	flush stdout;
       )
-      else Sim2chro.put_var_decl 
-	  Lurette_stub.sut_input_var_name_and_type_list 
-	  Lurette_stub.sut_output_var_name_and_type_list 
-	  rif options.display_local_var;
+      else Sim2chro.put_var_decl
+	("lurette chronogram (" ^ 
+	   (fold_left (fun acc str -> (acc ^ " " ^ str)) "" (flatten env_llist)) ^ ")")
+	Lurette_stub.sut_input_var_name_and_type_list 
+	Lurette_stub.sut_output_var_name_and_type_list 
+	rif options.display_local_var;
 
       (* Initializing Dd (bdd's) libs. *)
       Dd.initialize 0 options.cudd_heap_init ;

test/lurette.rif.exp

-#program "lurette variables chronogram"
+#program " lurette chronogram ( passerelle.env porte.env usager.env tram.env) "
 #@inputs
 debut_ramassage:bool
 demande_pass:bool