lurette 0.28 Tue, 12 Feb 2002 09:33:19 +0100 by jahier

Parent-Version:      0.27
Version-Log:

Add a test flag to Ocamlmake.

Project-Description: Lurette

.lurette.prcs_aux

@@ -25,6 +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)
 (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)
@@ -38,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 16819 1013445149 17_OcamlMakef 1.11)
+(OcamlMakefile 16998 1013502799 17_OcamlMakef 1.12)
 (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.11 Mon, 11 Feb 2002 17:32:29 +0100 jahier $
+#        $Id: OcamlMakefile 1.12 Tue, 12 Feb 2002 09:33:19 +0100 jahier $
 #
 ###########################################################################
 
@@ -475,12 +475,12 @@ pncl:	profiling-native-code-library
 ###########################################################################
 
 
-# Generates emacs tags (R1)
+# Generates emacs tags
 tags:
 	$(OTAGS) -v $(SOURCES)
 
 # Generates the modules dependency graph using ocamldot 
-# (results in lurette.dep.ps and lurette.depfull.ps). (R1)
+# (results in lurette.dep.ps and lurette.depfull.ps).
 dot:
 	pushd ../source ; touch $(RESULT).dep.dot ; touch $(RESULT).dep.ps ;  \
 	\rm $(RESULT).dep.ps $(RESULT).dep.dot ; \
@@ -492,13 +492,16 @@ dot:
 	dot -Tps $(RESULT).dep.dot > $(RESULT).dep.ps ;  \
 	cp $(RESULT).dep.ps ../doc ; cp $(RESULT).depfull.ps ../doc ; popd
 
-# (R1)
+#
 try:
 	$(LURETTE_DIR)/make_lurette ControleurPorte vrai_tram; \
 #	./lurette 10 2 2 tram.env usager.env porte.env passerelle.env | sim2chro -ecran
 	./lurette 10 2 2 tram.env usager.env porte.env passerelle.env 
 
-# runtest:
+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 
 
 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 27)
-(Parent-Version lurette 0 26)
+(Project-Version lurette 0 28)
+(Parent-Version lurette 0 27)
 (Version-Log "
-Add an option --sith-seed that lets one set the value of the seed
-used to initialize the random engine.
+Add a test flag to Ocamlmake.
 ")
 (New-Version-Log "")
-(Checkin-Time "Tue, 12 Feb 2002 09:02:01 +0100")
+(Checkin-Time "Tue, 12 Feb 2002 09:33:19 +0100")
 (Checkin-Login jahier)
 (Populate-Ignore ())
 (Project-Keywords)
@@ -60,7 +59,7 @@ used to initialize the random engine.
   (source/gen_stubs.ml (lurette/24_generate_l 1.14 644))
 
 ;; Make files
-  (OcamlMakefile (lurette/17_OcamlMakef 1.11 644))
+  (OcamlMakefile (lurette/17_OcamlMakef 1.12 644))
   (Makefile (lurette/18_Makefile 1.17 644))
   (test/Makefile (../Makefile) :symlink)
   (interface/Makefile (lurette/25_Makefile 1.6 644))
@@ -99,6 +98,9 @@ used to initialize the random engine.
   (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))
+
+
 )
 (Merge-Parents)
 (New-Merge-Parents)

test/lurette.rif.exp

