Commit 89aedffe authored by Erwan Jahier's avatar Erwan Jahier

lurette 1.45 Mon, 22 Sep 2008 18:20:01 +0200 by jahier

Parent-Version:      1.44
Version-Log:

Fix an embarassing bug in the integer solver (in dimension 1).

Project-Description: Lurette
parent b6379be0
......@@ -84,18 +84,18 @@
(examples/xlurette/Sildex/sut_sildex.h 1434 1138025047 o/22_sut_sildex 1.1)
(source/lurette_debug.ml 19050 1137765987 n/36_lurette_de 1.1)
(source/var.ml 7224 1137765987 g/49_var.ml 1.14)
(OcamlMakefile 21300 1149596800 17_OcamlMakef 1.55)
(OcamlMakefile 21266 1222100401 17_OcamlMakef 1.56)
(xlurette/Scade/LuretteGUILauncher.tcl 75984 1165588586 i/28_LuretteGUI 1.1.1.1)
(install/pixmaps/quit.xpm 494 1137765987 n/18_quit.xpm 1.1)
(examples/luckyDraw/ocaml/draw-ex.ml 3137 1165588586 l/8_draw-ex.ml 1.2)
(examples/xlurette/heater/buggy_heater_ctrl.lus 219 1137765987 m/10_buggy_heat 1.1)
(Makefile 694 1196761662 d/13_Makefile 1.14)
(Makefile 956 1222100401 d/13_Makefile 1.15)
(xlurette/Scade/Images/lurun.bmp 822 1122044801 i/22_lurun.bmp 1.1)
(examples/xlurette/heater/temp_float.luc 704 1137765987 m/9_temp_float 1.1)
(install/pixmaps/config-params.xpm 2753 1137765987 n/12_config-par 1.1)
(source/exp.mli 3611 1127735479 g/48_exp.mli 1.8)
(examples/xlurette/Gyro/giro2.luc 2836 1137765987 m/41_giro2.luc 1.1)
(source/lustreExp.ml 41154 1165588586 g/45_lustreExp. 1.14.2.1)
(source/lustreExp.ml 40451 1222100401 g/45_lustreExp. 1.14.2.2)
(source/Makefile.luc2c 1358 1172658530 n/45_Makefile.l 1.3)
(GBDDML/gbdd.cc 50849 1172658530 r/34_gbdd.cc 1.2)
(FAQ 2004 1137765987 i/15_FAQ 1.2)
......@@ -114,11 +114,11 @@
(source/Ezdl.mli 4044 1127735479 j/18_Ezdl.mli 1.1)
(examples/lucky/other/Makefile 1554 1165855990 k/47_Makefile 1.2)
(examples/xlurette/Scade-win32/Pilot.saofd 3645 1137765987 l/46_Pilot.saof 1.1)
(source/value.ml 2681 1078751438 c/23_value.ml 1.9)
(source/value.ml 2839 1222100401 c/23_value.ml 1.10)
(GBDDML/._d/bdd.d 0 1170322322 r/41_bdd.d 1.1)
(examples/xlurette/Scade-win32/det_mvt_mode_cstext.c 703 1137765987 l/42_det_mvt_mo 1.1)
(GBDDML/gbdd.h 30899 1172658530 r/33_gbdd.h 1.2)
(source/var.mli 3632 1127735479 g/50_var.mli 1.13)
(source/var.mli 3638 1222100401 g/50_var.mli 1.14)
(examples/xlurette/tram/passerelle.luc 641 1138025047 o/17_passerelle 1.1)
(examples/xlurette/Gyro/onlyroll2.lus 18345 1137765987 m/30_onlyroll2. 1.1)
(polka/caml/polkaIO.mli 1517 1047029868 d/43_polkaIO.ml 1.1)
......@@ -128,11 +128,11 @@
(examples/lucky/tut-examples/simple.luc 174 1137765987 k/27_simple.luc 1.1)
(GBDDML/OCamlMakefile 21208 1170322322 r/37_OCamlMakef 1.1)
(doc/figs/nh-lurette-start.fig 2042 1138034376 q/49_nh-lurette 1.1)
(examples/rml/Makefile 754 1196700198 k/13_Makefile 1.1.1.3)
(examples/rml/Makefile 736 1222100401 k/13_Makefile 1.1.1.4)
(source/solver.mli 1793 1137765987 38_solver.mli 1.25)
(examples/xlurette/heater/Makefile 1812 1165855990 m/18_Makefile 1.2)
(xlurette/Scade/tcldemo.def 38 1122044801 j/10_tcldemo.de 1.1)
(README-luc4ocaml 1304 1137765987 j/37_README-luc 1.1)
(README-luc4ocaml 1785 1222100401 j/37_README-luc 1.2)
(examples/xlurette/Sildex/Makefile 757 1196700198 o/29_Makefile 1.2)
(examples/xlurette/fault-tolerant-heater/sensors.luc 639 1196700198 h/18_sensors.lu 1.4)
(doc/automata_format 0 1007379917 b/3_automata_f 1.1)
......@@ -141,7 +141,7 @@
(doc/tutorial/heater_control.tex 2712 1138032075 q/31_heater_con 1.1)
(examples/ocaml/crazy-rabbit/rabbit-dir-line.luc 937 1137765987 j/46_rabbit-dir 1.1)
(utils/rif.el 1780 1137765987 j/34_rif.el 1.1)
(source/luckyDraw.ml 12835 1165588586 i/37_luckyDraw. 1.3.1.1)
(source/luckyDraw.ml 12796 1222100401 i/37_luckyDraw. 1.3.1.2)
(examples/rml/window.rml 1455 1196700198 k/8_window.rml 1.2)
(examples/xlurette/heater/heater_ctrl.lus 175 1137765987 m/6_heater_ctr 1.1)
(install/pixmaps/myrun.bmp 44098 1137765987 m/44_myrun.bmp 1.1)
......@@ -171,13 +171,13 @@
(doc/Interface_draft 5232 1003928781 19_Interface_ 1.1)
(polka/C/main.tex 1961 1047029868 e/14_main.tex 1.1)
(doc/figs/components-diagram.fig 2404 1138034376 r/6_components 1.1)
(source/luc_exe.ml 12023 1149596800 b/32_ima_exe.ml 1.59)
(source/luc_exe.ml 12049 1222100401 b/32_ima_exe.ml 1.60)
(source/Makefile.gnuplot-socket 416 1138025047 i/32_Makefile.g 1.2)
(polka/caml/polkaIO.ml 1651 1071844798 d/44_polkaIO.ml 1.2)
(GBDDML/bdd.mli.hide 1654 1170322322 r/35_bdd.mli.hi 1.1)
(examples/xlurette/Scade-win32/lib_pilot.vsw 435 1137765987 l/32_lib_pilot. 1.1)
(source/gnuplot-socket.ml 1773 1137765987 i/18_gnuplot-so 1.3)
(source/Makefile.lucky 4858 1196700198 b/41_Makefile.i 1.39.1.3)
(source/Makefile.lucky 4985 1222100401 b/41_Makefile.i 1.39.1.4)
(examples/lucky/other/time-joly.res 789 1137765987 k/31_time-joly. 1.1)
(examples/lucky/lustre/test.rif.exp 200 1165507939 r/26_test.rif.e 1.1)
(source/lurette.plot 684 1137765987 n/37_lurette.pl 1.1)
......@@ -229,13 +229,13 @@
(source/parse_c_scade.ml 9724 1149596800 e/41_parse_c_sc 1.10)
(source/bddd.mli 1232 1137765987 g/37_bddd.mli 1.12)
(test/time-rey.exp 10176 1090504025 h/13_time-rey.e 1.10)
(source/gne.mli 1887 1127735479 b/36_gne.mli 1.9)
(source/gne.mli 2028 1222100401 b/36_gne.mli 1.10)
(install/lurettetop.in 828 1127735479 j/30_lurettetop 1.1)
(source/luc4ocaml_nolbl.mli 564 1137765987 i/38_lucaml_nol 1.2)
(source/Makefile. 2 1137765987 n/32_Makefile. 1.1)
(source/run_aut.ml 11496 1137765987 b/47_automata.m 1.33)
(examples/xlurette/Scade-win32/Pilot.etp 2175 1137765987 l/47_Pilot.etp 1.1)
(source/draw.ml 13264 1137765987 f/2_draw.ml 1.7)
(source/draw.ml 13299 1222100401 f/2_draw.ml 1.8)
(source/graphUtil.ml 3616 1149596800 n/34_graphUtil. 1.2)
(examples/lucky/tut-examples/mandatory.luc 242 1137765987 k/28_mandatory. 1.1)
(examples/lucky/external_code/test.rif.exp 349 1137765987 k/19_test.rif.e 1.1)
......@@ -256,7 +256,7 @@
(source/run_aut.mli 3254 1137765987 b/46_automata.m 1.15)
(LIMITATIONS 1291 1149596800 r/10_LIMITATION 1.1)
(source/graph.mli 2451 1088432998 13_graph.mli 1.15)
(source/parser.mly 6912 1137765987 h/19_parser.mly 1.4)
(source/parser.mly 6911 1222100401 h/19_parser.mly 1.5)
(install/pixmaps/stop.bmp 238 1137765987 m/42_stop.bmp 1.1)
(examples/ocaml/crazy-rabbit/rabbit-speed.luc 1150 1137765987 k/1_rabbit-spe 1.1)
(doc/tutorial/tutorial.tex 23076 1138032075 q/25_tutorial.t 1.1)
......@@ -278,7 +278,7 @@
(install/pixmaps/env.bmp 2042754 1137765987 m/45_env.bmp 1.1)
(examples/xlurette/Scade-win32/Control.saofd 6690 1137765987 l/51_Control.sa 1.1)
(source/luc4c_caml.ml 712 1149596800 r/14_luc4c_caml 1.1)
(source/luckyDraw.mli 5107 1165855990 i/36_luckyDraw. 1.3.1.2)
(source/luckyDraw.mli 5160 1222100401 i/36_luckyDraw. 1.3.1.3)
(examples/lucky/tut-examples/simpler.luc 167 1137765987 k/26_simpler.lu 1.1)
(install/pixmaps/batch.xpm 456 1137765987 n/13_batch.xpm 1.1)
(source/genlex.mli 3153 1122044801 h/23_genlex.mli 1.2)
......@@ -288,7 +288,7 @@
(source/show_env.ml 3458 1137765987 43_show_env.m 1.24)
(ID_EN_VRAC 2184 1002196285 0_ID_EN_VRAC 1.1)
(examples/lucky/other/test2.rif.exp 400 1137765987 k/38_test2.rif. 1.1)
(source/formula_to_bdd.ml 22536 1137765987 g/34_formula_to 1.13)
(source/formula_to_bdd.ml 22535 1222100401 g/34_formula_to 1.14)
(source/Makefile.lurette_ocaml_lib 2978 1137765987 j/1_Makefile.l 1.2)
(examples/ocaml/crazy-rabbit/rabbit.ml 8853 1196700198 k/4_rabbit.ml 1.3)
(doc/figs/heater_sensors.fig 2392 1138034376 r/4_heater_sen 1.1)
......@@ -308,9 +308,9 @@
(GBDDML/Makefile 3166 1172658530 r/30_Makefile 1.2)
(examples/rml/window.out.exp 2210 1137765987 k/6_window.out 1.1)
(examples/xlurette/heater/test1.res 0 1137765987 m/22_test1.res 1.1)
(source/version.ml 21 1196761662 n/43_version.ml 1.11)
(source/version.ml 15 1222100401 n/43_version.ml 1.12)
(examples/xlurette/Scade-win32/Pilot.ewo 785 1137765987 l/28_Pilot.ewo 1.1)
(RELEASE-NOTES 3737 1165588586 h/45_RELEASE-NO 1.7.1.1)
(RELEASE-NOTES 3896 1222100401 h/45_RELEASE-NO 1.7.1.2)
(examples/lucky/C/test.res 0 1149596800 r/18_test.res 1.1)
(source/Ezdl_c.c 10643 1127735479 j/19_Ezdl_c.c 1.1)
(examples/xlurette/Scade-sparc/config_types.h 85 1137765987 l/11_config_typ 1.1)
......@@ -318,7 +318,7 @@
(examples/luckyDraw/c/luckyDrawC_stubs.h 4823 1169542477 k/51_luckyDrawC 1.2)
(install/pixmaps/gnuplot-rif.bmp 1374 1137765987 m/48_gnuplot-ri 1.1)
(source/luc_exe.mli 436 1080290901 b/31_ima_exe.ml 1.5)
(source/ne.mli 2319 1127735479 c/22_ne.mli 1.11)
(source/ne.mli 2865 1222100401 c/22_ne.mli 1.12)
(examples/xlurette/Scade-win32/Pilot.vsp 2075 1137765987 l/45_Pilot.vsp 1.1)
(examples/lucky/lustre/Makefile 1642 1196700198 r/25_Makefile 1.5)
(source/luc2c.ml 19134 1196700198 n/46_luc2c.ml 1.7)
......@@ -329,7 +329,7 @@
(source/gen_stubs_sildex.ml 9755 1122044801 h/38_gen_stubs_ 1.5)
(source/gen_stubs_scade.mli 793 1122044801 f/6_gen_stubs_ 1.4)
(source/luc4c.mli 3003 1149596800 r/15_luc4c.mli 1.1)
(source/Makefile 21985 1196700198 c/20_Makefile 1.53)
(source/Makefile 22009 1222100401 c/20_Makefile 1.54)
(examples/xlurette/Scade-win32/Pilot.vsw 431 1137765987 l/44_Pilot.vsw 1.1)
(examples/xlurette/Scade-win32/MyConsts.saofd 153 1137765987 l/48_MyConsts.s 1.1)
(examples/xlurette/Scade-win32/Direction_D1.saofd 1298 1137765987 m/3_Direction_ 1.1)
......@@ -346,7 +346,7 @@
(source/Ezdl.ml 1574 1127735479 j/17_Ezdl.ml 1.1)
(doc/tutorial/macros.tex 5209 1138032075 q/28_macros.tex 1.1)
(examples/luckyDraw/ocaml/draw-ex.out.exp 472 1165477648 l/5_draw-ex.ou 1.2)
(source/lustreExp.mli 2372 1137765987 g/46_lustreExp. 1.12)
(source/lustreExp.mli 2340 1222100401 g/46_lustreExp. 1.13)
(utils/luckytolatex 1517 1196700198 n/30_luckytolat 1.2)
(install/pixmaps/open.xpm 782 1137765987 n/20_open.xpm 1.1)
(utils/lucky.vim 1861 1090330182 h/44_lucky.vim 1.1)
......@@ -356,7 +356,7 @@
(doc/tutorial/simple.tex 267 1138032075 q/26_simple.tex 1.1)
(examples/xlurette/tram/Makefile 1311 1196700198 o/19_Makefile 1.1.1.4)
(examples/xlurette/fault-tolerant-heater/Makefile 864 1196700198 n/47_Makefile 1.1.1.3)
(source/Makefile.release 14325 1196700198 n/41_Makefile.r 1.11)
(source/Makefile.release 14289 1222100401 n/41_Makefile.r 1.12)
(source/socket_client_serveur.ml 1844 1122044801 i/42_socket_cli 1.1)
(xlurette/Scade/LuretteTcl.c 752 1122044801 j/15_LuretteTcl 1.1)
(source/Makefile.lutinlib 1691 1138025047 n/44_Makefile.l 1.1)
......@@ -397,8 +397,8 @@
(source/command_line.ml 5724 1122044801 b/20_command_li 1.24)
(doc/figs/lucky-ex.fig 1531 1138034376 q/50_lucky-ex.f 1.1)
(examples/lucky/other/test2.res 0 1137765987 k/42_test2.res 1.1)
(examples/xlurette/Gyro/onlyroll.lus 18299 1137765987 m/31_onlyroll.l 1.1)
(source/command_line_luc_exe.ml 4314 1137765987 b/33_command_li 1.30)
(examples/xlurette/Gyro/onlyroll.lus 18281 1222100401 m/31_onlyroll.l 1.2)
(source/command_line_luc_exe.ml 4429 1222100401 b/33_command_li 1.31)
(source/call_lurette_main.c 377 1122044801 e/28_call_luret 1.2)
(install/pixmaps/lurun.bmp 822 1137765987 m/50_lurun.bmp 1.1)
(doc/figs/logo-ist.eps 19564 1138034376 r/3_logo-ist.e 1.1)
......@@ -415,7 +415,7 @@
(examples/lucky/other/test1.rif.exp 33449 1137765987 k/41_test1.rif. 1.1)
(polka/Makefile.config 2427 1196700198 e/20_Makefile.c 1.10.1.2)
(examples/xlurette/Scade-sparc/exo1.vsw 400 1137765987 l/16_exo1.vsw 1.1)
(examples/xlurette/fault-tolerant-heater/degradable-sensors.luc 1382 1137765987 h/15_wearing-se 1.3)
(examples/xlurette/fault-tolerant-heater/degradable-sensors.luc 1383 1222100401 h/15_wearing-se 1.4)
(examples/lucky/external_code/Makefile 1677 1196700198 j/24_Makefile 1.5)
(examples/xlurette/Scade-sparc/libpwlinear.saofdm 1379 1137765987 l/12_libpwlinea 1.1)
(examples/xlurette/Scade-sparc/Direction_D1/Direction_D1.c 935 1137765987 l/25_Direction_ 1.1)
......@@ -450,7 +450,7 @@
(doc/figs/gen-pict.fig 3816 1138034376 r/9_gen-pict.f 1.1)
(polka/C/vector.c 17843 1071844798 e/3_vector.c 1.2)
(i386-linux-gcc3/include/ocaml2c.h 2480 1138025047 o/33_ocaml2c.h 1.1)
(source/store.ml 29889 1137765987 b/27_rnumsolver 1.46)
(source/store.ml 30194 1222100401 b/27_rnumsolver 1.47)
(source/Makefile.lurette_debug2 2309 1122044801 j/4_Makefile.l 1.1)
(install/lurettetop.bat.in 88 1165588586 g/26_lurettetop 1.3.1.1)
(doc/figs/lurette-step.fig 1193 1138034376 q/46_lurette-st 1.1)
......@@ -465,7 +465,7 @@
(source/ocaml2c.idl 1569 1083336219 e/26_ocaml2c.id 1.3)
(install/pixmaps/lugenlu.bmp 822 1137765987 n/1_lugenlu.bm 1.1)
(source/gen_fake_lucky.ml 11873 1169542477 g/8_gen_fake_l 1.15)
(source/ne.ml 11052 1137765987 c/21_ne.ml 1.15)
(source/ne.ml 13862 1222100401 c/21_ne.ml 1.16)
(examples/xlurette/Scade-win32/Makefile 521 1137765987 l/27_Makefile 1.1)
(install/pixmaps/lurette.jpg 5356 1137765987 n/8_lurette.jp 1.1)
(examples/xlurette/tram/controleur_env.luc 433 1138025047 o/20_controleur 1.1)
......@@ -509,14 +509,14 @@
(doc/figs/nh-lurette-try.fig 2045 1138034376 q/41_nh-lurette 1.1)
(install/pixmaps/halt.xpm 511 1137765987 n/21_halt.xpm 1.1)
(source/Makefile.luc4ocaml 4882 1172658530 j/0_Makefile.o 1.3.1.3)
(source/command_line_luc_exe.mli 1412 1122044801 b/34_command_li 1.19)
(source/command_line_luc_exe.mli 1423 1222100401 b/34_command_li 1.20)
(GBDDML/test.ml 366 1170322322 r/31_test.ml 1.1)
(polka/C/config.h 78 1071844798 e/13_config.h 1.2)
(examples/xlurette/tram/porte.luc 651 1138025047 o/16_porte.luc 1.1)
(polka/caml/vector.idl 10381 1076684617 d/35_vector.idl 1.4)
(install/pixmaps/config-params2.xpm 1376 1137765987 n/10_config-par 1.1)
(polka/caml/poly.idl 10352 1076684617 d/33_poly.idl 1.3)
(source/polyhedron.ml 15442 1137765987 d/25_polyhedron 1.21)
(source/polyhedron.ml 15752 1222100401 d/25_polyhedron 1.22)
(test/time-CHAILLOL.exp 8235 1063029729 g/10_time-CHAIL 1.1)
(examples/rml/window.out 2210 1137765987 k/7_window.out 1.1)
(examples/Makefile 909 1196700198 j/38_Makefile 1.7)
......@@ -532,7 +532,7 @@
(doc/figs/lucky-ex.fig.bak 1528 1138034376 r/1_lucky-ex.f 1.1)
(polka/C/poly.c 53392 1071844798 e/5_poly.c 1.2)
(source/gnuplot-rif.ml 11831 1165588586 i/34_gnuplot-ri 1.5)
(TODO 8452 1172658530 d/22_TODO 1.61)
(TODO 8636 1222100401 d/22_TODO 1.62)
(examples/xlurette/fault-tolerant-heater/heater_control.lus 3448 1165588586 h/17_heater_con 1.4.1.1)
(polka/C/poly.h 4839 1071844798 d/49_poly.h 1.2)
(install/pixmaps/stock_save.xpm 3420 1137765987 n/14_stock_save 1.1)
......@@ -542,7 +542,7 @@
(doc/figs/obj-code-gen.fig.bak 1635 1138034376 q/39_obj-code-g 1.1)
(examples/xlurette/tram/tramway.lus 4985 1138025047 o/14_tramway.lu 1.1)
(source/luckyCapi.ml 665 1137765987 n/40_luckyCapi. 1.1)
(VERSION 76 1172658530 j/25_VERSION 1.2.1.3)
(VERSION 70 1222100401 j/25_VERSION 1.2.1.4)
(source/Makefile.luckyDraw 4827 1172658530 j/6_Makefile.l 1.5)
(source/sim2chro.mli 1532 1078751438 b/23_sim2chro.m 1.12)
(examples/lucky/other/losange-3d2.luc 355 1137765987 k/44_losange-3d 1.1)
......@@ -567,7 +567,7 @@
(doc/tutorial/fault-tolerant-tut.tex 15451 1138032075 q/32_fault-tole 1.1)
(source/luc4ocaml_nolbl.ml 231 1137765987 i/39_lucaml_nol 1.2)
(examples/ocaml/crazy-rabbit/moving-obstacle3.luc 2542 1137765987 j/43_moving-obs 1.1)
(source/value.mli 1180 1078751438 c/24_value.mli 1.8)
(source/value.mli 1325 1222100401 c/24_value.mli 1.9)
(examples/xlurette/Scade-win32/det_center.saofd 4993 1137765987 l/39_det_center 1.1)
(doc/figs/lurette.fig.bak 1577 1138034376 q/48_lurette.fi 1.1)
(examples/rml/window.luc 4333 1137765987 k/10_window.luc 1.1)
......
......@@ -9,6 +9,11 @@ source: gen_version
cd install; autoconf; cd ..
./RUN_ME
clean:
cd polka; make clean; cd ..
cd GBDDML; make clean; cd ..
cd source; make clean; cd ..
VERSION:=$(shell prcs info --sort date ./lurette.prj | tail -n 1 | awk '{printf "%s\n", $$2}')
......@@ -16,6 +21,12 @@ VERSION:=$(shell prcs info --sort date ./lurette.prj | tail -n 1 | awk '{printf
gen_version:
rm -f source/version.ml
echo "let str=\"$(VERSION)\"" > source/version.ml
rm VERSION
date +VERSION_DATE=%d-%m-%y > VERSION
echo "VERSION=$(VERSION)" >> VERSION
echo "export VERSION" >> VERSION
echo "export VERSION_DATE" >> VERSION
ci:
......
......@@ -5,14 +5,13 @@
# For updates see:
# http://www.oefai.at/~markus/ocaml_sources
#
# $Id: OcamlMakefile 1.55 Tue, 06 Jun 2006 14:26:40 +0200 jahier $
# $Id: OcamlMakefile 1.56 Mon, 22 Sep 2008 18:20:01 +0200 jahier $
#
###########################################################################
# Set these variables to the names of the sources to be processed and
# the result variable. Order matters during linkage!
-include ./Makefile.common.source
......
......@@ -5,14 +5,26 @@ programs from Ocaml.
*************************************************************************
* INSTALLATION
* INSTALLATION of the libraries
Just copy the files of the ./lib directory wherever it is convenient for you.
For example, in the
For example, in the directory:
`ocamlc -where`/lucky
directory (that you have to create before)
Perform a « mkdir `ocamlc -where`/lucky » if necessary.
*************************************************************************
* binaries
The bin directory contains two standalone executables:
- luc4ocaml.top, an Objective Caml toplevel that contains the luc4ocaml lib
preloaded at start-up (try './luc4ocaml.top -I `ocamlc -where`/lucky').
- luc2c: an experimental tool that generates C file wrappers that makes it
possible to Call Lucky programs from C (cf examples/lucky/C/Makefile).
*************************************************************************
......@@ -31,7 +43,7 @@ Confere also the following directories to find examples:
*************************************************************************
* Building files
Thoses example directories contain Makefile that illustrate how programs
Thoses example directories contain Makefiles that illustrate how programs
should be compiled. Basically one needs to:
(1) import the following ocaml librairies(*):
......
V1.45 (22/09/2008)
* Fix an embarassing bug in the integer solver (in dimension 1).
V1.44 (4/12/2007)
* Better error messages and a few minor improvements
V1.43 (8/12/2006)
* Add a luc2c tool, which generates C stub files to call lucky
......
......@@ -49,10 +49,14 @@ Bien sur, il manipule 10000 variables au lieu de 1000, mais tout de m
*********** A faire
* luc2c reclame un HOST_TYPE (ne devrait pas. sinon, l'encapsuler dans un script)
par ailleurs, luc2c --scade povoque un « failure "tl" error » avec un exemple
de david Lesens.
* Luc4ocaml : rajouter un get_vertices
* verifier que les ~init secomportent correctement en cas de produit d'automate
* verifier que les ~init se comportent correctement en cas de produit d'automate
* les env_state.d.memory devraient etre des Value.t VarMap.t plutot
que des Var.subst list !!
......
VERSION_DATE=01-02-07
VERSION=unstable.3
VERSION_DATE=26-02-08
VERSION=1.44
export VERSION
export VERSION_DATE
......@@ -12,13 +12,13 @@ window.ml: window.rml
window: window.ml
$(OCAMLC) -o window \
-I `$(RMLC) -where` -I ../lib \
luc4ocaml.cma rml_interpreter.cma \
luc4ocaml.cma rmllib.cma \
window.ml
window.opt: window.ml
$(OCAMLOPT) -o window \
-I `$(RMLC) -where` -I +lucky -I ../lib \
$(LUC4OCAML_CMXA) rml_interpreter.cmxa \
$(LUC4OCAML_CMXA) rmllib.cmxa \
window.ml
......
......@@ -570,21 +570,3 @@ let
if val then pre(cpt) + 1 else 0 ;
m = (cpt >= n) ;
tel
......@@ -12,7 +12,7 @@ locals {
cpt : int ;
invariant : bool ~alias (cpt = pre cpt + 1)
and ( T = pre T + (if Heat_on then eps else -eps));
and ( T = (if Heat_on then eps else -eps) + pre T);
new_T1 : bool ~alias T1 = T + eps1 ;
new_T2 : bool ~alias T2 = T + eps2 ;
......
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette")
(Project-Version lurette 1 44)
(Parent-Version lurette unstable 5)
(Project-Version lurette 1 45)
(Parent-Version lurette 1 44)
(Version-Log "
source/util.ml
add an entete function in order to decorate generated files.
source/solver.ml
Add more debug info in case of failure.
source/parse_luc.ml
better error message
source/env_state.ml
Fix a bug in the handling of the (undocumented) ~default option.
source/lurettetop.ml
better error message
install/configure.in
Add stuff for configuring mac os
use install instead of cp.
install/Makefile.lurette.in
user-rules
some improvements(?)
source/Makefile.lucky
source/Makefile.gen_stubs
source/Makefile.lurette_lib
source/Makefile
polka/Makefile.config
polka/Makefile
source/gen_fake_lucky.ml
source/Makefile.gen_fake_lucky
install/xlurette.sh.in
install/xlurette.bat.in
install/set_env_var.in
install/lurettetop.sh.in
install/gen_stubs.sh.in
source/exp.ml
source/luc4ocaml.mli
source/luckyDraw.mli
source/Makefile.luc4ocaml
source/Makefile.luckyDraw
examples/lucky/external_88code/foo.c
examples/lucky/external_code/call_external_c_code.luc
examples/lucky/external_code/Makefile
VERSION
install/set_env_var.bat.in
examples/Makefile
examples/ocaml/crazy-rabbit/rabbit-dir-obstacle.luc
examples/ocaml/crazy-rabbit/Makefile
examples/ocaml/crazy-rabbit/rabbit.ml
examples/rml/Makefile
examples/lucky/other/Makefile
examples/luckyDraw/c/luckyDrawC_stubs.c.m4
examples/luckyDraw/c/essai.c
examples/luckyDraw/c/Makefile
examples/luckyDraw/ocaml/Makefile
examples/xlurette/heater/Makefile
examples/xlurette/Gyro/Makefile
utils/lucky_cpp
utils/luckytolatex
source/Makefile.release
source/version.ml
source/Makefile.luc2c
examples/xlurette/fault-tolerant-heater/Makefile
examples/xlurette/tram/Makefile
examples/xlurette/Sildex/Makefile
xlurette/makefile
xlurette/xlurette_glade_main.ml
lnsw
source/luc4c_stubs.h
source/luc4c_stubs.c
source/luc4c.ml
examples/lucky/C/Makefile
source/Makefile.luc4c
examples/lucky/lustre/Makefile
Figthing with library stuff.
Add headers (time-stamps)
+ other minor changes
examples/luckyDraw/c/luckyDrawC_stubs.h
call the caml_startup() init procedure + various twix.
source/luc2c.ml
Add a --luciole option
Fix an embarassing bug in the integer solver (in dimension 1).
")
(New-Version-Log ""
)
(Checkin-Time "Tue, 04 Dec 2007 10:47:42 +0100")
(Checkin-Time "Mon, 22 Sep 2008 18:20:01 +0200")
(Checkin-Login jahier)
(Populate-Ignore ())
(Project-Keywords)
......@@ -107,10 +21,10 @@ source/luc2c.ml
;; Sources files for luc_exe
(source/luc_exe.mli (lurette/b/31_ima_exe.ml 1.5 644))
(source/luc_exe.ml (lurette/b/32_ima_exe.ml 1.59 644))
(source/luc_exe.ml (lurette/b/32_ima_exe.ml 1.60 644))
(source/command_line_luc_exe.ml (lurette/b/33_command_li 1.30 644))
(source/command_line_luc_exe.mli (lurette/b/34_command_li 1.19 644))
(source/command_line_luc_exe.ml (lurette/b/33_command_li 1.31 644))
(source/command_line_luc_exe.mli (lurette/b/34_command_li 1.20 644))
;; Sources files for lurette only
(source/lurette.mli (lurette/11_lurette.ml 1.17 644))
......@@ -128,7 +42,7 @@ source/luc2c.ml
(source/util.ml (lurette/35_util.ml 1.81 644))
(source/formula_to_bdd.ml (lurette/g/34_formula_to 1.13 644))
(source/formula_to_bdd.ml (lurette/g/34_formula_to 1.14 644))
(source/formula_to_bdd.mli (lurette/g/35_formula_to 1.9 644))
(source/fair_bddd.ml (lurette/g/38_fair_bddd. 1.12 644))
......@@ -139,11 +53,11 @@ source/luc2c.ml
(source/solver.mli (lurette/38_solver.mli 1.25 644))
(source/solver.ml (lurette/39_solver.ml 1.68 644))
(source/polyhedron.ml (lurette/d/25_polyhedron 1.21 644))
(source/polyhedron.ml (lurette/d/25_polyhedron 1.22 644))
(source/polyhedron.mli (lurette/d/26_polyhedron 1.11 644))
(source/store.mli (lurette/b/26_rnumsolver 1.27 644))
(source/store.ml (lurette/b/27_rnumsolver 1.46 644))
(source/store.ml (lurette/b/27_rnumsolver 1.47 644))
(source/parse_luc.mli (lurette/40_parse_env. 1.28 644))
(source/parse_luc.ml (lurette/41_parse_env. 1.72 644))
......@@ -163,13 +77,13 @@ source/luc2c.ml
(source/sim2chro.mli (lurette/b/23_sim2chro.m 1.12 644))
(source/sim2chro.ml (lurette/b/24_sim2chro.m 1.29 644))
(source/gne.mli (lurette/b/36_gne.mli 1.9 644))
(source/gne.mli (lurette/b/36_gne.mli 1.10 644))
(source/gne.ml (lurette/b/37_gne.ml 1.10 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.63.2.3 644))
(source/draw.mli (lurette/f/1_draw.mli 1.5 644))
(source/draw.ml (lurette/f/2_draw.ml 1.7 644))
(source/draw.ml (lurette/f/2_draw.ml 1.8 644))
(source/gen_stubs_poc.ml (lurette/f/3_gen_stubs_ 1.6 644))
(source/gen_stubs_poc.mli (lurette/f/4_gen_stubs_ 1.4 644))
......@@ -187,11 +101,11 @@ source/luc2c.ml
(source/constraint.mli (lurette/c/18_constraint 1.11 644))
(source/constraint.ml (lurette/c/19_constraint 1.14 644))
(source/ne.ml (lurette/c/21_ne.ml 1.15 644))
(source/ne.mli (lurette/c/22_ne.mli 1.11 644))
(source/ne.ml (lurette/c/21_ne.ml 1.16 644))
(source/ne.mli (lurette/c/22_ne.mli 1.12 644))
(source/value.ml (lurette/c/23_value.ml 1.9 644))
(source/value.mli (lurette/c/24_value.mli 1.8 644))
(source/value.ml (lurette/c/23_value.ml 1.10 644))
(source/value.mli (lurette/c/24_value.mli 1.9 644))
(source/prevar.ml (lurette/d/18_prevar.ml 1.8 644))
(source/prevar.mli (lurette/d/19_prevar.mli 1.7 644))
......@@ -211,18 +125,18 @@ source/luc2c.ml
(utils/lucky.el (lurette/f/7_lucky.el 1.14 644))
(install/config.guess (lurette/f/25_config.gue 1.1 755))
(install/configure.in (lurette/d/11_configure. 1.28 644))
(OcamlMakefile (lurette/17_OcamlMakef 1.55 644))
(OcamlMakefile (lurette/17_OcamlMakef 1.56 644))
(install/Makefile.lurette.in (lurette/b/38_Makefile.l 1.39 644))
(user-rules (lurette/c/14_myrules 1.78 644))
(Makefile (lurette/d/13_Makefile 1.14 644))
(Makefile (lurette/d/13_Makefile 1.15 644))
(source/Makefile.lurettetop (lurette/d/14_Makefile.l 1.9 644))
(source/Makefile.gen_fake_lutin (lurette/d/17_Makefile.g 1.6 644))
(source/Makefile.show_luc (lurette/b/40_Makefile.s 1.20.1.1 644))
(source/Makefile.lucky (lurette/b/41_Makefile.i 1.39.1.3 644))
(source/Makefile.lucky (lurette/b/41_Makefile.i 1.39.1.4 644))
(source/Makefile.gen_stubs (lurette/b/42_Makefile.g 1.15.1.1 644))
(source/Makefile.lurette_lib (lurette/c/2_Makefile.l 1.37 644))
(source/Makefile (lurette/c/20_Makefile 1.53 644))
(source/Makefile (lurette/c/20_Makefile 1.54 644))
;; Documentation
(doc/Interface_draft (lurette/19_Interface_ 1.1 644))
......@@ -235,7 +149,7 @@ source/luc2c.ml
(ID_EN_VRAC (lurette/0_ID_EN_VRAC 1.1 644))
(RUN_ME (lurette/f/26_INSTALL 1.5 755))
(TAGS (lurette/21_TAGS 1.6 644))
(TODO (lurette/d/22_TODO 1.61 644))
(TODO (lurette/d/22_TODO 1.62 644))
(test/time-rey.exp (lurette/h/13_time-rey.e 1.10 644))
(test/time-rey.res (lurette/h/14_time-rey.r 1.11 644))
......@@ -345,12 +259,12 @@ source/luc2c.ml
;; Files added by populate at Thu, 13 Nov 2003 16:59:39 +0100,
;; to version 1.8(w), by jahier:
(source/lustreExp.ml (lurette/g/45_lustreExp. 1.14.2.1 644))
(source/lustreExp.ml (lurette/g/45_lustreExp. 1.14.2.2 644))
;; Files added by populate at Thu, 13 Nov 2003 16:59:41 +0100,
;; to version 1.8(w), by jahier:
(source/lustreExp.mli (lurette/g/46_lustreExp. 1.12 644))
(source/lustreExp.mli (lurette/g/46_lustreExp. 1.13 644))
;; Files added by populate at Fri, 14 Nov 2003 14:32:47 +0100,
;; to version 1.8(w), by jahier:
......@@ -370,7 +284,7 @@ source/luc2c.ml
;; Files added by populate at Fri, 14 Nov 2003 14:32:55 +0100,
;; to version 1.8(w), by jahier:
(source/var.mli (lurette/g/50_var.mli 1.13 644))
(source/var.mli (lurette/g/50_var.mli 1.14 644))
;; Files added by populate at Wed, 26 Nov 2003 08:47:27 +0100,
;; to version 1.10(w), by jahier:
......@@ -386,7 +300,7 @@ source/luc2c.ml
;; Files added by populate at Wed, 04 Feb 2004 17:09:41 +0100,
;; to version 1.19(w), by jahier:
(examples/xlurette/fault-tolerant-heater/degradable-sensors.luc (lurette/h/15_wearing-se 1.3 644))
(examples/xlurette/fault-tolerant-heater/degradable-sensors.luc (lurette/h/15_wearing-se 1.4 644))
(examples/xlurette/fault-tolerant-heater/heater_control_env.luc (lurette/h/16_heater_con 1.4 644))
(examples/xlurette/fault-tolerant-heater/heater_control.lus (lurette/h/17_heater_con 1.4.1.1 644))
(examples/xlurette/fault-tolerant-heater/sensors.luc (lurette/h/18_sensors.lu 1.4 644))
......@@ -394,7 +308,7 @@ source/luc2c.ml
;; Files added by populate at Mon, 08 Mar 2004 14:02:46 +0100,
;; to version 1.22(w), by jahier:
(source/parser.mly (lurette/h/19_parser.mly 1.4 644))
(source/parser.mly (lurette/h/19_parser.mly 1.5 644))
;; Files added by populate at Mon, 08 Mar 2004 14:03:00 +0100,
;; to version 1.22(w), by jahier:
......@@ -474,7 +388,7 @@ source/luc2c.ml
;; Files added by populate at Tue, 27 Jul 2004 12:24:20 +0200,
;; to version 1.35(w), by jahier:
(RELEASE-NOTES (lurette/h/45_RELEASE-NO 1.7.1.1 644))
(RELEASE-NOTES (lurette/h/45_RELEASE-NO 1.7.1.2 644))
;; Files added by populate at Wed, 06 Oct 2004 11:46:42 +0200,
;; to version 1.37(w), by jahier:
......@@ -517,8 +431,8 @@ source/luc2c.ml
(source/lutin_caml.mli (lurette/i/35_lutin_caml 1.1 644))
(source/luckyDraw.mli (lurette/i/36_luckyDraw. 1.3.1.2 644))
(source/luckyDraw.ml (lurette/i/37_luckyDraw. 1.3.1.1 644))
(source/luckyDraw.mli (lurette/i/36_luckyDraw. 1.3.1.3 644))
(source/luckyDraw.ml (lurette/i/37_luckyDraw. 1.3.1.2 644))
(source/luc4ocaml_nolbl.mli (lurette/i/38_lucaml_nol 1.2 644))
(source/luc4ocaml_nolbl.ml (lurette/i/39_lucaml_nol 1.2 644))
......@@ -579,7 +493,7 @@ source/luc2c.ml
;; Files added by populate at Fri, 16 Sep 2005 14:49:05 +0200,
;; to version 1.40(w), by jahier:
(VERSION (lurette/j/25_VERSION 1.2.1.3 644))
(VERSION (lurette/j/25_VERSION 1.2.1.4 644))
;; Files added by populate at Fri, 16 Sep 2005 14:50:55 +0200,
......@@ -604,7 +518,7 @@ source/luc2c.ml
(README-lurette (lurette/j/35_README-lur 1.1 644))
(README-luckyDraw (lurette/j/36_README-luc 1.1 644))
(README-luc4ocaml (lurette/j/37_README-luc 1.1 644))
(README-luc4ocaml (lurette/j/37_README-luc 1.2 644))
;; Files added by populate at Thu, 19 Jan 2006 14:54:59 +0100,
;; to version 1.41(w), by jahier:
......@@ -639,7 +553,7 @@ source/luc2c.ml
(examples/rml/window.luc (lurette/k/10_window.luc 1.1 644))