Commit 29377b85 authored by Erwan Jahier's avatar Erwan Jahier
Browse files

lurette unstable.4 Wed, 28 Feb 2007 11:28:50 +0100 by jahier

Parent-Version:      unstable.3
Version-Log:         empty
Project-Description: Lurette
parent 1f7cfe34
......@@ -6,13 +6,14 @@
(source/oracle.ml 2807 1088412276 h/31_oracle.ml 1.3)
(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)
(source/luciole.ml 5074 1172658530 r/42_luciole.ml 1.1)
(examples/xlurette/heater/test2.rif.exp 1294 1137765987 m/11_test2.rif. 1.1)
(install/set_env_var.bat.in 580 1137765987 j/29_set_env_va 1.2)
(install/set_env_var.bat.in 590 1172658530 j/29_set_env_va 1.3)
(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)
(examples/luckyDraw/ocaml/draw-ex.out 499 1172658530 l/6_draw-ex.ou 1.3)
(xlurette/Scade/GenMake_l4sim.tcl 21042 1165588586 j/16_GenMake_l4 1.2.1.1)
(examples/lucky/tut-solution/Makefile 315 1137765987 k/17_Makefile 1.1)
(examples/xlurette/Sildex/oracle_sildex.h 1516 1138025047 o/26_oracle_sil 1.1)
......@@ -50,10 +51,10 @@
(source/gen_stubs_sildex.mli 648 1090504025 h/37_gen_stubs_ 1.2)
(xlurette/Scade/Images/gnuplot.bmp 822 1122044801 i/26_gnuplot.bm 1.1)
(GBDDML/bdd.ml 2119 1170322322 r/36_bdd.ml 1.1)
(source/Makefile.luc4c 3146 1161778160 r/23_Makefile.l 1.1)
(source/Makefile.luc4c 3196 1172658530 r/23_Makefile.l 1.2)
(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)
(examples/xlurette/Gyro/Makefile 523 1172658530 m/38_Makefile 1.1.2.3)
(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)
......@@ -61,7 +62,7 @@
(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 2647 1169542477 l/4_Makefile 1.5)
(examples/luckyDraw/c/Makefile 2635 1172658530 l/4_Makefile 1.6)
(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)
......@@ -69,11 +70,11 @@
(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 51763 1169542477 41_parse_env. 1.70)
(source/parse_luc.ml 51759 1172658530 41_parse_env. 1.71)
(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)
(install/xlurette.sh.in 99 1172658530 g/21_xlurette.s 1.4)
(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)
......@@ -95,20 +96,20 @@
(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/Makefile.luc2c 1295 1139330945 n/45_Makefile.l 1.2)
(GBDDML/gbdd.cc 49536 1170322322 r/34_gbdd.cc 1.1)
(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)
(polka/documentation/Makefile 476 1165588586 e/18_Makefile 1.2)
(source/fair_bddd.mli 2505 1137765987 g/39_fair_bddd. 1.9)
(polka/caml/polka_caml.c 8112 1127735479 d/37_polka_caml 1.3)
(examples/xlurette/Sildex/sut_sildex.batch 406 1138025047 o/24_sut_sildex 1.1)
(install/xlurette.bat.in 60 1137765987 g/22_xlurette.b 1.3)
(install/xlurette.bat.in 62 1172658530 g/22_xlurette.b 1.4)
(test/time-ecrins.res 10644 1137765987 d/20_time-ecrin 1.51)
(examples/lucky/tut-examples/Makefile 611 1137765987 k/25_Makefile 1.1)
(user-rules 25341 1149596800 c/14_myrules 1.77)
(examples/xlurette/Scade-win32/counter.saofd 587 1137765987 l/40_counter.sa 1.1)
(polka/caml/polka_caml.h 1648 1071844798 d/36_polka_caml 1.2)
(utils/lucky_cpp 230 1137765987 n/29_lucky_cpp 1.1)
(utils/lucky_cpp 284 1172658530 n/29_lucky_cpp 1.2)
(source/liblutin_c.c 8384 1165588586 j/20_liblutin_c 1.1.2.1)
(source/Ezdl.mli 4044 1127735479 j/18_Ezdl.mli 1.1)
(examples/lucky/other/Makefile 1554 1165855990 k/47_Makefile 1.2)
......@@ -116,7 +117,7 @@
(source/value.ml 2681 1078751438 c/23_value.ml 1.9)
(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 28283 1170322322 r/33_gbdd.h 1.1)
(GBDDML/gbdd.h 30899 1172658530 r/33_gbdd.h 1.2)
(source/var.mli 3632 1127735479 g/50_var.mli 1.13)
(examples/xlurette/tram/passerelle.luc 641 1138025047 o/17_passerelle 1.1)
(examples/xlurette/Gyro/onlyroll2.lus 18345 1137765987 m/30_onlyroll2. 1.1)
......@@ -146,7 +147,7 @@
(install/pixmaps/myrun.bmp 44098 1137765987 m/44_myrun.bmp 1.1)
(doc/lurette-man/lurette-man.tex 39569 1137765987 h/33_lurette-ma 1.4)
(source/env_state.ml 21854 1137765987 51_env_state. 1.64)
(lnsw 1024 1138034376 q/35_lnsw 1.1)
(lnsw 2167 1172658530 q/35_lnsw 1.2)
(doc/ocamldoc.sty 1720 1071235286 b/12_ocamldoc.s 1.3)
(examples/xlurette/heater/temp_int.luc 759 1137765987 m/7_temp_int.l 1.1)
(examples/xlurette/heater/heater_ctrl2.lus 182 1137765987 m/21_heater_ctr 1.1)
......@@ -176,7 +177,7 @@
(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 4698 1165588586 b/41_Makefile.i 1.39.1.1)
(source/Makefile.lucky 4874 1172658530 b/41_Makefile.i 1.39.1.2)
(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)
......@@ -198,7 +199,7 @@
(source/type.mli 756 1149596800 h/11_type.mli 1.4)
(examples/xlurette/Scade-win32/telemetry_validation.saofd 4738 1137765987 l/30_telemetry_ 1.1)
(GBDDML/Makefile.R1 1031 1170322322 r/39_Makefile.R 1.1)
(install/set_env_var.in 1672 1165588586 g/23_set_env_va 1.9.2.1)
(install/set_env_var.in 1684 1172658530 g/23_set_env_va 1.9.2.2)
(examples/xlurette/Scade-win32/C_SQRT.saofd 214 1137765987 m/2_C_SQRT.sao 1.1)
(examples/ocaml/crazy-rabbit/crazy_rabbit-rabbit_speed.luc 3547 1137765987 j/41_crazy_rabb 1.1)
(examples/ocaml/crazy-rabbit/up_and_down_macro 408 1137765987 k/5_up_and_dow 1.1)
......@@ -209,7 +210,7 @@
(install/pixmaps/lupref.bmp 822 1137765987 m/51_lupref.bmp 1.1)
(i386-linux-gcc3/include/signal4.h 6995 1138025047 o/32_signal4.h 1.1)
(source/formula_to_bdd.mli 1358 1137765987 g/35_formula_to 1.9)
(install/configure.in 9329 1149596800 d/11_configure. 1.26)
(install/configure.in 9456 1172658530 d/11_configure. 1.27)
(examples/xlurette/Scade-win32/Command.saofd 4147 1137765987 m/1_Command.sa 1.1)
(examples/xlurette/fault-tolerant-heater/heater_control_env.luc 485 1137765987 h/16_heater_con 1.4)
(doc/lurette-man/fault-tolerant-tut.tex 15451 1138032075 q/11_fault-tole 1.1)
......@@ -267,7 +268,7 @@
(i386-linux-gcc3/include/communic.h 444 1138025047 o/35_communic.h 1.1)
(source/graph.ml 3777 1137765987 14_graph.ml 1.14)
(examples/xlurette/Scade-sparc/libdigital.saofdm 1256 1137765987 l/20_libdigital 1.1)
(source/util.ml 20595 1149596800 35_util.ml 1.80)
(source/util.ml 21408 1172658530 35_util.ml 1.81)
(xlurette/Scade/luctcl.tcl 586 1122044801 j/12_luctcl.tcl 1.1)
(source/luc4ocaml.ml 4459 1149596800 i/30_lucaml.ml 1.3)
(examples/xlurette/Scade-win32/compute_path.saofd 1662 1137765987 l/41_compute_pa 1.1)
......@@ -297,8 +298,8 @@
(examples/ocaml/crazy-rabbit/rabbit.out.exp 31899 1137765987 j/50_rabbit.out 1.1)
(examples/xlurette/Gyro/onlyroll.batch 381 1137765987 m/32_onlyroll.b 1.1)
(test/time-asti.res 3594 1127735479 h/40_time-asti. 1.12)
(install/gen_stubs.sh.in 95 1137765987 g/29_gen_stubs. 1.3)
(RUN_ME 928 1137765987 f/26_INSTALL 1.4)
(install/gen_stubs.sh.in 99 1172658530 g/29_gen_stubs. 1.4)
(RUN_ME 930 1172658530 f/26_INSTALL 1.5)
(source/error.ml 29 1137765987 n/33_error.ml 1.1)
(doc/ocamldoc.hva 313 1008328137 b/13_ocamldoc.h 1.1)
(examples/xlurette/Scade-win32/lib_pilot.err 119 1137765987 l/35_lib_pilot. 1.1)
......@@ -306,11 +307,11 @@
(examples/xlurette/Scade-sparc/Direction_D1/Direction_D1_var.corresp 0 1137765987 l/22_Direction_ 1.1)
(doc/lurette-man/batch.jpg 307 1138032075 q/3_batch.jpg 1.1)
(examples/xlurette/Sildex/test.rif.exp 1048702 1138025047 o/25_test.rif.e 1.1)
(install/Makefile.lurette.in 5158 1137765987 b/38_Makefile.l 1.38)
(GBDDML/Makefile 2975 1170322322 r/30_Makefile 1.1)
(install/Makefile.lurette.in 5211 1172658530 b/38_Makefile.l 1.39)
(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 1170322322 n/43_version.ml 1.8)
(source/version.ml 21 1172658530 n/43_version.ml 1.9)
(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)
......@@ -322,8 +323,8 @@
(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 1594 1169542477 r/25_Makefile 1.3)
(source/luc2c.ml 18086 1165507939 n/46_luc2c.ml 1.5)
(examples/lucky/lustre/Makefile 1660 1172658530 r/25_Makefile 1.4)
(source/luc2c.ml 18725 1172658530 n/46_luc2c.ml 1.6)
(install/pixmaps/config-params.bmp 6966 1137765987 m/47_config-par 1.1)
(source/gen_stubs.ml 14674 1137765987 24_generate_l 1.63)
(examples/lucky/C/foo.luc 199 1149596800 r/19_foo.luc 1.1)
......@@ -331,7 +332,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 21977 1169542477 c/20_Makefile 1.51)
(source/Makefile 22198 1172658530 c/20_Makefile 1.52)
(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)
......@@ -357,9 +358,9 @@
(polka/documentation/texinfo.tex 200195 1047029868 e/16_texinfo.te 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/tram/Makefile 1308 1172658530 o/19_Makefile 1.1.1.3)
(examples/xlurette/fault-tolerant-heater/Makefile 848 1165855990 n/47_Makefile 1.1.1.2)
(source/Makefile.release 14026 1169542477 n/41_Makefile.r 1.9)
(source/Makefile.release 14155 1172658530 n/41_Makefile.r 1.10)
(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)
......@@ -372,7 +373,7 @@
(source/sorted_list.ml 1191 1137765987 j/33_sorted_lis 1.1)
(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)
(source/Makefile.show_luc 1297 1172658530 b/40_Makefile.s 1.20.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)
......@@ -390,12 +391,12 @@
(source/thickness.ml 1769 1122044801 g/51_thickness. 1.5)
(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 10084 1169542477 r/16_luc4c.ml 1.2)
(source/luc4c.ml 10097 1172658530 r/16_luc4c.ml 1.3)
(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)
(examples/xlurette/heater/window.luc 4333 1137765987 m/28_window.luc 1.1)
(source/Makefile.gen_stubs 1623 1137765987 b/42_Makefile.g 1.15)
(source/Makefile.gen_stubs 1654 1172658530 b/42_Makefile.g 1.15.1.1)
(README-luckyDraw 1338 1137765987 j/36_README-luc 1.1)
(install/pixmaps/linegraph.xpm 697 1137765987 n/3_linegraph. 1.1)
(source/command_line.ml 5724 1122044801 b/20_command_li 1.24)
......@@ -413,15 +414,15 @@
(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)
(test/time-joly.exp 10603 1161778160 b/48_time.exp 1.74)
(test/time-joly.exp 10657 1172658530 b/48_time.exp 1.75)
(i386-linux-gcc3/bin/ec2c 580960 1138032075 q/16_ec2c 1.1)
(source/lutin_caml.mli 3222 1122044801 i/35_lutin_caml 1.1)
(examples/lucky/other/losange-3d.luc 570 1137765987 k/46_losange-3d 1.1)
(examples/lucky/other/test1.rif.exp 33449 1137765987 k/41_test1.rif. 1.1)
(polka/Makefile.config 2289 1138025047 e/20_Makefile.c 1.10)
(polka/Makefile.config 2472 1172658530 e/20_Makefile.c 1.10.1.1)
(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/lucky/external_code/Makefile 1182 1165855990 j/24_Makefile 1.3)
(examples/lucky/external_code/Makefile 1494 1172658530 j/24_Makefile 1.4)
(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)
(source/sut.ml 2317 1083336219 h/29_sut.ml 1.2)
......@@ -431,7 +432,7 @@
(source/gen_stubs_common.mli 2547 1122044801 e/40_gen_stubs_ 1.5)
(examples/ocaml/crazy-rabbit/moving-obstacle.luc 1605 1137765987 j/45_moving-obs 1.1)
(TAGS 9825 1007379917 21_TAGS 1.6)
(examples/ocaml/crazy-rabbit/Makefile 2119 1165588586 k/3_Makefile 1.2)
(examples/ocaml/crazy-rabbit/Makefile 2144 1172658530 k/3_Makefile 1.3)
(examples/xlurette/Scade-sparc/Direction_D1/Direction_D1.h 835 1137765987 l/24_Direction_ 1.1)
(examples/xlurette/Scade-sparc/libmathadvanced.saofdm 3267 1137765987 l/13_libmathadv 1.1)
(examples/ocaml/crazy-rabbit/crazy_rabbit-rabbit_dir.luc 3474 1137765987 j/40_crazy_rabb 1.1)
......@@ -486,15 +487,15 @@
(doc/lurette-man/browse-button.jpg 688 1138032075 q/2_browse-but 1.1)
(source/prevar.mli 1029 1137765987 d/19_prevar.mli 1.7)
(source/Makefile.oplot 205 1122044801 i/51_Makefile.o 1.1)
(source/Makefile.lurette_lib 3268 1137765987 c/2_Makefile.l 1.36)
(source/Makefile.lurette_lib 3353 1172658530 c/2_Makefile.l 1.37)
(examples/lucky/C/call_foo.c 777 1149596800 r/20_call_foo.c 1.1)
(source/luc4c_stubs.c 6996 1169542477 r/13_luc4c_stub 1.3)
(source/luc4c_stubs.c 6726 1172658530 r/13_luc4c_stub 1.4)
(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)
(examples/lucky/other/infinite_weight.luc 1116 1137765987 k/49_infinite_w 1.1)
(install/lurettetop.sh.in 144 1137765987 g/25_lurettetop 1.4)
(source/luc4c_stubs.h 3160 1149596800 r/12_luc4c_stub 1.1)
(install/lurettetop.sh.in 148 1172658530 g/25_lurettetop 1.5)
(source/luc4c_stubs.h 3162 1172658530 r/12_luc4c_stub 1.2)
(xlurette/Scade/Makefile 1963 1165588586 j/13_Makefile 1.2.1.1)
(examples/xlurette/Scade-win32/Pilot_cst.saofd 788 1137765987 l/43_Pilot_cst. 1.1)
(examples/ocaml/crazy-rabbit/synchron2005.pdf 241697 1137765987 j/47_synchron20 1.1)
......@@ -513,7 +514,7 @@
(xlurette/makefile 4587 1138032075 q/21_makefile 1.1)
(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 4773 1165588586 j/0_Makefile.o 1.3.1.2)
(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)
(GBDDML/test.ml 366 1170322322 r/31_test.ml 1.1)
(polka/C/config.h 78 1071844798 e/13_config.h 1.2)
......@@ -524,7 +525,7 @@
(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 878 1169542477 j/38_Makefile 1.5)
(examples/Makefile 909 1172658530 j/38_Makefile 1.6)
(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)
......@@ -532,14 +533,14 @@
(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)
(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)
(examples/lucky/external_code/call_external_c_code.luc 1167 1172658530 j/23_call_exter 1.3)
(test/time-moucherotte.res 4158 1088412276 e/38_time-mouch 1.24)
(examples/ocaml/crazy-rabbit/crazy_rabbit-moving_obstacle3.luc 4732 1137765987 j/39_crazy_rabb 1.1)
(source/parse_poc.ml 3993 1122044801 d/15_parse_poc. 1.9)
(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 8486 1165588586 d/22_TODO 1.60)
(TODO 8452 1172658530 d/22_TODO 1.61)
(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)
......@@ -549,8 +550,8 @@
(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 70 1165588586 j/25_VERSION 1.2.1.2)
(source/Makefile.luckyDraw 4700 1165507939 j/6_Makefile.l 1.4)
(VERSION 76 1172658530 j/25_VERSION 1.2.1.3)
(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)
(doc/synthese 2556 1007379917 b/2_synthese 1.1)
......@@ -563,14 +564,14 @@
(doc/lurette-man/heater_control.tex 2712 1138032075 q/10_heater_con 1.1)
(doc/lurette-man/macros.tex 5209 1138032075 q/7_macros.tex 1.1)
(examples/lucky/other/test1.res 0 1137765987 k/43_test1.res 1.1)
(examples/luckyDraw/ocaml/Makefile 581 1165855990 l/9_Makefile 1.3)
(examples/luckyDraw/ocaml/Makefile 760 1172658530 l/9_Makefile 1.4)
(polka/C/matrix.h 3846 1071844798 d/51_matrix.h 1.2)
(doc/tutorial/intro-lucky.tex 5319 1138032075 q/29_intro-luck 1.1)
(install/pixmaps/run.bmp 726 1137765987 m/43_run.bmp 1.1)
(install/lurettetop_sh.in 721 1137765987 g/24_lurettetop 1.2)
(doc/lucky-man/lucky-man.tex 41866 1127735479 h/34_lucky-man. 1.3)
(source/Makefile.gen_fake_lucky 1397 1137765987 g/9_Makefile.g 1.9)
(examples/lucky/C/Makefile 1101 1165477648 r/21_Makefile 1.2)
(source/Makefile.gen_fake_lucky 1428 1172658530 g/9_Makefile.g 1.10)
(examples/lucky/C/Makefile 1174 1172658530 r/21_Makefile 1.3)
(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)
......
......@@ -45,6 +45,14 @@ ifeq ($(HOST_TYPE),sparc-sun)
OCAMLC = ocamlc
CPP_COMPILER=g++
CPP_LINKER=g++
else
ifeq ($(HOST_TYPE),mac)
OCAML_LIB=/private/var/automount/import/macos/ocaml/3.09.3/lib/ocaml
OCAMLOPT =ocamlopt -cc g++
OCAMLC = ocamlc
CPP_COMPILER=g++
OCAMLFLAGS= -cc g++
CPP_LINKER=g++
else
OCAML_LIB=ocaml
OCAMLOPT =ocamlopt
......@@ -53,10 +61,11 @@ else
CPP_LINKER=g++
endif
endif
endif
#OCAMLOPT = ocamlopt
CPP_FLAGS=-g g-O0 -fno-operator-names -I$(OCAML_LIB)
CPP_FLAGS=-g -O0 -fno-operator-names
LFLAGS = -cclib -lstdc++
......
......@@ -12,11 +12,53 @@
#ifdef DEBUG_GBDD
void CHECK_GBDD(int verb){
int vm;
int vm = 0;
if(verb) vm = GBdd::set_verbose_mode();
GBdd::manager.check_alive_list();
if(verb) GBdd::set_verbose_mode(vm);
}
void DUMP_BDD(GBdd* b){
if(*b == true_bdd()){
printf("true_bdd\n");
} else if(*b == false_bdd()){
printf("false_bdd\n");
} else if(b->is_leaf()){
printf("leaf{val=0x%X}\n", (unsigned int)b->leaf_info());
} else if(b->is_bool()){
GBddValue hv = b->high_part().value();
GBddValue lv = b->low_part().value();
printf("node{(%d)?", b->root_var());
if(hv == GBdd::true_value()){
printf(" 1 : ");
} else if(hv == GBdd::false_value()){
printf(" 0 : ");
} else {
printf(" %c 0x%x : ",
GBdd::sign(hv)? '-' : '+',
(unsigned int)GBdd::node(hv)
);
}
if(lv == GBdd::true_value()){
printf(" 1 }\n");
} else if(lv == GBdd::false_value()){
printf(" 0 }\n");
} else {
printf(" %c 0x%x }\n",
GBdd::sign(lv)? '-' : '+',
(unsigned int)GBdd::node(lv)
);
}
} else {
printf("generalized bdd node\n");
}
}
void DUMP_LIST(GBddList* b){
GBddList* l;
for(l = b; l; l = l->tail()){
DUMP_BDD(&(l->head()));
}
}
#endif
static void default_exit(){
......@@ -265,6 +307,22 @@ int GBdd::size() const {
return GBdd::node(value())->size(mark);
}
int GBdd::unsigned_size() const {
int mark = get_mark_key();
return rec_unsigned_size(mark);
}
int GBdd::rec_unsigned_size(int mark) const {
if(is_leaf()) return 0;
if(get_mark(mark)) return 0; //dj compt
put_mark(mark, (void*)1);
return (
1 +
low_part().rec_unsigned_size(mark) +
high_part().rec_unsigned_size(mark)
);
}
int GBdd::tree_size() const {
if(is_leaf()) return 0;
return GBdd::node(value())->tree_size();
......@@ -2111,7 +2169,7 @@ char* GBdd::trueop = "true";
char* GBdd::falseop = "false";
char* GBdd::notop = "!";
char* GBdd::andop = ".";
char* GBdd::orop = " +";
char* GBdd::orop = " +\n";
char* GBdd::idyop = "";
char* GBdd::openpar = "";
char* GBdd::closepar = "";
......
......@@ -22,6 +22,9 @@ simple !
const char* GBdd::version() (méthode statique)
1.1
Compatibilité avec g++ > 4
1.0 (novembre 2001) :
- gestion des versions,
- class GBddList en standard (voir 10)
......@@ -243,9 +246,12 @@ T
GBdd head()
GBddList* tail()
Taille en noeuds, en tenant compte du partage :
Taille en noeuds (signed-bdd)
int size();
Taille en sous-fonctions (partage, mais pas signe).
int unsigned_size();
Modif en place (pas beau) :
void set_head(const GBdd& v)
----------------------------------------------------------------------
......@@ -319,7 +325,11 @@ A6) ``taille'' d'un bdd:
int GBdd::size(); renvoie la ``taille'' de la representation interne
du bdd. Elle est exprimee en nombre de noeud et tiend compte du partage.
int GBdd::tree_size(); renvoie la ``taille'' de l'arbre de Shanon
int GBdd::unsigned_size(); renvoie la ``taille'' du graphe de Shannon
en nombre de noeuds binaires : i.e. ne tiens pas compte du
signe.
int GBdd::tree_size(); renvoie la ``taille'' de l'arbre de Shannon
equivalent au bdd NE TIEND PAS COMPTE DU PARTAGE !!!!
A7) Decalage des arguments
......@@ -349,12 +359,19 @@ typedef void (*void2void)() ;
/* Pour faire des operations bit a bit sur les GBddValue */
typedef unsigned long int GBddValue2BitString;
class GBdd {
friend class GBddList;
friend class GBddNode;
friend class GBddManager;
friend void GBddPrintLeafDflt(FILE* f, void* v);
friend void INIT_GBDD_GLOBALS();
#ifdef DEBUG_GBDD
friend void CHECK_GBDD(int verb = 0);
friend void DUMP_BDD(GBdd* b);
friend void DUMP_LIST(GBddList* b);
#endif
GBddValue it;
GBdd* next_alive;
......@@ -418,13 +435,19 @@ protected :
static int smooth_op_var;
GBdd rec_smooth(int x) const;
public :
static GBddManager manager;
static GBddValue true_value();
static GBddValue false_value();
/* Implementation de unsigned_size */
int rec_unsigned_size(int mark) const;
public :
//POUR LES STATS :
static int total_nb_nodes();
static const char* version(){ return "1.0"; }
static const char* version(){ return "1.1"; }
/* Initialisation du module :
L'initialisation n'est pas necessaire : il y une valeur
......@@ -542,8 +565,12 @@ public :
int max_var() const; //La plus grande var de this
int nb_vars() const; //Le nombre de vars du support
int size() const; //Le nombre de noeuds dans this
int tree_size() const; //Le nombre de noeuds dans l'arbre equiv a this
//Le nombre de noeuds dans this
int size() const;
//Le nombre de noeuds dans le bdd non-signe equiv a this
int unsigned_size() const;
//Le nombre de noeuds dans l'arbre equiv a this
int tree_size() const;
GBdd shift(int n) const; // decale les arguments de +n
GBdd rename(int (*f)(int)) const; // renomme les arguments
......@@ -578,10 +605,14 @@ public :
friend GBdd or(const GBdd& t1, const GBdd& t2);
friend GBdd impl(const GBdd& t1, const GBdd& t2);
friend GBdd xor(const GBdd& t1, const GBdd& t2);
inline friend GBdd eq(const GBdd& t1, const GBdd& t2)
{ return not(xor(t1, t2)); };
inline friend GBdd neq(const GBdd& t1, const GBdd& t2)
{ return xor(t1, t2); };
//inline
friend GBdd eq(const GBdd& t1, const GBdd& t2)
//{ return not(xor(t1, t2)); }
;
//inline
friend GBdd neq(const GBdd& t1, const GBdd& t2)
//{ return xor(t1, t2); }
;
friend GBdd constrain(const GBdd& f, const GBdd& c);
friend GBdd restrict(const GBdd& f, const GBdd& c);
......@@ -634,6 +665,47 @@ public :
void print_mons() const;
void print_mons_ln() const;
};
/*---------------------------------------------------------------
Version 1.1 => à partir de g++ > 4
les fonctions friend doivent être re-déclarées en dehors
de la classe pour être référencées comme exporté dans le .o
----------------------------------------------------------------*/
const GBdd& true_bdd();
const GBdd& false_bdd();
GBdd null_bdd(); //Un GBdd non initialise
GBdd leaf(void* i); // Feuille decoree avec "i"
GBdd idy(int i); // Fonction identite sur la ieme var
GBdd nidy(int i); // Fonction complement sur la ieme var
int compare(const GBdd& t1, const GBdd& t2); // retourne 0 SSI égalité
//Comparaisons
int operator==(const GBdd& t1, const GBdd& t2);
int operator!=(const GBdd& t1, const GBdd& t2);
int test_impl(const GBdd& t1, const GBdd& t2);
int test_and(const GBdd& t1, const GBdd& t2);
/* if .. then .. else : le premier argument doit etre pur booleen */
GBdd ite(const GBdd& c, const GBdd& t1, const GBdd& t2);
/* .... ou un entier : */
GBdd ite(int v, const GBdd& t1, const GBdd& t2);
GBdd not(const GBdd& t);
GBdd and(const GBdd& t1, const GBdd& t2);
GBdd or(const GBdd& t1, const GBdd& t2);
GBdd impl(const GBdd& t1, const GBdd& t2);
GBdd xor(const GBdd& t1, const GBdd& t2);
inline GBdd eq(const GBdd& t1, const GBdd& t2) { return not(xor(t1, t2)); };
inline GBdd neq(const GBdd& t1, const GBdd& t2) { return xor(t1, t2); };
GBdd constrain(const GBdd& f, const GBdd& c);
GBdd restrict(const GBdd& f, const GBdd& c);
GBdd constrain_bu(const GBdd& f, const GBdd& c);
GBdd constrain_td(const GBdd& f, const GBdd& c);
GBdd forall(int x, const GBdd& t);
GBdd exist(int x, const GBdd& t);
GBdd exist_x2max(int x, const GBdd& t);
GBdd forall_x2max(int x, const GBdd& t);
GBdd exist(const GBdd& vars, const GBdd& f);
GBdd forall(const GBdd& vars, const GBdd& f);
/*---------------------------------------------------------------
Classe GBddList
-----------------------------------------------------------------
......@@ -966,9 +1038,18 @@ public :
/* pretty print des bdd's */
void print_ite(FILE* f, GBddValue b, void (*ppl)(FILE*,void*), int t);
void print(FILE* , GBddValue , void (*ppl)(FILE*,void*), char*, int, int);
};
inline GBddValue GBdd::true_value(){
return manager.internal_true;
}
inline GBddValue GBdd::false_value(){
return manager.internal_false;
}
#ifdef DEBUG_GBDD
extern void CHECK_GBDD(int verb = 0);
extern void CHECK_GBDD(int verb);
extern void DUMP_BDD(GBdd* b);
extern void DUMP_LIST(GBddList* b);
#endif
......@@ -40,7 +40,7 @@ if test $GO = yes; then
cd install
rm -f config.cache
echo "./configure --prefix $INSTALL_DIR"
./configure --prefix $INSTALL_DIR
./configure --prefix "$INSTALL_DIR"
else
echo "quitting Lurette installation procedure..."
fi
......@@ -183,8 +183,6 @@ apparaissent les monomes. Ca fout les boules...
* Finir lucky2lus
* Finir le compilo lutin de Yvan
* Les alias doivent ils etre dans le .rif au meme titre
que les autres variables locales -> ajouter une option !
......
VERSION_DATE=20-01-06
VERSION=1.42
VERSION_DATE=01-02-07
VERSION=unstable.3
export VERSION
export VERSION_DATE
......@@ -4,18 +4,20 @@
test:
rm -f */.lurette_rc */*/.lurette_rc */*/*/.lurette_rc
cd lucky/ex