Commit 47cf1f46 authored by Erwan Jahier's avatar Erwan Jahier
Browse files

lurette 0.101 Fri, 04 Oct 2002 15:38:51 +0200 by jahier

Parent-Version:      0.100
Version-Log:

Rename any occurence of ima by luc or lucky.

Project-Description: Lurette
parent 6095ca23
......@@ -4,75 +4,78 @@
(source/automata.ml 15777 1033723811 b/47_automata.m 1.5)
(source/formula.mli 2805 1033397911 44_formula.ml 1.18)
(test/heater_float.lus 175 1020068208 b/44_heater_flo 1.1)
(test/passerelle.luc 984 1032789516 b/17_passerelle 1.8)
(doc/synthese 2556 1007379917 b/2_synthese 1.1)
(bin/Makefile 794 1033723811 c/20_Makefile 1.2)
(bin/Makefile 1282 1033738731 c/20_Makefile 1.3)
(bin/Makefile.gen_stubs 472 1030532285 b/42_Makefile.g 1.2)
(test/tram.ima 1079 1032789516 b/15_tram.env 1.8)
(test/temp_float.luc 728 1032789516 b/51_temp_float 1.3)
(test/ControleurPorte.rif.exp 4756 1032789516 b/29_Controleur 1.9)
(doc/ocamldoc.sty 1380 1008328137 b/12_ocamldoc.s 1.1)
(test/tram_simple.h 1746 1013519411 b/25_tram_simpl 1.1)
(source/command_line_ima_exe.mli 1082 1021651153 b/34_command_li 1.3)
(test/porte.ima 1050 1032789516 b/16_porte.env 1.8)
(source/constraint.mli 1478 1033732198 c/18_constraint 1.4)
(source/automata.mli 3397 1027349504 b/46_automata.m 1.2)
(source/automata.mli 3396 1033738731 b/46_automata.m 1.3)
(test/heater_int.rif.exp 860 1033397911 b/28_heater_int 1.8)
(source/ne.ml 9140 1033723811 c/21_ne.ml 1.1)
(bin/Makefile.lurette_lib 1976 1033397911 c/2_Makefile.l 1.4)
(source/value.mli 1101 1033723811 c/24_value.mli 1.1)
(test/temp_int.luc 685 1033723811 b/50_temp_int.e 1.3)
(source/luc_exe.ml 12114 1033738731 b/32_ima_exe.ml 1.20)
(test/heater_float.rif.exp 1459 1033397911 b/30_heater_flo 1.9)
(source/graph.ml 2563 1027066799 14_graph.ml 1.7)
(ihm/xlurette/makefile 783 1032355637 c/16_makefile 1.1)
(test/usager.luc 495 1032789516 b/14_usager.env 1.9)
(source/eval.ml 7755 1027066799 49_eval.ml 1.13)
(source/env.ml 8013 1027349504 16_env.ml 1.29)
(bin/Makefile.show_ima 1039 1027066799 b/40_Makefile.s 1.4)
(test/giro/giro.ima 2747 1033723811 c/6_giro.ima 1.3)
(demo/chaudiere/buggy_chaudiere_ctrl.lus 219 1031732392 c/10_buggy_chau 1.1)
(source/command_line_ima_exe.ml 2792 1031732392 b/33_command_li 1.5)
(source/env_state.mli 6734 1033125605 50_env_state. 1.24)
(source/print.mli 1145 1033397911 46_print.mli 1.12)
(test/temp_int.ima 685 1033723811 b/50_temp_int.e 1.3)
(test/Makefile 105 1031732392 c/0_Makefile 1.4)
(source/parse_env.ml 24584 1033723811 41_parse_env. 1.29)
(ihm/xlurette/xlurette_glade_main.ml 16705 1032789516 c/12_xlurette_g 1.6)
(demo/chaudiere/chaudiere_oracle.lus 107 1031732392 c/8_chaudiere_ 1.1)
(test/temp_float.ima 728 1032789516 b/51_temp_float 1.3)
(source/solver.ml 31802 1033732198 39_solver.ml 1.32)
(test/ControleurPorte.lus 3219 1032940601 c/17_Controleur 1.1)
(source/lurette.ml 13532 1033723811 12_lurette.ml 1.53)
(source/lurette.ml 13532 1033738731 12_lurette.ml 1.54)
(source/util.ml 15664 1033723811 35_util.ml 1.27)
(test/time.res 5580 1033732198 b/49_time.res 1.13)
(test/time.res 5580 1033738731 b/49_time.res 1.14)
(doc/Interface_draft 5232 1003928781 19_Interface_ 1.1)
(source/sim2chro.mli 1455 1027943375 b/23_sim2chro.m 1.5)
(source/command_line_luc_exe.mli 1082 1033738731 b/34_command_li 1.4)
(TAGS 9825 1007379917 21_TAGS 1.6)
(test/giro/onlyroll.lus 18298 1031732392 c/7_onlyroll.l 1.1)
(source/parse_env.mli 1025 1027066799 40_parse_env. 1.9)
(source/parse_env.mli 1025 1033738731 40_parse_env. 1.10)
(source/gen_stubs.ml 34560 1033734088 24_generate_l 1.37)
(OcamlMakefile 22581 1033397911 17_OcamlMakef 1.42)
(source/command_line.ml 4625 1031053030 b/20_command_li 1.8)
(test/porte.luc 1050 1032789516 b/16_porte.env 1.8)
(make_lurette 1303 1032940601 27_make_luret 1.16)
(source/control.ml 4416 1030975996 c/4_control.ml 1.3)
(source/lurettetop.ml 24884 1033723811 c/1_lurettetop 1.11)
(source/lurettetop.ml 24884 1033738731 c/1_lurettetop 1.12)
(ihm/xlurette/xlurette_glade_interface.ml 28245 1032531447 c/15_xlurette_g 1.3)
(source/ne.mli 2376 1033723811 c/22_ne.mli 1.1)
(README 74 1011881677 10_README 1.2)
(test/vrai_tram.lus 564 1027066799 b/6_vrai_tram. 1.2)
(source/env_state.ml 20707 1033125605 51_env_state. 1.29)
(source/env.mli 2028 1027349504 15_env.mli 1.15)
(source/env.mli 2027 1033738731 15_env.mli 1.16)
(doc/archi.fig 3693 1003928781 20_archi.fig 1.1)
(source/lurette.mli 448 1016027474 11_lurette.ml 1.12)
(source/gne.mli 1552 1033397911 b/36_gne.mli 1.4)
(myrules 10701 1033723811 c/14_myrules 1.7)
(source/show_env.mli 1091 1027066799 42_show_env.m 1.7)
(myrules 10701 1033738731 c/14_myrules 1.8)
(bin/Makefile.lucky 2225 1033738731 b/41_Makefile.i 1.4)
(test/giro/giro.luc 2755 1033738731 c/6_giro.ima 1.4)
(source/show_env.mli 1091 1033738731 42_show_env.m 1.8)
(Makefile.lurette 698 1032940601 b/38_Makefile.l 1.11)
(source/luc_exe.mli 447 1033738731 b/31_ima_exe.ml 1.2)
(lurette.dep.dot 49 1007651448 b/4_lurette.de 1.2)
(source/constraint.ml 2418 1033732198 c/19_constraint 1.4)
(test/vrai_tram.c 3060 1027066799 b/8_vrai_tram. 1.3)
(source/command_line.mli 1442 1031053030 b/21_command_li 1.7)
(demo/chaudiere/chaudiere.luc 446 1032789516 c/11_chaudiere. 1.5)
(source/graph.mli 2218 1027066799 13_graph.mli 1.9)
(ihm/xlurette/xlurette.glade 43485 1032531447 c/13_xlurette.g 1.4)
(test/heater_int.lus 170 1020068208 b/43_heater_int 1.1)
(source/ima_exe.mli 447 1016127950 b/31_ima_exe.ml 1.1)
(test/vrai_tram.h 2468 1027066799 b/7_vrai_tram. 1.3)
(test/tram.luc 1079 1032789516 b/15_tram.env 1.8)
(source/eval.mli 1395 1027066799 48_eval.mli 1.10)
(demo/chaudiere/chaudiere_ctrl.lus 177 1031732392 c/9_chaudiere_ 1.1)
(source/control.mli 3202 1030975671 c/3_control.ml 1.2)
......@@ -83,19 +86,16 @@
(test/ControleurPorte.c 9407 1012914629 b/19_Controleur 1.1)
(doc/automata_format 0 1007379917 b/3_automata_f 1.1)
(source/solver.mli 1003 1027092697 38_solver.mli 1.13)
(test/passerelle.ima 984 1032789516 b/17_passerelle 1.8)
(source/rnumsolver.ml 20636 1033732198 b/27_rnumsolver 1.13)
(test/usager.ima 495 1032789516 b/14_usager.env 1.9)
(source/print.ml 5807 1033723811 47_print.ml 1.21)
(test/ControleurPorte.h 2306 1012914629 b/18_Controleur 1.1)
(source/show_env.ml 3603 1030532285 43_show_env.m 1.12)
(source/ima_exe.ml 12108 1033397911 b/32_ima_exe.ml 1.19)
(source/show_env.ml 3603 1033738731 43_show_env.m 1.13)
(source/rnumsolver.mli 2198 1033732198 b/26_rnumsolver 1.9)
(source/sim2chro.ml 2721 1033397911 b/24_sim2chro.m 1.14)
(source/command_line_luc_exe.ml 2794 1033738731 b/33_command_li 1.6)
(source/value.ml 2355 1033723811 c/23_value.ml 1.1)
(test/time.exp 5580 1033732198 b/48_time.exp 1.10)
(bin/Makefile.ima_exe 2013 1027066799 b/41_Makefile.i 1.3)
(test/time.exp 5580 1033738731 b/48_time.exp 1.11)
(test/giro/allocator.lus 1087 1031732392 c/5_allocator. 1.1)
(demo/chaudiere/chaudiere.ima 446 1032789516 c/11_chaudiere. 1.5)
(bin/Makefile.show_luc 1109 1033738731 b/40_Makefile.s 1.5)
(lurette.depfull.dot 49 1007651448 b/5_lurette.de 1.2)
(ID_EN_VRAC 2184 1002196285 0_ID_EN_VRAC 1.1)
LUSTRE-MISC = /usr/local/tools/lustre-misc/
lib:
make -f Makefile.lurette_lib OCAMLFLAGS=""
make -f Makefile.lurette_lib OCAMLFLAGS="-noassert -unsafe"
lib_debug:
make -f Makefile.lurette_lib dc OCAMLFLAGS=""
lib_nc:
make nc -f Makefile.lurette_lib OCAMLFLAGS="-noassert -unsafe"
lib_clean:
make -f Makefile.lurette_lib clean
ima:
make -k dc -f Makefile.ima_exe OCAMLFLAGS=""
lucky_debug:
make -k dc -f Makefile.lucky OCAMLFLAGS=""
lucky:
make -k -f Makefile.lucky OCAMLFLAGS="-noassert -unsafe"
luc:lucky
lucky:
make -k dc -f Makefile.lucky OCAMLFLAGS=""
ltop_debug:
make -k dc -f Makefile.lurettetop OCAMLFLAGS=""
ltop:
make -k dc -f Makefile.lurettetop OCAMLFLAGS=""
make -k -f Makefile.lurettetop OCAMLFLAGS="-noassert -unsafe"
show:
make -k dc -f Makefile.show_ima OCAMLFLAGS=""
make -k -f Makefile.show_luc OCAMLFLAGS="-noassert -unsafe"
stubs:
make -k dc -f Makefile.gen_stubs OCAMLFLAGS=""
make -k -f Makefile.gen_stubs OCAMLFLAGS="-noassert -unsafe"
all: lib ima ltop show
all: lib lucky ltop show stubs
clean_all:
make -k clean -f Makefile.ima_exe ; \
clean:
make -k clean -f Makefile.gen_stubs ; \
make -k clean -f Makefile.lucky ; \
make -k clean -f Makefile.lurettetop ; \
make -k clean -f Makefile.lurette_lib ; \
make -k clean -f Makefile.show_ima
make -k clean -f Makefile.show_luc
ima_nc:
make -k nc -f Makefile.ima_exe OCAMLFLAGS="-noassert -unsafe"
install_lustre_misc: all
cp gen_stubs $(LUSTRE-MISC)/bin ; \
cp lucky $(LUSTRE-MISC)/bin ; \
cp show_luc $(LUSTRE-MISC)/bin ; \
cp lurettetop $(LUSTRE-MISC)/bin ; \
cp lurette.a $(LUSTRE-MISC)/lib/lucky ; \
cp lurette.cmxa $(LUSTRE-MISC)/lib/lucky ; \
cp lurette_lib.a $(LUSTRE-MISC)/lib/lucky ; \
cp lurette_lib.cma $(LUSTRE-MISC)/lib/lucky ; \
cp lurette_lib.cmxa $(LUSTRE-MISC)/lib/lucky
#
# Makefile for ima_exe based on OcamlMakefile
# Makefile for luc_exe based on OcamlMakefile
#
LURETTE_PATH = ..
......@@ -28,7 +28,10 @@ USE_CAMLP4 = yes
SOURCES_OCAML = \
$(LURETTE_PATH)/source/util.ml \
$(LURETTE_PATH)/source/graph.mli $(LURETTE_PATH)/source/graph.ml \
$(LURETTE_PATH)/source/command_line_ima_exe.mli $(LURETTE_PATH)/source/command_line_ima_exe.ml \
$(LURETTE_PATH)/source/command_line_luc_exe.mli $(LURETTE_PATH)/source/command_line_luc_exe.ml \
$(LURETTE_PATH)/source/value.mli $(LURETTE_PATH)/source/value.ml \
$(LURETTE_PATH)/source/ne.mli $(LURETTE_PATH)/source/ne.ml \
$(LURETTE_PATH)/source/constraint.mli $(LURETTE_PATH)/source/constraint.ml \
$(LURETTE_PATH)/source/formula.mli $(LURETTE_PATH)/source/formula.ml \
$(LURETTE_PATH)/source/gne.mli $(LURETTE_PATH)/source/gne.ml \
$(LURETTE_PATH)/source/control.mli $(LURETTE_PATH)/source/control.ml \
......@@ -41,13 +44,13 @@ SOURCES_OCAML = \
$(LURETTE_PATH)/source/print.mli $(LURETTE_PATH)/source/print.ml \
$(LURETTE_PATH)/source/sim2chro.mli $(LURETTE_PATH)/source/sim2chro.ml \
$(LURETTE_PATH)/source/env.mli $(LURETTE_PATH)/source/env.ml \
$(LURETTE_PATH)/source/ima_exe.mli $(LURETTE_PATH)/source/ima_exe.ml
$(LURETTE_PATH)/source/luc_exe.mli $(LURETTE_PATH)/source/luc_exe.ml
SOURCES = $(SOURCES_C) \
$(SOURCES_OCAML)
RESULT = ima_exe
RESULT = lucky
-include $(OCAMLMAKEFILE)
......
......@@ -23,16 +23,17 @@ USE_CAMLP4 = yes
SOURCES_OCAML = \
$(LURETTE_PATH)/source/util.ml \
$(LURETTE_PATH)/source/value.mli $(LURETTE_PATH)/source/value.ml \
$(LURETTE_PATH)/source/graph.mli $(LURETTE_PATH)/source/graph.ml \
$(LURETTE_PATH)/source/formula.mli $(LURETTE_PATH)/source/formula.ml \
$(LURETTE_PATH)/source/control.mli $(LURETTE_PATH)/source/control.ml \
$(LURETTE_PATH)/source/parse_env.mli $(LURETTE_PATH)/source/parse_env.ml \
$(LURETTE_PATH)/source/show_env.mli $(LURETTE_PATH)/source/show_env.ml \
$(LURETTE_PATH)/source/show_ima.ml
$(LURETTE_PATH)/source/show_luc.ml
SOURCES = $(SOURCES_OCAML)
RESULT = show_ima
RESULT = show_luc
-include $(OCAMLMAKEFILE)
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette")
(Project-Version lurette 0 100)
(Parent-Version lurette 0 99)
(Project-Version lurette 0 101)
(Parent-Version lurette 0 100)
(Version-Log "
Rename any occurence of ima by luc or lucky.
source/gen_stubs:
Make sure we are in the rigth directory we calling lus2ec and ec2c.
")
(New-Version-Log ""
)
(Checkin-Time "Fri, 04 Oct 2002 14:21:28 +0200")
(Checkin-Time "Fri, 04 Oct 2002 15:38:51 +0200")
(Checkin-Login jahier)
(Populate-Ignore ())
(Project-Keywords)
......@@ -20,25 +19,25 @@ source/gen_stubs:
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; 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.19 644))
;; Sources files for luc_exe
(source/luc_exe.mli (lurette/b/31_ima_exe.ml 1.2 644))
(source/luc_exe.ml (lurette/b/32_ima_exe.ml 1.20 644))
(source/command_line_ima_exe.ml (lurette/b/33_command_li 1.5 644))
(source/command_line_ima_exe.mli (lurette/b/34_command_li 1.3 644))
(source/command_line_luc_exe.ml (lurette/b/33_command_li 1.6 644))
(source/command_line_luc_exe.mli (lurette/b/34_command_li 1.4 644))
;; Sources files for lurette only
(source/lurette.mli (lurette/11_lurette.ml 1.12 644))
(source/lurette.ml (lurette/12_lurette.ml 1.53 644))
(source/lurette.ml (lurette/12_lurette.ml 1.54 644))
(source/command_line.ml (lurette/b/20_command_li 1.8 644))
(source/command_line.mli (lurette/b/21_command_li 1.7 644))
;; Sources files common to lurette and ima_exe
;; Sources files common to lurette and luc_exe
(source/graph.mli (lurette/13_graph.mli 1.9 644))
(source/graph.ml (lurette/14_graph.ml 1.7 644))
(source/env.mli (lurette/15_env.mli 1.15 644))
(source/env.mli (lurette/15_env.mli 1.16 644))
(source/env.ml (lurette/16_env.ml 1.29 644))
(source/util.ml (lurette/35_util.ml 1.27 644))
......@@ -49,11 +48,11 @@ source/gen_stubs:
(source/rnumsolver.mli (lurette/b/26_rnumsolver 1.9 644))
(source/rnumsolver.ml (lurette/b/27_rnumsolver 1.13 644))
(source/parse_env.mli (lurette/40_parse_env. 1.9 644))
(source/parse_env.mli (lurette/40_parse_env. 1.10 644))
(source/parse_env.ml (lurette/41_parse_env. 1.29 644))
(source/show_env.mli (lurette/42_show_env.m 1.7 644))
(source/show_env.ml (lurette/43_show_env.m 1.12 644))
(source/show_env.mli (lurette/42_show_env.m 1.8 644))
(source/show_env.ml (lurette/43_show_env.m 1.13 644))
(source/formula.mli (lurette/44_formula.ml 1.18 644))
(source/formula.ml (lurette/45_formula.ml 1.21 644))
......@@ -67,7 +66,7 @@ source/gen_stubs:
(source/env_state.mli (lurette/50_env_state. 1.24 644))
(source/env_state.ml (lurette/51_env_state. 1.29 644))
(source/automata.mli (lurette/b/46_automata.m 1.2 644))
(source/automata.mli (lurette/b/46_automata.m 1.3 644))
(source/automata.ml (lurette/b/47_automata.m 1.5 644))
(source/sim2chro.mli (lurette/b/23_sim2chro.m 1.5 644))
......@@ -76,7 +75,7 @@ source/gen_stubs:
(source/gne.mli (lurette/b/36_gne.mli 1.4 644))
(source/gne.ml (lurette/b/37_gne.ml 1.4 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.11 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.12 644))
(source/gen_stubs.ml (lurette/24_generate_l 1.37 644))
(source/control.mli (lurette/c/3_control.ml 1.2 644))
......@@ -97,13 +96,13 @@ source/gen_stubs:
;; Make files
(OcamlMakefile (lurette/17_OcamlMakef 1.42 644))
(Makefile.lurette (lurette/b/38_Makefile.l 1.11 644))
(myrules (lurette/c/14_myrules 1.7 644))
(myrules (lurette/c/14_myrules 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))
(bin/Makefile.show_luc (lurette/b/40_Makefile.s 1.5 644))
(bin/Makefile.lucky (lurette/b/41_Makefile.i 1.4 644))
(bin/Makefile.gen_stubs (lurette/b/42_Makefile.g 1.2 644))
(bin/Makefile.lurette_lib (lurette/c/2_Makefile.l 1.4 644))
(bin/Makefile (lurette/c/20_Makefile 1.2 644))
(bin/Makefile (lurette/c/20_Makefile 1.3 644))
;; Documentation
(doc/Interface_draft (lurette/19_Interface_ 1.1 644))
......@@ -120,16 +119,16 @@ source/gen_stubs:
(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.10 644))
(test/time.res (lurette/b/49_time.res 1.13 644))
(test/time.exp (lurette/b/48_time.exp 1.11 644))
(test/time.res (lurette/b/49_time.res 1.14 644))
;; Various files used for testing purposes
(test/usager.ima (lurette/b/14_usager.env 1.9 644))
(test/tram.ima (lurette/b/15_tram.env 1.8 644))
(test/porte.ima (lurette/b/16_porte.env 1.8 644))
(test/passerelle.ima (lurette/b/17_passerelle 1.8 644))
(test/temp_int.ima (lurette/b/50_temp_int.e 1.3 644))
(test/temp_float.ima (lurette/b/51_temp_float 1.3 644))
(test/usager.luc (lurette/b/14_usager.env 1.9 644))
(test/tram.luc (lurette/b/15_tram.env 1.8 644))
(test/porte.luc (lurette/b/16_porte.env 1.8 644))
(test/passerelle.luc (lurette/b/17_passerelle 1.8 644))
(test/temp_int.luc (lurette/b/50_temp_int.e 1.3 644))
(test/temp_float.luc (lurette/b/51_temp_float 1.3 644))
(test/ControleurPorte.h (lurette/b/18_Controleur 1.1 644))
(test/ControleurPorte.c (lurette/b/19_Controleur 1.1 644))
......@@ -160,7 +159,7 @@ source/gen_stubs:
;; to version 0.83(w), by jahier:
(test/giro/allocator.lus (lurette/c/5_allocator. 1.1 644))
(test/giro/giro.ima (lurette/c/6_giro.ima 1.3 644))
(test/giro/giro.luc (lurette/c/6_giro.ima 1.4 644))
(test/giro/onlyroll.lus (lurette/c/7_onlyroll.l 1.1 644))
;; Files added by populate at Wed, 04 Sep 2002 09:47:29 +0200,
......@@ -169,7 +168,7 @@ source/gen_stubs:
(demo/chaudiere/chaudiere_oracle.lus (lurette/c/8_chaudiere_ 1.1 644))
(demo/chaudiere/chaudiere_ctrl.lus (lurette/c/9_chaudiere_ 1.1 644))
(demo/chaudiere/buggy_chaudiere_ctrl.lus (lurette/c/10_buggy_chau 1.1 644))
(demo/chaudiere/chaudiere.ima (lurette/c/11_chaudiere. 1.5 644))
(demo/chaudiere/chaudiere.luc (lurette/c/11_chaudiere. 1.5 644))
)
(Merge-Parents)
......
......@@ -42,8 +42,8 @@ yvan:
vroum:
../make_lurette -sut ControleurPorte -oracle vrai_tram nc; \
/usr/bin/time -v ./lurette 10000 1 1 tram.ima usager.ima porte.ima \
passerelle.ima -seed 1015403953 -ns2c --no-oracle
/usr/bin/time -v ./lurette 10000 1 1 tram.luc usager.luc porte.luc \
passerelle.luc -seed 1015403953 -ns2c --no-oracle
vroum2:
/usr/bin/time -v lurettetop -seed 1015403953 -ns2c -sut ControleurPorte \
......@@ -57,27 +57,27 @@ giro:
time:
make clean; ../make_lurette ControleurPorte vrai_tram nc; \
\rm -f time.res; touch time.res ; \
/usr/bin/time -o time.res -a -v ./lurette 10000 1 1 tram.ima usager.ima porte.ima \
passerelle.ima -seed 1015403953 -ns2c --no-oracle ;\
/usr/bin/time -o time.res -a -v ./lurette 10000 1 1 tram.luc usager.luc porte.luc \
passerelle.luc -seed 1015403953 -ns2c --no-oracle ;\
echo " " >> time.res;\
/usr/bin/time -o time.res -a -v ./lurette 10 100 100 tram.ima usager.ima porte.ima \
passerelle.ima -seed 1015403953 -ns2c --no-oracle ;\
/usr/bin/time -o time.res -a -v ./lurette 10 100 100 tram.luc usager.luc porte.luc \
passerelle.luc -seed 1015403953 -ns2c --no-oracle ;\
echo " " >> time.res;\
/usr/bin/time -o time.res -a -v ./lurette 100 50 50 tram.ima usager.ima porte.ima \
passerelle.ima -seed 1015403953 -ns2c --no-oracle ;\
/usr/bin/time -o time.res -a -v ./lurette 100 50 50 tram.luc usager.luc porte.luc \
passerelle.luc -seed 1015403953 -ns2c --no-oracle ;\
echo " " >> time.res;\
../make_lurette heater_float always_true_heaterf nc; \
/usr/bin/time -o time.res -a -v ./lurette 10000 1 1 temp_float.ima -seed 1015403953 \
/usr/bin/time -o time.res -a -v ./lurette 10000 1 1 temp_float.luc -seed 1015403953 \
-ns2c --no-oracle ;\
echo " " >> time.res;\
/usr/bin/time -o time.res -a -v ./lurette 10 100 100 temp_float.ima -seed 1015403953 \
/usr/bin/time -o time.res -a -v ./lurette 10 100 100 temp_float.luc -seed 1015403953 \
-ns2c --no-oracle ;\
echo " " >> time.res;\
../make_lurette heater_int always_true_heater nc; \
/usr/bin/time -o time.res -a -v ./lurette 10000 1 1 temp_int.ima -seed 1015403953 \
/usr/bin/time -o time.res -a -v ./lurette 10000 1 1 temp_int.luc -seed 1015403953 \
-ns2c --no-oracle ;\
echo " " >> time.res;\
/usr/bin/time -o time.res -a -v ./lurette 10 100 100 temp_int.ima -seed 1015403953 \
/usr/bin/time -o time.res -a -v ./lurette 10 100 100 temp_int.luc -seed 1015403953 \
-ns2c --no-oracle ;\
\rm -f time.diff; diff -u time.exp time.res >> time.diff; cat time.diff
......@@ -109,18 +109,18 @@ test: test1 test2 test3
lib:
pushd ~/lurette/bin ; make -f Makefile.lurette_lib OCAMLFLAGS=""; popd
ima:
pushd ~/lurette/bin ; make -k dc -f Makefile.ima_exe OCAMLFLAGS=""; popd
luc:
pushd ~/lurette/bin ; make -k dc -f Makefile.luc_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
luc_nc:
pushd ~/lurette/bin ; make -k clean -f Makefile.luc_exe ; \
make -k nc -f Makefile.luc_exe OCAMLFLAGS="-noassert -unsafe"; popd
show:
pushd ~/lurette/bin ; make -k dc -f Makefile.show_ima OCAMLFLAGS=""; popd
pushd ~/lurette/bin ; make -k dc -f Makefile.show_luc OCAMLFLAGS=""; popd
heater_make:
$(LURETTE_PATH)/make_lurette heater_int
......@@ -135,19 +135,19 @@ heaterf:
# In order to time profile lurette
gprof:
$(LURETTE_PATH)/make_lurette ControleurPorte -oracle vrai_tram pnc; \
./lurette 10000 1 1 tram.ima usager.ima porte.ima passerelle.ima \
./lurette 10000 1 1 tram.luc usager.luc porte.luc passerelle.luc \
-seed 1014422484 -ns2c ;\
gprof ./lurette > lurette.gprof ; \
echo " ---> The result of the profiling is in the lurette.gprof file"
gprof2:
make clean; ../make_lurette -sut heater_float -oracle always_true_heaterf pnc; \
./lurette 10000 1 1 temp_float.ima -seed 1015403953 \
./lurette 10000 1 1 temp_float.luc -seed 1015403953 \
-ns2c --no-oracle ;\
gprof ./lurette > lurette.gprof2 ; \
echo " ---> The result of the profiling is in the lurette.gprof file"
gprof3:
make clean; $(LURETTE_PATH)/make_lurette heater_float -oracle always_true_heaterf pnc; \
./lurette 1000 1 1 temp_float.ima -seed 1015403953 \
./lurette 1000 1 1 temp_float.luc -seed 1015403953 \
-ns2c --no-oracle ;\
gprof ./lurette > lurette.gprof3 ; \
echo " ---> The result of the profiling is in the lurette.gprof file"
......@@ -155,7 +155,7 @@ gprof3:
# In order to time profile lurette
ocamlprof:
$(LURETTE_PATH)/make_lurette heater_float -oracle vrai_heater_float pbc; \
./lurette 10 10 10 temp_float.ima -ns2c ;\
./lurette 10 10 10 temp_float.luc -ns2c ;\
ocamlprof ../source/solver.ml > prof/solver.count.ml ; \
ocamlprof ../source/automata.ml > prof/automata.count.ml ; \
ocamlprof ../source/env.ml > prof/env.count.ml ; \
......@@ -190,8 +190,8 @@ docman:
install:
pushd bin; \
make -f Makefile.gen_stubs ;\
make -f Makefile.show_ima ;\
make -f Makefile.ima_exe ; popd
make -f Makefile.show_luc ;\
make -f Makefile.luc_exe ; popd
release:
rm -rf lurette-release ; \
......@@ -199,11 +199,11 @@ release:
mkdir lurette-release/ihm ;mkdir lurette-release/ihm/xlurette \
mkdir lurette-release/source ; mkdir lurette-release/test ; \
cp $(LURETTE_PATH)/source/util.ml $(LURETTE_PATH)/source/gen_stubs.ml \
$(LURETTE_PATH)/source/show_ima.ml \
$(LURETTE_PATH)/source/show_luc.ml \
$(LURETTE_PATH)/source/graph.mli $(LURETTE_PATH)/source/graph.ml \
$(LURETTE_PATH)/source/control.mli $(LURETTE_PATH)/source/control.ml \
$(LURETTE_PATH)/source/ima_exe.mli $(LURETTE_PATH)/source/ima_exe.ml \
$(LURETTE_PATH)/source/command_line_ima_exe.mli $(LURETTE_PATH)/source/command_line_ima_exe.ml \
$(LURETTE_PATH)/source/luc_exe.mli $(LURETTE_PATH)/source/luc_exe.ml \
$(LURETTE_PATH)/source/command_line_luc_exe.mli $(LURETTE_PATH)/source/command_line_luc_exe.ml \
$(LURETTE_PATH)/source/command_line.mli $(LURETTE_PATH)/source/command_line.ml \
$(LURETTE_PATH)/source/constraint.mli $(LURETTE_PATH)/source/constraint.ml \
$(LURETTE_PATH)/source/value.mli $(LURETTE_PATH)/source/value.ml \
......@@ -232,12 +232,12 @@ release:
cp $(LURETTE_PATH)/myrukes lurette-release/ ;\
cp $(LURETTE_PATH)/OcamlMakefile lurette-release/ ;\
cp $(LURETTE_PATH)/Makefile lurette-release/ ;\
cp $(LURETTE_PATH)/test/usager.ima lurette-release/test/;\
cp $(LURETTE_PATH)/test/temp_int.ima lurette-release/test/;\
cp $(LURETTE_PATH)/test/temp_float.ima lurette-release/test/;\
cp $(LURETTE_PATH)/test/tram.ima lurette-release/test/;\
cp $(LURETTE_PATH)/test/porte.ima lurette-release/test/;\
cp $(LURETTE_PATH)/test/passerelle.ima lurette-release/test/;\
cp $(LURETTE_PATH)/test/usager.luc lurette-release/test/;\
cp $(LURETTE_PATH)/test/temp_int.luc lurette-release/test/;\
cp $(LURETTE_PATH)/test/temp_float.luc lurette-release/test/;\
cp $(LURETTE_PATH)/test/tram.luc lurette-release/test/;\
cp $(LURETTE_PATH)/test/porte.luc lurette-release/test/;\
cp $(LURETTE_PATH)/test/passerelle.luc lurette-release/test/;\
cp $(LURETTE_PATH)/test/heater_int.lus lurette-release/test/;\
cp $(LURETTE_PATH)/test/heater_float.lus lurette-release/test/;\
cp $(LURETTE_PATH)/test/ControleurPorte.ec lurette-release/test/;\
......@@ -247,7 +247,7 @@ release:
cp $(LURETTE_PATH)/test/Makefile lurette-release/test/;\
cp $(LURETTE_PATH)/test/test_gen_stubs.h lurette-release/test/;\
cp $(LURETTE_PATH)/Makefile.lurette lurette-release/ ;\
cp $(LURETTE_PATH)/bin/Makefile.show_ima lurette-release/bin/ ;\
cp $(LURETTE_PATH)/bin/Makefile.show_luc lurette-release/bin/ ;\
cp $(LURETTE_PATH)/bin/Makefile.gen_stubs lurette-release/bin/ ;\
cp $(LURETTE_PATH)/bin/Makefile.ima_exe lurette-release/bin/ ;\
cp $(LURETTE_PATH)/bin/Makefile.luc_exe lurette-release/bin/ ;\
tar cvfz lurette$(VERSION).tgz lurette-release/*
......@@ -11,7 +11,7 @@
type t
(** [Automata.t] is an ADT containing an acyclic sub-automata (ie a
tree) of an ima made of a node and its immediate successors in the
tree) of a ima made of a node and its immediate successors in the
ima. Those [automata] are recomputed at each step and are used to
draw (Several) formula.
......
......@@ -4,7 +4,7 @@
** Public License
**-----------------------------------------------------------------------
**
** File: command_line_ima_exe.ml
** File: command_line_luc_exe.ml
** Main author: jahier@imag.fr
*)
......@@ -41,8 +41,8 @@ let (option_to_usage: cmd_line_optionT -> string) =
fun opt ->
match opt with
Boot -> "The automata starts generating values.\n"
| ShowAut -> "Run ima_exe showing the ima automata step.\n"
| NoShowAut -> "Do not show the ima automata (Default).\n"
| ShowAut -> "Run luc_exe showing the lucky automata step.\n"
| NoShowAut -> "Do not show the luc automata (Default).\n"
| Seed -> "Set the value of the seed the random engine is initialized with (0 lets the system draw a seed).\n"
| Verbose -> "Set on a verbose mode.\n"
......@@ -70,16 +70,16 @@ let usage_options =
(List.rev (group_common_options string_to_option))
let usage =
("\n\nusage: ./ima_exe [options]* <file>.ima ([x] <file>.ima)* \n" ^
("\n\nusage: ./luc_exe [options]* <file>.luc ([x] <file>.luc)* \n" ^
" where: " ^
"\n\t o `<file>.ima contains an environment automata. Environments " ^
"\n\t o `<file>.luc contains an environment automata. Environments " ^
"\n\t separated by `x' will executed as if their automata where " ^
"\n\t multiplied (necessary if they have common output variables).\n " ^
"\n\t o `options' is a list of options. The available options are: " ^
usage_options ^ "\n\n" ^
"Example: ./ima_exe env1.ima x env2.ima x env3.ima env4\n\t" ^
"Example: ./luc_exe env1.luc x env2.luc x env3.luc env4\n\t" ^
"will run the environment `env1', `env2', and `env3' as a product, \n\t" ^
"and `env4' in parallel.\n\n ")
......@@ -92,6 +92,6 @@ let cmd_line_string_to_int str errmsg =
print_string usage ;
print_string errmsg ;
flush stdout ;
failwith "\n *** Error when calling ima_exe.\n"
failwith "\n *** Error when calling luc_exe.\n"
......@@ -4,7 +4,7 @@
** Public License
**-----------------------------------------------------------------------
**
** File: command_line_iùa_exe.mli
** File: command_line_luc_exe.mli
** Main author: jahier@imag.fr
*)
......@@ -20,7 +20,7 @@ type optionsT = {
}
val usage : string
(** Usage message to be printed if an error occur when ima_exe is called. *)
(** Usage message to be printed if an error occur when luc_exe is called. *)
val cmd_line_string_to_int : string -> string -> int
(** [cmd_line_string_to_int str errmsg] converts a string (of the
......
......@@ -9,7 +9,7 @@
*)
(** Environment automata interpreter. Environment automata are
labelled by weighted formula. Automata are read from an [*.ima]
labelled by weighted formula. Automata are read from an [*.luc]
file that has been produced by a third party tool, e.g., a Lutin
or a Lustre program.
......
......@@ -4,7 +4,7 @@
** Public License
**-----------------------------------------------------------------------
**
** File: ima_exe.ml
** File: luc_exe.ml
** Author: jahier@imag.fr