+#program "lurette variables chronogram"
+#@inputs
+debut_ramassage:bool
+demande_pass:bool
+demande_porte:bool
+en_marche:bool
+fin_ramassage:bool
+pass_baissee:bool
+pass_rentree:bool
+porte_fermee:bool
+porte_ouverte:bool
+@#
+#@outputs
+baisser_pass:bool
+fermer_porte:bool
+ouvrir_porte:bool
+porte_et_pass_ok:bool
+rentrer_pass:bool
+@#
+#step 1
+t f f t t f f f t #outs 
+#step 2
+t f f f t f t t f #outs t f f f f 
+#step 3
+t t f f t f f t f #outs t f f f f 
+#step 4
+t f t t f f f t f #outs t f f f f 
+#step 5
+t t f t t f t t f #outs t f f f f 
+#step 6
+f t f t f f t f f #outs f t f f f 
+#step 7
+t t f t f f t f f #outs t f f f f 
+#step 8
+f f t t f f t t f #outs t f f f f 
+#step 9
+t f t f f f t f f #outs t f f f f 
+#step 10
+f f f f t f t f f #outs t f f f f 
+#step 11
+t t f f f f t t f #outs t f f f f 
+#step 12
+f t f t t f t t t #outs t f f f f 
+#step 13
+t f f t t f f f f #outs t f f f t 
+#step 14
+t f t t t f t f f #outs f f t t f 
+#step 15
+f t f t f f t t f #outs f f t f f 
+#step 16
+f f t t t f t f f #outs t f f f t 
+#step 17
+f f t t t f f t t #outs t f t f f 
+#step 18
+f f t t t f t t f #outs t f t f t 
+#step 19
+f f t f f f t t f #outs t f t f t 
+#step 20
+f t f t f f f f f #outs t f f f t 
+#step 21
+f f f t t f t t f #outs t f f f f 
+#step 22
+f t f t f f f t f #outs t f f f f 
+#step 23
+f t f f f t t t t #outs t f f f f 
+#step 24
+t f f t t t t t f #outs t f f f f 
+#step 25
+f t f f f t t t t #outs t f f f f 
+#step 26
+f t f t f f t t t #outs f f f t t 
+#step 27
+f f f t t f t t t #outs t f f f f 
+#step 28
+f f t t t f t t f #outs t f f f f 
+#step 29
+t f f f t f t f f #outs t f f f f 
+#step 30
+t f f f f f f t t #outs t f f f f 
+#step 31
+f f t f f f f t f #outs t f f f f 
+#step 32
+f t f t t f f f f #outs t f f f f 
+#step 33
+t f t f t f f t f #outs t f f f f 
+#step 34
+f f f f f t f t f #outs f f t t t 
+#step 35
+f f f f f f f t f #outs f t f f t 
+#step 36
+t f t t t f t t f #outs f f f f t 
+#step 37
+t f t t t t t t t #outs t f f f f 
+#step 38
+t f t f t f f t f #outs f t t f f 
+#step 39
+f f t t f f t t f #outs f f t f f 
+#step 40
+f f f f f f t t f #outs t f f f f 
+#step 41
+f t f t f f f t f #outs t f f f f 
+#step 42
+f f t t t f t t t #outs t f f f t 
+#step 43
+t f f f t f t t f #outs t f t f t 
+#step 44
+f t f f f f f f f #outs f f t t t 
+#step 45
+t f f t f f f t t #outs t f f f f 
+#step 46
+t t f t f f t f f #outs t f f f f 
+#step 47
+f t f t t f t t f #outs f f f t f 
+#step 48
+f f f f f f t t t #outs t f t f t 
+#step 49
+f f f t f t t t f #outs t f f f t 
+#step 50
+f t f t f f t t f #outs t f f f f 
+#step 51
+f t f t t t t t f #outs t f f f t 
+#step 52
+f t f f t f f t t #outs f t f f t 
+#step 53
+t f t t t f f f f #outs f f t f t 
+#step 54
+t f f f t f f f f #outs f t f f f 
+#step 55
+f f f f f t f f f #outs f f f f f 
+#step 56
+t f f t f t t t f #outs f f f f f 
+#step 57
+t t f t f f t t f #outs t f f f f 
+#step 58
+f f f t t f t t f #outs f f f t t 
+#step 59
+f f t f f f f t f #outs t f f f t 
+#step 60
+f t f f f t t f f #outs t f f f t 
+#step 61
+t f t t f f f t t #outs f t f f f 
+#step 62
+t f t t f f t f f #outs f f f f f 
+#step 63
+f f t t t f t t t #outs f t f f f 
+#step 64
+t t f f t f t t f #outs t f t f f 
+#step 65
+t t f t f f t t f #outs t f t f f 
+#step 66
+f t f t t f t f f #outs t f f f t 
+#step 67
+f f f t t f f t f #outs t f t f f 
+#step 68
+t f t t f t t f f #outs t f t f t 
+#step 69
+f t f t f f t t t #outs f t f t f 
+#step 70
+f t f t f f f t f #outs f f f f t 
+#step 71
+f t f f f f f f f #outs t f f f t 
+#step 72
+t f f f f f t f f #outs t f f f f 
+#step 73
+f f t f f f t f f #outs t f f f f 
+#step 74
+f f t f t f f t f #outs t f f f f 
+#step 75
+t f t t f f t t f #outs t f t f t 
+#step 76
+f f t f f f t t f #outs t f f f f 
+#step 77
+f t f t f f t t t #outs t f f f f 
+#step 78
+t f f t t f t f f #outs t f f f t 
+#step 79
+t f t f f f f t f #outs f f t t f 
+#step 80
+f f t t f f f f f #outs t f f f t 
+#step 81
+t f f t f f t t f #outs t f f f f 
+#step 82
+f t f t f f f t f #outs f t f f f 
+#step 83
+f f t t t f t f f #outs t f f f f 
+#step 84
+t t f t t f t f f #outs t f f f f 
+#step 85
+f f t f t f f f f #outs t f f f f 
+#step 86
+f f f f t f t t f #outs t f f f f 
+#step 87
+t f f t f f t t f #outs t f f f f 
+#step 88
+t t f f f f t t f #outs t f f f f 
+#step 89
+t t f f t f t t f #outs f f f t t 
+#step 90
+f f f t f f t t f #outs t f f f t 
+#step 91
+t t f f f f t f f #outs t f f f f 
+#step 92
+t t f f t f t t f #outs f f f t f 
+#step 93
+t f t t f t t t f #outs t f f f t 
+#step 94
+f t f t t t t f f #outs t f f f f 
+#step 95
+f t f t t f f t t #outs t f f f f 
+#step 96
+f t f t f f t f f #outs t f t f f 
+#step 97
+t f t t t f t f f #outs t f f f f 
+#step 98
+f t f t f f t f t #outs f t f f f 
+#step 99
+t f f t f t t t f #outs f f f f f 
+#step 100
+f f t t f f t t f #outs f f f f f