Commit d5e465d2 authored by Erwan Jahier's avatar Erwan Jahier
Browse files

lurette unstable.2 Tue, 23 Jan 2007 09:54:37 +0100 by jahier

Parent-Version:      unstable.1
Version-Log:         empty
Project-Description: Lurette
parent 25b18e44
......@@ -7,9 +7,9 @@
(install/pixmaps/ediff-quit.xpm 494 1137765987 n/23_ediff-quit 1.1)
(examples/xlurette/Scade-sparc/Direction_D1/Direction_D1.files 88 1137765987 l/26_Direction_ 1.1)
(examples/xlurette/heater/test2.rif.exp 1294 1137765987 m/11_test2.rif. 1.1)
(install/pixmaps/gnuplot.bmp 822 1137765987 n/2_gnuplot.bm 1.1)
(install/set_env_var.bat.in 580 1137765987 j/29_set_env_va 1.2)
(source/lexeme.ml 1632 1078751438 h/22_lexeme.ml 1.1)
(install/pixmaps/gnuplot.bmp 822 1137765987 n/2_gnuplot.bm 1.1)
(examples/xlurette/Sildex/oracle_sildex.c 11793 1138025047 o/28_oracle_sil 1.1)
(examples/lucky/other/structured_type.luc 2289 1137765987 k/50_structured 1.1)
(examples/luckyDraw/ocaml/draw-ex.out 472 1165477648 l/6_draw-ex.ou 1.2)
......@@ -20,7 +20,6 @@
(examples/xlurette/Scade-sparc/liblinear.saofdm 1301 1137765987 l/15_liblinear. 1.1)
(doc/tutorial/wearing_sensors.tex 1621 1138032075 q/24_wearing_se 1.1)
(examples/xlurette/Scade-win32/regulation.saofd 15074 1137765987 l/29_regulation 1.1)
(ihm/xlurette/xlurette_glade_interface.ml 89243 1137765987 c/15_xlurette_g 1.36)
(source/Makefile.luckydraw.src 968 1137765987 n/31_Makefile.l 1.1)
(xlurette/Scade/Images/luset.bmp 822 1122044801 i/21_luset.bmp 1.1)
(examples/lucky/C/test.rif.exp 534 1149596800 r/17_test.rif.e 1.1)
......@@ -36,7 +35,6 @@
(polka/C/cherni.c 30685 1122044801 e/9_cherni.c 1.5)
(source/parse_sildex.ml 7741 1137765987 h/36_parse_sild 1.4)
(xlurette/Scade/rif.ini 2117 1122044801 j/11_rif.ini 1.1)
(ihm/xlurette/xlurette.glade 115318 1127735479 c/13_xlurette.g 1.38)
(polka/C/internal.h 916 1071844798 e/0_internal.h 1.2)
(examples/xlurette/tram/time-joly.res 25174 1138025047 o/12_time-joly. 1.1)
(examples/xlurette/fault-tolerant-heater/test.rif.exp 35339 1138025047 n/48_test.rif.e 1.1)
......@@ -55,28 +53,27 @@
(examples/xlurette/Scade-win32/pilot.saofdm 394 1137765987 l/31_pilot.saof 1.1)
(source/sol_nb.mli 721 1099986649 i/16_sol_nb.mli 1.1)
(examples/xlurette/Gyro/Makefile 541 1165855990 m/38_Makefile 1.1.2.2)
(source/gen_stubs_common.ml 21431 1149596800 e/39_gen_stubs_ 1.8)
(source/gen_stubs_common.ml 21210 1169542477 e/39_gen_stubs_ 1.9)
(examples/xlurette/Scade-win32/position_validation.saofd 10188 1137765987 l/37_position_v 1.1)
(source/luckyCapi_stubs.c 10834 1137765987 n/38_luckyCapi_ 1.1)
(xlurette/Scade/Images/aboutlurette.bmp 19734 1122044801 i/27_aboutluret 1.1)
(doc/figs/lurette.fig 1583 1138034376 q/44_lurette.fi 1.1)
(examples/xlurette/Sildex/oracle_sildex_io.c 0 1138025047 o/27_oracle_sil 1.1)
(examples/ocaml/crazy-rabbit/rabbit-dir.luc 1458 1137765987 j/49_rabbit-dir 1.1)
(examples/luckyDraw/c/Makefile 2281 1165855990 l/4_Makefile 1.4)
(examples/luckyDraw/c/Makefile 2647 1169542477 l/4_Makefile 1.5)
(examples/xlurette/Scade-sparc/Direction_D1/definitions.h 787 1137765987 l/23_definition 1.1)
(source/bddd.ml 20088 1137765987 g/36_bddd.ml 1.14)
(source/gen_lustre_calling_C_code.ml 2992 1122044801 i/50_gen_lustre 1.1)
(examples/xlurette/tram/ControleurPorte.rif 4763 1138025047 o/4_Controleur 1.1)
(examples/xlurette/Scade-win32/MODULE.saofd 3026 1137765987 l/49_MODULE.sao 1.1)
(source/liblutin.idl 181 1127735479 j/21_liblutin.i 1.1)
(doc/lurette-man/sensors.tex 846 1138032075 q/5_sensors.te 1.1)
(test/time-CHAILLOL.res 8235 1063029729 g/11_time-CHAIL 1.1)
(source/parse_luc.ml 51766 1149596800 41_parse_env. 1.69)
(source/lurette_exe.c 397 1165588586 e/27_lurette_ex 1.3.1.1)
(source/parse_luc.ml 51763 1169542477 41_parse_env. 1.70)
(source/lurette_exe.c 373 1169542477 e/27_lurette_ex 1.3.1.2)
(source/show_luc.ml 4332 1137765987 e/25_show_luc.m 1.13)
(examples/xlurette/Scade-sparc/Direction_D1.saofd 1335 1137765987 l/21_Direction_ 1.1)
(install/xlurette.sh.in 95 1137765987 g/21_xlurette.s 1.3)
(source/lurettetop.ml 84862 1165588586 c/1_lurettetop 1.63.2.1)
(source/lurettetop.ml 84864 1169542477 c/1_lurettetop 1.63.2.2)
(examples/xlurette/Sildex/sut_sildex.c 10531 1138025047 o/23_sut_sildex 1.1)
(polka/Changes 1952 1071844798 e/22_Changes 1.2)
(examples/xlurette/Sildex/sut_sildex_io.c 0 1138025047 o/21_sut_sildex 1.1)
......@@ -125,7 +122,7 @@
(doc/figs/nh-gen-pict.fig 3181 1138034376 q/43_nh-gen-pic 1.1)
(examples/lucky/tut-examples/simple.luc 174 1137765987 k/27_simple.luc 1.1)
(doc/figs/nh-lurette-start.fig 2042 1138034376 q/49_nh-lurette 1.1)
(examples/rml/Makefile 744 1165855990 k/13_Makefile 1.1.1.1)
(examples/rml/Makefile 764 1169542477 k/13_Makefile 1.1.1.2)
(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)
......@@ -152,8 +149,8 @@
(source/essai-esclave.ml 2203 1127735479 i/47_essai-escl 1.2)
(test/time-ecrins.exp 10644 1137765987 d/21_time-ecrin 1.49)
(examples/xlurette/Gyro/allocator.lus 1087 1137765987 m/40_allocator. 1.1)
(install/pixmaps/gnome-run.png 2441 1137765987 n/4_gnome-run. 1.1)
(examples/xlurette/Scade-win32/ConfAnnot.aty 13661 1137765987 m/0_ConfAnnot. 1.1)
(install/pixmaps/gnome-run.png 2441 1137765987 n/4_gnome-run. 1.1)
(examples/xlurette/heater/heater_oracle.lus 104 1137765987 m/13_heater_ora 1.1)
(polka/C/satmat.c 6254 1047029868 e/4_satmat.c 1.1)
(install/pixmaps/lugenor.bmp 822 1137765987 n/0_lugenor.bm 1.1)
......@@ -164,7 +161,6 @@
(source/parse_poc.mli 1131 1078751438 d/29_parse_poc. 1.5)
(source/lucky2lus.ml 17081 1137765987 i/49_lucky2lus. 1.2)
(examples/xlurette/Scade-sparc/Direction_D1_env.luc 277 1137765987 l/19_Direction_ 1.1)
(examples/xlurette/tram/test2.rif 4763 1138025047 o/6_test2.rif 1.1)
(examples/xlurette/Scade-win32/lib_pilot.vsp 1433 1137765987 l/33_lib_pilot. 1.1)
(doc/Interface_draft 5232 1003928781 19_Interface_ 1.1)
(polka/C/main.tex 1961 1047029868 e/14_main.tex 1.1)
......@@ -177,21 +173,18 @@
(source/Makefile.lucky 4698 1165588586 b/41_Makefile.i 1.39.1.1)
(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)
(examples/xlurette/tram/test11.rif 4763 1138025047 o/3_test11.rif 1.1)
(source/lurette.plot 684 1137765987 n/37_lurette.pl 1.1)
(utils/lucky.el 6657 1137765987 f/7_lucky.el 1.14)
(test/test_losange.lus 88 1165588586 r/29_test_losan 1.1)
(source/constraint.ml 3343 1137765987 c/19_constraint 1.14)
(examples/xlurette/Scade-sparc/Makefile 552 1137765987 l/10_Makefile 1.1)
(polka/caml/polka_lexer.mli 200 1047029868 d/41_polka_lexe 1.1)
(ihm/xlurette/xlurette_glade_main.ml 73731 1137765987 c/12_xlurette_g 1.49)
(source/solver.ml 11994 1137765987 39_solver.ml 1.66)
(examples/xlurette/tram/test1.rif 4763 1138025047 o/1_test1.rif 1.1)
(source/solver.ml 11994 1169542477 39_solver.ml 1.67)
(examples/ocaml/crazy-rabbit/rabbit-dir-obstacle.luc 1849 1137765987 j/48_rabbit-dir 1.1)
(examples/xlurette/Gyro/giro.luc 2445 1137765987 m/33_giro.luc 1.1)
(examples/lucky/tut-examples/fairness.luc 281 1137765987 k/30_fairness.l 1.1)
(polka/caml/polka_lexer.mll 798 1165588586 d/42_polka_lexe 1.2.2.1)
(examples/luckyDraw/c/essai.c 1338 1137765987 l/2_essai.c 1.1)
(examples/luckyDraw/c/essai.c 1513 1169542477 l/2_essai.c 1.2)
(source/prevar.ml 3282 1137765987 d/18_prevar.ml 1.8)
(polka/caml/polka_parser.mly 1729 1047029868 d/40_polka_pars 1.1)
(source/Makefile.gen_lustre 943 1122044801 j/8_Makefile.g 1.1)
......@@ -308,19 +301,19 @@
(install/Makefile.lurette.in 5158 1137765987 b/38_Makefile.l 1.38)
(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 15 1165855990 n/43_version.ml 1.6)
(source/version.ml 21 1169542477 n/43_version.ml 1.7)
(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)
(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)
(source/lurette.mli 752 1078751438 11_lurette.ml 1.17)
(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)
(examples/luckyDraw/c/luckyDrawC_stubs.h 4573 1137765987 k/51_luckyDrawC 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)
(examples/xlurette/Scade-win32/Pilot.vsp 2075 1137765987 l/45_Pilot.vsp 1.1)
(examples/lucky/lustre/Makefile 1664 1165855990 r/25_Makefile 1.2)
(examples/lucky/lustre/Makefile 1594 1169542477 r/25_Makefile 1.3)
(source/luc2c.ml 18086 1165507939 n/46_luc2c.ml 1.5)
(install/pixmaps/config-params.bmp 6966 1137765987 m/47_config-par 1.1)
(source/gen_stubs.ml 14674 1137765987 24_generate_l 1.63)
......@@ -329,8 +322,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 21758 1165855990 c/20_Makefile 1.50)
(examples/xlurette/heater/test1.rif 1074 1137765987 m/20_test1.rif 1.1)
(source/Makefile 21977 1169542477 c/20_Makefile 1.51)
(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)
......@@ -340,16 +332,13 @@
(test/time-asti.exp 3594 1137765987 h/41_time-asti. 1.10)
(source/Makefile.lucky2lus 1440 1138025047 j/7_Makefile.l 1.3)
(examples/lucky/external_code/foo.c 391 1127735479 j/22_foo.c 1.1)
(examples/xlurette/heater/lurette.rif 402 1165588586 m/19_lurette.ri 1.3)
(xlurette/Scade/lucky.ini 2593 1122044801 i/20_lucky.ini 1.1)
(examples/xlurette/Scade-win32/det_mvt_mode.saofd 4184 1137765987 l/38_det_mvt_mo 1.1)
(examples/xlurette/tram/lurette.rif 4360 1165588586 o/10_lurette.ri 1.3)
(source/control.ml 4549 1078751438 c/4_control.ml 1.6)
(install/pixmaps/build.xpm 7000 1137765987 n/5_build.xpm 1.1)
(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)
(examples/lucky/other/test3.rif 466 1137765987 k/37_test3.rif 1.1)
(source/lustreExp.mli 2372 1137765987 g/46_lustreExp. 1.12)
(i386-linux-gcc3/bin/lus2ec 677 1138032075 q/17_lus2ec 1.1)
(utils/luckytolatex 1600 1137765987 n/30_luckytolat 1.1)
......@@ -357,12 +346,11 @@
(utils/lucky.vim 1861 1090330182 h/44_lucky.vim 1.1)
(examples/ocaml/crazy-rabbit/test.res 0 1137765987 k/2_test.res 1.1)
(polka/documentation/texinfo.tex 200195 1047029868 e/16_texinfo.te 1.1)
(examples/lucky/tut-examples/test.rif 667 1137765987 k/24_test.rif 1.1)
(source/rif.ml 7464 1122044801 h/27_rif.ml 1.4)
(doc/tutorial/simple.tex 267 1138032075 q/26_simple.tex 1.1)
(examples/xlurette/tram/Makefile 1300 1165855990 o/19_Makefile 1.1.1.2)
(examples/xlurette/fault-tolerant-heater/Makefile 848 1165855990 n/47_Makefile 1.1.1.2)
(source/Makefile.release 14013 1165855990 n/41_Makefile.r 1.8)
(source/Makefile.release 14026 1169542477 n/41_Makefile.r 1.9)
(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)
......@@ -376,12 +364,10 @@
(examples/xlurette/heater/time-joly.res 13086 1137765987 m/17_time-joly. 1.1)
(source/socket_server.ml 1155 1122044801 i/40_socket_ser 1.1)
(source/Makefile.show_luc 1266 1138025047 b/40_Makefile.s 1.20)
(examples/lucky/tut-solution/test.rif 0 1137765987 k/16_test.rif 1.1)
(i386-linux-gcc3/include/config.h 506 1138025047 o/34_config.h 1.1)
(polka/C/polka.c 5608 1071844798 e/6_polka.c 1.2)
(doc/figs/lurette-start.fig 1604 1138034376 q/47_lurette-st 1.1)
(polka/Makefile 1646 1076684617 e/21_Makefile 1.2)
(examples/lucky/external_code/test.rif 349 1137765987 k/20_test.rif 1.1)
(polka/README 1437 1047029868 e/19_README 1.1)
(polka/C/polka.h 1791 1071844798 d/50_polka.h 1.2)
(polka/C/Makefile 7763 1165588586 e/15_Makefile 1.3)
......@@ -390,14 +376,12 @@
(source/gen_fake_lutin.ml 4569 1122044801 d/16_gen_fake_l 1.9)
(doc/figs/logo-ist.df 6127 1138034376 r/2_logo-ist.d 1.1)
(examples/luckyDraw/c/luckyDrawC_caml.ml 2980 1137765987 l/1_luckyDrawC 1.1)
(examples/lucky/other/test2.rif 400 1137765987 k/40_test2.rif 1.1)
(source/gen_stubs_poc.ml 8793 1127735479 f/3_gen_stubs_ 1.6)
(examples/xlurette/Gyro/test.res 0 1137765987 m/37_test.res 1.1)
(source/thickness.ml 1769 1122044801 g/51_thickness. 1.5)
(ihm/xlurette/makefile 4613 1137765987 c/16_makefile 1.27)
(examples/lucky/tut-solution/test.res 0 1137765987 k/15_test.res 1.1)
(source/rif.mli 719 1080290901 h/28_rif.mli 1.1)
(source/luc4c.ml 10053 1149596800 r/16_luc4c.ml 1.1)
(source/luc4c.ml 10084 1169542477 r/16_luc4c.ml 1.2)
(examples/xlurette/Gyro/test.rif.exp 11483 1165588586 m/34_test.rif.e 1.1.2.1)
(examples/xlurette/tram/passager.luc 390 1138025047 o/18_passager.l 1.1)
(install/pixmaps/luset.bmp 822 1137765987 m/49_luset.bmp 1.1)
......@@ -420,7 +404,6 @@
(polka/documentation/polka.texi 119837 1071844798 e/17_polka.texi 1.2)
(doc/tutorial/sensors.tex 846 1138032075 q/27_sensors.te 1.1)
(test/time-joly.res 10657 1165588586 b/49_time.res 1.83)
(examples/xlurette/Gyro/test.rif 11483 1165588586 m/36_test.rif 1.1.2.1)
(test/time-joly.exp 10603 1161778160 b/48_time.exp 1.74)
(i386-linux-gcc3/bin/ec2c 580960 1138032075 q/16_ec2c 1.1)
(source/lutin_caml.mli 3222 1122044801 i/35_lutin_caml 1.1)
......@@ -470,14 +453,13 @@
(install/pixmaps/aboutlurette.bmp 19734 1137765987 n/11_aboutluret 1.1)
(source/socket.ml 1713 1122044801 i/44_socket.ml 1.1)
(source/Makefile.lurette_debug3 2121 1122044801 j/3_Makefile.l 1.1)
(examples/lucky/other/test4.rif 2470 1137765987 k/34_test4.rif 1.1)
(polka/C/vector.h 2367 1071844798 d/47_vector.h 1.2)
(source/Makefile.lurette_debug4 2309 1122044801 j/2_Makefile.l 1.1)
(doc/figs/obj-code-gen.fig 1638 1138034376 q/40_obj-code-g 1.1)
(install/pixmaps/lugenlu.bmp 822 1137765987 n/1_lugenlu.bm 1.1)
(source/sol_nb.ml 4851 1099986649 i/17_sol_nb.ml 1.1)
(source/ocaml2c.idl 1569 1083336219 e/26_ocaml2c.id 1.3)
(source/gen_fake_lucky.ml 11780 1149596800 g/8_gen_fake_l 1.14)
(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)
(examples/xlurette/Scade-win32/Makefile 521 1137765987 l/27_Makefile 1.1)
(install/pixmaps/lurette.jpg 5356 1137765987 n/8_lurette.jp 1.1)
......@@ -496,7 +478,7 @@
(source/Makefile.oplot 205 1122044801 i/51_Makefile.o 1.1)
(source/Makefile.lurette_lib 3268 1137765987 c/2_Makefile.l 1.36)
(examples/lucky/C/call_foo.c 777 1149596800 r/20_call_foo.c 1.1)
(source/luc4c_stubs.c 6954 1165507939 r/13_luc4c_stub 1.2)
(source/luc4c_stubs.c 6996 1169542477 r/13_luc4c_stub 1.3)
(doc/figs/logo-ist.pdf 5433 1138034376 q/51_logo-ist.p 1.1)
(xlurette/xlurette_glade_main.ml 73731 1138032075 q/23_xlurette_g 1.1)
(source/util2.ml 7738 1137765987 n/35_util2.ml 1.1)
......@@ -509,8 +491,7 @@
(install/pixmaps/close.xpm 803 1137765987 n/24_close.xpm 1.1)
(source/polyhedron.mli 1784 1137765987 d/26_polyhedron 1.11)
(TODO.SCADEGUI 2533 1149596800 r/11_TODO.SCADE 1.1)
(examples/luckyDraw/c/luckyDrawC_stubs.c.m4 12040 1137765987 l/0_luckyDrawC 1.1)
(examples/xlurette/heater/test2.rif 1294 1137765987 m/12_test2.rif 1.1)
(examples/luckyDraw/c/luckyDrawC_stubs.c.m4 12506 1169542477 l/0_luckyDrawC 1.2)
(install/pixmaps/config-params2.bmp 822 1137765987 m/46_config-par 1.1)
(doc/tutorial/heater_control_env.tex 432 1138032075 q/30_heater_con 1.1)
(doc/lurette-man/Makefile 1497 1165588586 q/14_Makefile 1.2)
......@@ -525,20 +506,19 @@
(source/command_line_luc_exe.mli 1412 1122044801 b/34_command_li 1.19)
(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)
(install/pixmaps/config-params2.xpm 1376 1137765987 n/10_config-par 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)
(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 845 1165507939 j/38_Makefile 1.4)
(examples/Makefile 878 1169542477 j/38_Makefile 1.5)
(examples/xlurette/heater/test3.rif.exp 4560 1137765987 m/15_test3.rif. 1.1)
(source/Makefile.gen_fake_lutin 656 1137765987 d/17_Makefile.g 1.6)
(examples/lucky/other/test3.rif.exp 466 1137765987 k/35_test3.rif. 1.1)
(i386-linux-gcc3/bin/lusinfo 30352 1138032075 q/18_lusinfo 1.1)
(install/pixmaps/button-close.xpm 746 1137765987 n/27_button-clo 1.1)
(i386-linux-gcc3/bin/pollux 958048 1138032075 q/19_pollux 1.1)
(examples/xlurette/heater/test3.rif 4560 1137765987 m/16_test3.rif 1.1)
(source/Makefile.gnuplot 461 1122044801 i/19_Makefile.g 1.1)
(examples/lucky/external_code/call_external_c_code.luc 1118 1137765987 j/23_call_exter 1.2)
(test/time-moucherotte.res 4158 1088412276 e/38_time-mouch 1.24)
......@@ -554,7 +534,6 @@
(examples/xlurette/heater/heater_ctrl_int.lus 175 1137765987 m/8_heater_ctr 1.1)
(examples/lucky/other/test4.rif.exp 2470 1137765987 k/33_test4.rif. 1.1)
(i386-linux-gcc3/bin/getsaonodes 442 1138032075 q/20_getsaonode 1.1)
(examples/lucky/other/test1.rif 33449 1137765987 k/45_test1.rif 1.1)
(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)
......@@ -567,7 +546,6 @@
(install/pixmaps/run.xpm 369 1137765987 n/17_run.xpm 1.1)
(examples/lucky/tut-solution/six_lines.luc 170 1137765987 k/18_six_lines. 1.1)
(polka/C/matrix.c 26957 1071844798 e/7_matrix.c 1.2)
(examples/xlurette/Gyro/onlyroll2-1.rif 210420 1137765987 m/29_onlyroll2- 1.1)
(doc/figs/components-diagram.fig.bak 2424 1138034376 r/7_components 1.1)
(source/show_env.mli 1198 1088597013 42_show_env.m 1.14)
(doc/lurette-man/heater_control.tex 2712 1138032075 q/10_heater_con 1.1)
......
......@@ -14,8 +14,9 @@ test:
cd xlurette/heater/ && make test ;
cd xlurette/Sildex/ && make test ;
cd luckyDraw/ocaml/ && make test ;
cd luckyDraw/c/ && make test ;
cd ocaml/crazy-rabbit/ && make test ;
cd rml/ && make test ;
# cd rml/ && make test ;
ifeq ($(HOST_TYPE),sparc-sun)
cd xlurette/Scade-sparc && make test ;
else
......
#inputs
#outputs "f1":real "f2":real "i":int
#step 1
#outs 25.68 0.84 9
#step 2
#outs 0.79 -0.94 4
#step 3
#outs 78.49 0.78 8
#step 4
#outs 60.12 0.54 8
#step 5
#outs 14.83 1.00 10
#step 6
#outs 76.64 -0.65 2
#step 7
#outs 25.78 0.62 3
#step 8
#outs 25.51 -0.93 8
#step 9
#outs 99.29 -0.94 3
#step 10
#outs 5.42 -0.51 6
#end
......@@ -26,7 +26,6 @@ endif
# Calling lucky from Lustre
# SOURCE_FILES = call_foo.lus foo.luc
# + call_foo_ext_func.ch et call_foo_ext.h (to be generated by luc2c)
foo.c: foo.luc
$(LUC2C) --lustre "call_foo" --seed 42 foo.luc
......
This diff is collapsed.
#inputs
#outputs "cpt":int
#step 1
#outs 1
#step 2
#outs 2
#step 3
#outs 3
#step 4
#outs 3
#step 5
#outs 4
#step 6
#outs 5
#step 7
#outs 6
#step 8
#outs 6
#step 9
#outs 7
#step 10
#outs 8
#step 11
#outs 9
#step 12
#outs 10
#step 13
#outs 10
#step 14
# current node: infinite_weight:3
# No transition is labelled by a satisfiable formula.
# The Lucky automata is blocked.
#inputs
#outputs "x":real
#step 1
#outs 6.67
#step 2
#outs 8.37
#step 3
#outs 8.77
#step 4
#outs 5.74
#step 5
#outs 5.04
#step 6
#outs 7.16
#step 7
#outs 9.28
#step 8
#outs 8.11
#step 9
#outs 5.63
#step 10
#outs 8.84
#step 11
#outs 6.14
#step 12
#outs 7.58
#step 13
#outs 9.77
#step 14
#outs 7.62
#step 15
#outs 9.40
#step 16
#outs 5.81
#step 17
#outs 7.95
#step 18
#outs 6.55
#step 19
#outs 5.08
#step 20
#outs 8.89
#end
#inputs
#outputs "s.f1":bool "s.f2":(zero, one, two) "s.f3[0][0][0]":int "s.f3[0][0][1]":int "s.f3[0][0][2]":int "s.f3[0][0][3]":int "s.f3[0][1][0]":int "s.f3[0][1][1]":int "s.f3[0][1][2]":int "s.f3[0][1][3]":int "s.f3[1][0][0]":int "s.f3[1][0][1]":int "s.f3[1][0][2]":int "s.f3[1][0][3]":int "s.f3[1][1][0]":int "s.f3[1][1][1]":int "s.f3[1][1][2]":int "s.f3[1][1][3]":int "s.f3[2][0][0]":int "s.f3[2][0][1]":int "s.f3[2][0][2]":int "s.f3[2][0][3]":int "s.f3[2][1][0]":int "s.f3[2][1][1]":int "s.f3[2][1][2]":int "s.f3[2][1][3]":int "s.f3[3][0][0]":int "s.f3[3][0][1]":int "s.f3[3][0][2]":int "s.f3[3][0][3]":int "s.f3[3][1][0]":int "s.f3[3][1][1]":int "s.f3[3][1][2]":int "s.f3[3][1][3]":int "s.f3[4][0][0]":int "s.f3[4][0][1]":int "s.f3[4][0][2]":int "s.f3[4][0][3]":int "s.f3[4][1][0]":int "s.f3[4][1][1]":int "s.f3[4][1][2]":int "s.f3[4][1][3]":int
#step 1
#outs F 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
#step 2
#outs T 2 589 571 465 983 809 907 163 694 445 354 602 119 704 831 791 291 846 786 197 744 947 719 234 458 126 788 10 808 849 739 586 823 70 996 689 98 175 242 952 161
#step 3
#outs T 2 693 869 496 252 735 574 286 682 86 597 861 292 104 414 268 78 747 232 90 995 111 589 622 445 821 786 151 268 525 555 700 971 92 911 839 326 958 163 0 192
#step 4
#outs F 0 881 886 133 854 107 304 298 443 229 935 753 607 448 721 540 108 12 183 519 276 970 347 460 550 62 970 964 206 259 130 621 167 357 205 487 601 330 490 20 499
#step 5
#outs F 0 805 939 329 875 738 365 335 589 49 704 156 947 595 412 567 766 394 494 714 689 363 438 98 66 622 847 675 175 412 732 837 582 401 391 636 858 705 785 937 150
#step 6
#outs F 0 747 559 857 542 733 340 694 480 375 13 661 949 260 410 714 331 435 999 171 122 81 940 458 553 329 932 918 344 480 429 917 325 793 61 772 930 519 182 343 229
#step 7
#outs F 0 835 165 44 725 67 446 416 557 279 504 567 912 608 477 117 878 249 815 941 18 724 269 587 142 463 750 514 889 892 189 754 63 603 190 436 735 774 887 238 824
#step 8
#outs F 1 0 0 0 0 0 0 0 0 1 3 5 7 1 3 5 7 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
#step 9
#outs T 2 330 80 0 319 835 288 643 415 15 418 426 744 718 493 880 644 123 45 6 20 117 852 725 302 487 772 766 642 227 327 981 994 686 191 880 974 306 346 351 476
#step 10
#outs F 0 336 580 980 689 788 710 247 930 631 285 787 273 67 732 711 740 958 143 143 715 378 457 557 76 368 598 932 181 351 635 864 847 411 870 161 480 237 41 980 563
#end
#inputs
#outputs "J":int
#step 1
#outs 4
#step 2
#outs 4
#step 3
#outs 4
#step 4
#outs 3
#step 5
#outs 10
#step 6
#outs 6
#step 7
#outs 2
#step 8
#outs 7
#step 9
#outs 2
#step 10
#outs 6
#end
#inputs
#outputs "J":int
#step 1
#outs -1
#step 2
#outs 99
#step 3
#outs -1
#step 4
#outs -1
#step 5
#outs -1
#step 6
#outs -1
#step 7
#outs 20
#step 8
#outs -1
#step 9
#outs -1
#step 10
#outs -1
#end
#inputs
#outputs "J":int
#step 1
#outs 89
#step 2
#outs 32
#step 3
#outs 10
#step 4
#outs 70
#step 5
#outs 24
#step 6
#outs 29
#step 7
#outs 40
#step 8
#outs 100
#step 9
#outs 84
#step 10
#outs 11
#end
......@@ -11,7 +11,7 @@ PREFIX =$(HOME)/lurette
# XXX MODIFY IT IF NECESSARY !!!
PREFIX =$(shell pwd)/../../..
PREFIX =$(shell pwd)/../..
# C include and lib directories
INCDIR = $(PREFIX)/include
......@@ -22,7 +22,7 @@ BINDIR = $(PREFIX)/bin
#
# LuckyDraw
# XXX MODIFY IT IF NECESSARY !!!
LUCKYDRAW_LIBDIR = $(PREFIX)/$(HOST_TYPE)/lib
LUCKYDRAW_LIBDIR = $(PREFIX)/lib
CAMLLIBDIR = $(shell ocamlc -where)
#$(CAML_INSTALL)/lib/ocaml
......@@ -87,11 +87,24 @@ luckyDrawC_caml.cmx: luckyDrawC_caml.ml
luckyDrawC_stubs.c: luckyDrawC_stubs.c.m4
$(M4) $^ >$@
#---------------------------------------
# lib
#---------------------------------------
MAIN=essai
make test: clean $(MAIN)
./$(MAIN) | grep -v "The random engine is initialized with the seed" > $(MAIN).out && \
rm -f test.res && diff -u -i $(MAIN).out.exp $(MAIN).out \
> test.res
[ ! -s test.res ] && make clean
make utest:
cp $(MAIN).out $(MAIN).out.exp
#---------------------------------------
# cleaning
#---------------------------------------
clean:
/bin/rm -f *.cmi *.cmo *.cmx *.o luckyDrawC_stubs.c *~ essai
/bin/rm -f *.cmi *.cmo *.cmx *.o luckyDrawC_stubs.c *~ essai $(MAIN).out
......@@ -12,7 +12,7 @@ int main(int argc, char** argv)
{
char* argvv[1] = { NULL };
solutions sols;
solutions_set solset = { 0 };
int_expr i0 = { 0 };
int_expr i1 = { 0 };
......@@ -24,7 +24,9 @@ int main(int argc, char** argv)
bool_expr b2 = { 0 };
bool_expr b3 = { 0 };
caml_startup(argvv);
// caml_startup(argvv);