Commit 1d4d5e4c authored by Erwan Jahier's avatar Erwan Jahier
Browse files

lurette 1.38 Tue, 09 Nov 2004 08:50:49 +0100 by jahier

Parent-Version:      1.37
Version-Log:

source/util.ml:
   put the C_GENERATOR_FLAG at the end of the list of options of lustre2C
   so that the -name_lenght lustre2C option can be taken into account.

source/Makefile.lucky
source/Makefile.lurette_lib
source/fair_bddd.ml
source/fair_bddd.mli
source/bddd.ml
source/bddd.mli
source/solver.ml
source/sol_nb.ml [new] :
   put all the stuff related to the counting of the solution number in a
dedicated
   module.

   Make the representation of solution numbers abstract.

   Use the log-based coding instead of the real value so that it does not
overflow,
   which was the case when the programs have more than 1200 variables.

source/parse_c_scade.ml
   Fix a bug when parsing C scade files due to the fact that not all
   variable name start with '_' (one start with 'SYNCHRO_')

source/gen_fake_lucky.ml
  When no environment is provided, also generate a file named
  <node>_env_UD in addition to the fake env in <node>_env. That one
  is more elaborated and contraints the output variables so that they
  move up and down.

ihm/xlurette/xlurette.glade
ihm/xlurette/xlurette_glade_interface.ml

share/Makefile.lurette.in
   include user test dir before scade dir, otherwise, inconsistent definitions
   of reals may coexist.

Project-Description: Lurette
parent d3946417
......@@ -3,16 +3,16 @@
(Created-By-Prcs-Version 1 3 3)
(cuddaux/cuddauxGenCof.c 12011 1034006019 c/29_cuddauxGen 1.1)
(source/show_env.mli 1198 1088597013 42_show_env.m 1.14)
(source/util.ml 23925 1093938205 35_util.ml 1.73)
(test/time-asti.res 5647 1096465027 h/40_time-asti. 1.8)
(source/util.ml 23926 1099986649 35_util.ml 1.74)
(test/time-asti.res 5676 1099986649 h/40_time-asti. 1.9)
(test/cygwin-scade/lib_pilot.vsp 1433 1055926783 f/47_lib_pilot. 1.1)
(source/constraint.mli 1697 1082533083 c/18_constraint 1.10)
(test/ControleurPorte.lus 3219 1032940601 c/17_Controleur 1.1)
(mlcuddidl/Changes 129 1071844798 d/10_Changes 1.2)
(TODO 7467 1096465027 d/22_TODO 1.54)
(TODO 7982 1099986649 d/22_TODO 1.55)
(share/gen_fake_lutin.sh.in 115 1063786164 g/30_gen_fake_l 1.1)
(mlcuddidl/rdd.mli 7174 1034006019 c/40_rdd.mli 1.1)
(source/fair_bddd.ml 21501 1090330182 g/38_fair_bddd. 1.9)
(source/fair_bddd.ml 22112 1099986649 g/38_fair_bddd. 1.10)
(source/type.mli 733 1078751438 h/11_type.mli 1.2)
(source/ne.mli 2258 1078751438 c/22_ne.mli 1.10)
(share/config.guess 39153 1055926783 f/25_config.gue 1.1)
......@@ -24,7 +24,7 @@
(share/pixmaps/open.xpm 782 1055926783 f/17_open.xpm 1.1)
(source/parse_luc.mli 2817 1088412276 40_parse_env. 1.25)
(polka/C/internal.c 883 1071844798 e/8_internal.c 1.2)
(source/solver.ml 7659 1088432998 39_solver.ml 1.62)
(source/solver.ml 7707 1099986649 39_solver.ml 1.63)
(test/tram/passager.luc 390 1080290901 h/5_passager.l 1.2)
(ihm/xlurette/makefile 4019 1096465027 c/16_makefile 1.24)
(test/losange-3d.rif.exp-ocaml7 33426 1093938205 i/1_losange-3d 1.1)
......@@ -39,7 +39,7 @@
(share/lucky_cpp 230 1088412276 h/39_lucky_cpp 1.1)
(test/tram/passerelle.luc 641 1080290901 h/4_passerelle 1.2)
(test/ControleurPorte.c 9407 1012914629 b/19_Controleur 1.1)
(source/bddd.mli 1344 1078751438 g/37_bddd.mli 1.10)
(source/bddd.mli 1140 1099986649 g/37_bddd.mli 1.11)
(share/lucky_init.sh.in 142 1071844798 e/24_lucky_init 1.12)
(test/heater.lus 176 1063786164 g/33_heater.lus 1.1)
(test/ControleurPorte.h 2306 1012914629 b/18_Controleur 1.1)
......@@ -50,7 +50,7 @@
(test/cygwin-scade/Pilot_cst.saofd 788 1055926783 f/38_Pilot_cst. 1.1)
(test/cygwin-scade/lib_pilot.etp 1173 1055926783 f/48_lib_pilot. 1.1)
(source/command_line.mli 1782 1090330182 b/21_command_li 1.19)
(source/Makefile.lucky 3823 1090917546 b/41_Makefile.i 1.34)
(source/Makefile.lucky 3914 1099986649 b/41_Makefile.i 1.35)
(polka/README 1437 1047029868 e/19_README 1.1)
(README 3708 1090330182 10_README 1.16)
(source/gen_stubs_scade.ml 9643 1090917546 f/5_gen_stubs_ 1.6)
......@@ -59,7 +59,7 @@
(cuddaux/cuddauxMisc.c 13842 1034006019 c/27_cuddauxMis 1.1)
(source/polyhedron.ml 13885 1078751438 d/25_polyhedron 1.18)
(source/Makefile.gen_fake_lucky 722 1090917546 g/9_Makefile.g 1.6)
(RELEASE-NOTES 939 1096465027 h/45_RELEASE-NO 1.2)
(RELEASE-NOTES 1447 1099986649 h/45_RELEASE-NO 1.3)
(polka/C/poly.c 53392 1071844798 e/5_poly.c 1.2)
(source/luc_exe.mli 436 1080290901 b/31_ima_exe.ml 1.5)
(doc/ocamldoc.sty 1720 1071235286 b/12_ocamldoc.s 1.3)
......@@ -73,7 +73,7 @@
(source/gen_stubs_poc.mli 643 1088412276 f/4_gen_stubs_ 1.4)
(test/losange-3d.luc 552 1076684617 d/28_losange-3d 1.5)
(test/time-moucherotte.res 4158 1088412276 e/38_time-mouch 1.24)
(share/show_luc.bat 750 1090917546 h/43_show_luc.b 1.3)
(share/show_luc.bat 731 1099986649 h/43_show_luc.b 1.4)
(polka/caml/poly.idl 10352 1076684617 d/33_poly.idl 1.3)
(test/tram/controleur_env.luc 433 1073401581 h/6_controleur 1.1)
(polka/documentation/texinfo.tex 200195 1047029868 e/16_texinfo.te 1.1)
......@@ -89,31 +89,32 @@
(test/giro/onlyroll.lus 18298 1031732392 c/7_onlyroll.l 1.1)
(polka/Changes 1952 1071844798 e/22_Changes 1.2)
(source/poly_draw.mli 1514 1078751438 g/44_polyDraw.m 1.4)
(share/show_luc.sh 168 1090917546 h/42_show_luc.s 1.3)
(FAQ 1744 1099986649 i/15_FAQ 1.1)
(share/show_luc.sh 172 1099986649 h/42_show_luc.s 1.4)
(test/losange-10d.luc 1499 1076684617 g/42_losange-10 1.4)
(test/sparc-scade/libdigital.saofdm 1256 1055487917 e/47_libdigital 1.1)
(test/test13.rif.exp-ocaml7 594 1093938205 h/49_test13.rif 1.1)
(share/lucky.vim 1861 1090330182 h/44_lucky.vim 1.1)
(test/temp_int.luc 517 1063786164 b/50_temp_int.e 1.7)
(source/print.mli 1130 1078751438 46_print.mli 1.15)
(test/time-joly.exp 10239 1096465027 b/48_time.exp 1.69)
(test/time-joly.exp 10235 1099986649 b/48_time.exp 1.70)
(polka/caml/Makefile 6578 1096465027 d/45_Makefile 1.6)
(test/cygwin-scade/det_mvt_mode.saofd 4184 1055926783 f/51_det_mvt_mo 1.1)
(ihm/xlurette/xlurette_glade_main.ml 62865 1096465027 c/12_xlurette_g 1.46)
(TAGS 9825 1007379917 21_TAGS 1.6)
(polka/C/main.tex 1961 1047029868 e/14_main.tex 1.1)
(ihm/xlurette/xlurette.glade 112083 1096465027 c/13_xlurette.g 1.34)
(ihm/xlurette/xlurette.glade 112071 1099986649 c/13_xlurette.g 1.35)
(test/cygwin-scade/MODULE.saofd 3026 1055926783 f/45_MODULE.sao 1.1)
(source/lexeme.ml 1632 1078751438 h/22_lexeme.ml 1.1)
(test/cygwin-scade/Command.saofd 4147 1055926783 g/6_Command.sa 1.1)
(test/cygwin-scade/lib_pilot.err 119 1055926783 f/49_lib_pilot. 1.1)
(test/losange.luc 410 1046768487 d/27_losange.lu 1.2)
(test/gyro.rif.exp 11475 1083336219 e/36_gyro.rif.e 1.13)
(test/time-ecrins.exp 10233 1080290901 d/21_time-ecrin 1.45)
(test/time-ecrins.exp 10233 1099986649 d/21_time-ecrin 1.46)
(source/value.ml 2681 1078751438 c/23_value.ml 1.9)
(source/gne.ml 3426 1082533083 b/37_gne.ml 1.9)
(test/cygwin-scade/Pilot.vsp 2075 1055926783 f/40_Pilot.vsp 1.1)
(source/parse_c_scade.ml 6921 1078751438 e/41_parse_c_sc 1.5)
(source/parse_c_scade.ml 7341 1099986649 e/41_parse_c_sc 1.6)
(source/gen_stubs_sildex.mli 648 1090504025 h/37_gen_stubs_ 1.2)
(share/lurettetop.sh.in 164 1080290901 g/25_lurettetop 1.3)
(test/cygwin-scade/position_validation.saofd 10188 1055926783 f/36_position_v 1.1)
......@@ -134,7 +135,7 @@
(source/env_state.ml 16403 1088432998 51_env_state. 1.61)
(test/test8.rif.exp 470 1082533083 g/18_test8.rif. 1.7)
(polka/caml/matrix.idl 6467 1076684617 d/34_matrix.idl 1.4)
(source/fair_bddd.mli 2479 1088597013 g/39_fair_bddd. 1.7)
(source/fair_bddd.mli 2471 1099986649 g/39_fair_bddd. 1.8)
(test/Sildex/sildex.rif.exp 1047172 1093938205 i/9_sildex.rif 1.1)
(test/test12.rif.exp-ocaml7 3382 1093938205 h/50_test12.rif 1.1)
(cuddaux/cuddauxAddIte.c 12812 1034006019 c/32_cuddauxAdd 1.1)
......@@ -155,7 +156,7 @@
(source/call_lurette_main.c 322 1050421093 e/28_call_luret 1.1)
(polka/C/vector.c 17843 1071844798 e/3_vector.c 1.2)
(test/sparc-scade/Direction_D1.saofd 1335 1074519403 e/51_Direction_ 1.2)
(source/Makefile.lurette_lib 2879 1090917546 c/2_Makefile.l 1.32)
(source/Makefile.lurette_lib 2945 1099986649 c/2_Makefile.l 1.33)
(test/test11.rif.exp-ocaml7 4771 1093938205 h/51_test11.rif 1.1)
(polka/caml/polka_parser.mly 1729 1047029868 d/40_polka_pars 1.1)
(mlcuddidl/bdd.idl 18355 1071844798 d/7_bdd.idl 1.2)
......@@ -169,7 +170,7 @@
(source/sim2chro.mli 1532 1078751438 b/23_sim2chro.m 1.12)
(share/lucky_init.csh.in 150 1063786164 e/23_lucky_init 1.8)
(source/lustreExp.ml 25571 1096465027 g/45_lustreExp. 1.11)
(source/gen_fake_lucky.ml 4204 1093938205 g/8_gen_fake_l 1.10)
(source/gen_fake_lucky.ml 9031 1099986649 g/8_gen_fake_l 1.11)
(polka/C/vector.h 2367 1071844798 d/47_vector.h 1.2)
(ID_EN_VRAC 2184 1002196285 0_ID_EN_VRAC 1.1)
(test/heater_int.rif.exp-ocaml7 1078 1093938205 i/2_heater_int 1.1)
......@@ -194,7 +195,7 @@
(test/tram/tramway.lus 4353 1080290901 h/1_tramway.lu 1.3)
(mlcuddidl/session.ml 603 1034006019 c/37_session.ml 1.1)
(demo-xlurette/chaudiere/chaudiere_oracle.lus 107 1031732392 c/8_chaudiere_ 1.1)
(share/Makefile.lurette.in 5619 1090917546 b/38_Makefile.l 1.35)
(share/Makefile.lurette.in 5592 1099986649 b/38_Makefile.l 1.36)
(source/lucky.ml 8925 1088432998 16_env.ml 1.44)
(source/graph.mli 2451 1088432998 13_graph.mli 1.15)
(source/store.mli 3812 1078751438 b/26_rnumsolver 1.26)
......@@ -238,14 +239,14 @@
(test/cygwin-scade/counter.saofd 587 1055926783 g/2_counter.sa 1.1)
(test/test7.rif.exp 470 1088412276 g/12_test7.rif. 1.10)
(test/poly-int/poly.lus 72 1073401581 h/7_poly.lus 1.1)
(source/bddd.ml 18395 1088597013 g/36_bddd.ml 1.10)
(ihm/xlurette/xlurette_glade_interface.ml 86544 1096465027 c/15_xlurette_g 1.32)
(source/bddd.ml 18696 1099986649 g/36_bddd.ml 1.11)
(ihm/xlurette/xlurette_glade_interface.ml 86535 1099986649 c/15_xlurette_g 1.33)
(source/oracle.ml 2807 1088412276 h/31_oracle.ml 1.3)
(INSTALL 479 1082533083 f/26_INSTALL 1.3)
(test/cygwin-scade/MyConsts.saofd 153 1055926783 f/44_MyConsts.s 1.1)
(test/losange-3d2.luc 355 1076684617 e/32_losange-3d 1.6)
(test/Makefile 4135 1090504025 c/0_Makefile 1.22)
(user-rules 44528 1096465027 c/14_myrules 1.69)
(test/Makefile 4069 1099986649 c/0_Makefile 1.23)
(user-rules 44977 1099986649 c/14_myrules 1.70)
(test/infinite_weight.luc 1116 1090330182 g/13_infinite_w 1.5)
(test/sildex.res.exp 0 1093938205 i/14_sildex.res 1.1)
(mlcuddidl/cudd_caml.c 23483 1071844798 d/3_cudd_caml. 1.2)
......@@ -258,8 +259,8 @@
(mlcuddidl/cudd_caml.h 1178 1071844798 d/2_cudd_caml. 1.2)
(source/show_env.ml 3430 1088597013 43_show_env.m 1.23)
(polka/C/essai.c 1001 1047029868 e/11_essai.c 1.1)
(test/time-asti.exp 5298 1096465027 h/41_time-asti. 1.6)
(demo-xlurette/fault-tolerant-heater/heater_control_env.luc 382 1076684617 h/16_heater_con 1.1)
(test/time-asti.exp 5676 1099986649 h/41_time-asti. 1.7)
(demo-xlurette/fault-tolerant-heater/heater_control_env.luc 382 1099986649 h/16_heater_con 1.2)
(share/pixmaps/button-close.xpm 746 1055926783 f/24_button-clo 1.1)
(test/cygwin-scade/regulation.saofd 15074 1055926783 f/35_regulation 1.1)
(mlcuddidl/rdd.idl 14806 1034006019 c/42_rdd.idl 1.1)
......@@ -282,7 +283,7 @@
(polka/C/matrix.h 3846 1071844798 d/51_matrix.h 1.2)
(cuddaux/cuddaux.h 2380 1076684617 c/33_cuddaux.h 1.2)
(share/lurettetop.bat.in 672 1063786164 g/26_lurettetop 1.1)
(share/lucky.el 14248 1090330182 f/7_lucky.el 1.10)
(share/lucky.el 14250 1099986649 f/7_lucky.el 1.11)
(source/genlex.mli 3134 1078751438 h/23_genlex.mli 1.1)
(mlcuddidl/sedscript 203 1034006019 c/38_sedscript 1.1)
(test/cygwin-scade/.lurette_rc 551 1063029729 f/29_.lurette_r 1.2)
......@@ -301,7 +302,7 @@
(cuddaux/cuddauxInt.h 2058 1034006019 c/28_cuddauxInt 1.1)
(test/Sildex/oracle_sildex.h 1516 1093938205 i/11_oracle_sil 1.1)
(polka/caml/polkaIO.mli 1517 1047029868 d/43_polkaIO.ml 1.1)
(test/time-joly.res 10228 1096465027 b/49_time.res 1.76)
(test/time-joly.res 10235 1099986649 b/49_time.res 1.77)
(test/cygwin-scade/det_mvt_mode_cstext.c 703 1055926783 f/33_det_mvt_mo 1.1)
(test/cygwin-scade/pilot.saofdm 394 1055926783 f/41_pilot.saof 1.1)
(source/parse_poc.mli 1131 1078751438 d/29_parse_poc. 1.5)
......@@ -324,12 +325,13 @@
(source/lurette_exe.c 220 1050421093 e/27_lurette_ex 1.2)
(share/pixmaps/close.xpm 803 1055926783 f/21_close.xpm 1.1)
(test/time-CHAILLOL.res 8235 1063029729 g/11_time-CHAIL 1.1)
(test/time-ecrins.res 10233 1079444474 d/20_time-ecrin 1.46)
(test/time-ecrins.res 10233 1099986649 d/20_time-ecrin 1.47)
(source/value.mli 1180 1078751438 c/24_value.mli 1.8)
(test/test10.rif.exp-ocaml7 4572 1093938205 i/0_test10.rif 1.1)
(source/sol_nb.ml 4851 1099986649 i/17_sol_nb.ml 1.1)
(polka/Makefile.config 1915 1090917546 e/20_Makefile.c 1.7)
(test/vrai_tram.lus 564 1027066799 b/6_vrai_tram. 1.2)
(source/Makefile 10964 1090917546 c/20_Makefile 1.38)
(source/Makefile 11062 1099986649 c/20_Makefile 1.39)
(source/graph.ml 3780 1088432998 14_graph.ml 1.13)
(test/cudd_gc_problem.luc 208372 1063029729 e/29_cudd_gc_pr 1.2)
(test/Sildex/env.luc 1154 1093938205 i/13_env.luc 1.1)
......@@ -348,7 +350,8 @@
(test/test13.rif.exp 594 1082533083 h/26_test13.rif 1.3)
(demo-xlurette/fault-tolerant-heater/degradable-sensors.luc 1366 1088412276 h/15_wearing-se 1.2)
(test/cygwin-scade/Direction_D1.saofd 1298 1055926783 f/50_Direction_ 1.1)
(source/lurette.ml 18963 1090917546 12_lurette.ml 1.95)
(source/lurette.ml 18963 1099986649 12_lurette.ml 1.96)
(source/sol_nb.mli 721 1099986649 i/16_sol_nb.mli 1.1)
(share/lucky.bat.in 584 1063786164 g/28_lucky.bat. 1.1)
(share/lucky.sh.in 111 1080290901 g/27_lucky.sh.i 1.2)
(test/sparc-scade/liblinear.saofdm 1301 1055487917 e/46_liblinear. 1.1)
......@@ -358,7 +361,7 @@
(source/gen_fake_lutin.ml 4559 1078751438 d/16_gen_fake_l 1.8)
(source/sut.mli 450 1096465027 h/30_sut.mli 1.3)
(test/heater_float.lus 177 1034351455 b/44_heater_flo 1.2)
(share/set_env_var.in 1744 1090330182 g/23_set_env_va 1.6)
(share/set_env_var.in 1743 1099986649 g/23_set_env_va 1.7)
(source/formula_to_bdd.mli 1266 1078751438 g/35_formula_to 1.7)
(polka/Makefile 1646 1076684617 e/21_Makefile 1.2)
(test/dynamic_weight.luc 709 1079444474 g/14_dynamic_we 1.6)
......
The Lurette FAQ
* I have an error message that looks like:
"
/tmp/lurette1/lurette__sut.c line 5: parse error before Ctx
...
"
-> Probably you are trying to use the Scade compiler to compile a
node named "foo". Make sure that you do not have any "foo.c" or
"foo.h" files that has been generated by the Verimag Lustre compiler
in your current directory. It might confuse Lurette.
* I have an error message that looks like:
"
Undefined first referenced
symbol in file
foo /tmp/lurette1/ccQihQN5.o
ld: fatal: Symbol referencing errors. No output written to lurette
collect2: ld returned 1 exit status
make: *** [scade] Error 1
"
-> it means that additional c files are need to compile you
node. This generally occurs when a program uses extern functions
or constants. For example, the scade compiler generates files such
as "foo_const.dc" or "foo_fctext.dc" that needs to be completed
and renamed "foo_const.c" resp "foo_fctext.c". One then need to
say Lurette to use it by filling the EXTRA_CFILES entry of the
"Extra Environment Variables" window. Note that this is not a
Lurette issue, but an issue with the code generator you use (the
EXTRA_CFILES entry filling excepted).
* It does not work.
-> Quit Lurette, and remove all generated files and try again
* It still does not work...
-> Well, then send me (erwan.jahier@imag.fr) the output messages of
*both* Lurette windows as well as the content of the ".lurette-rc"
file that should be in the directory where you launched Lurette (do
not forget to click on "save parameters" button first in order to
update the ".lurette-rc" file with the true settings you are using).
V1.38
* When no environment is provided, also generate a file named
"<node>_env_UD" in addition to the fake env in "<node>_env". That one
is more elaborated and contraints the output variables so that they
move up and down.
* Fix a bug due to the fact that not all variable name start with "_"
in the C code generated by scade, as it was assumed (and generally the case).
* Fix a bug occurring for lucky formula containing more than 1200 monomes
(float overflew when counting the number of solutions).
V1.37
* The automatically generated oracle in now named "<sut_node>_always_true.lus"
......@@ -30,4 +44,4 @@ V1.34
* Sildex is now supported
* The RELEASE-NOTES file was created, still...
\ No newline at end of file
* The RELEASE-NOTES file is created...
\ No newline at end of file
......@@ -2,12 +2,11 @@
*********** BUGS
* le ~init est ignoré s'il est mis apres un ~default !!!
* Bug dans le repertoire HS si dans Makefile.lurette on
positionne CFLAGS à -Oi pour i >= 1. Le bug ne se produit
que sur les machines linux possedant gcc 3.
* pourquoi, pour l'exemple de MM, ca se met a ramer quand j'en tire 10
à l'interieur (DNI) ??
* pourquoi, tjrs pour cet ex, quand je met DNB à 100, l'épaisseur calcul
* quand une formule s'avere fausse du point de vue des variables
numeriques, il ne faut pas repartir du haut du graphe, mais backtraker
......@@ -42,6 +41,18 @@ prend 170 secondes pour n=10000
*********** A faire
* quand on quitte lurette, on perd les .o et les executables, ce qui
est dommage quand les .c générés sont énormes !!!
* parametrer le node_env.luc de la meme maniere que le node_env_UD.luc
* il me faudrait un bouton "gen fake env" qui fasse l'appel idoine explicitement
plutot que d'avoir a le faire en donnant un environement vide.
* de plus, quand scade genere de fcext.dc, le fait de creer un repertoire <node>
est un peu penible, parce que le plus pratique devient alors de
changer de repertoire en allant dans celui-ci, puis de relancer lurette ...
* XXX attention a l'affichade du .rif quabd lus est syntaxiquement faux
* Au sujet des l'heuristique nbac -> lucky, il faudrait peut-etre verifier
......
-- Automatically generated from /tmp/lurette1/heater_control_env.h by gen_fake_lucky.
-- Automatically generated from /tmp/lurette2/heater_control_env.h by gen_fake_lucky.
inputs {
Heat_on : bool}
......@@ -7,13 +7,13 @@ outputs {
T1 : real;
T2 : real;
T3 : real}
nodes { 0 : stable }
start_node { 0 }
states { 0 : stable }
start_state { 0 }
transitions {
0 -> 0 ~ cond true and (0.0 < T) and (T < 1.0)
and (0.0 < T1) and (T1 < 1.0)
and (0.0 < T2) and (T2 < 1.0)
and (0.0 < T3) and (T3 < 1.0)
0 -> 0 ~cond (0.0 < T) and (T < 1.0)
and (0.0 < T1) and (T1 < 1.0)
and (0.0 < T2) and (T2 < 1.0)
and (0.0 < T3) and (T3 < 1.0)
;
}
......@@ -879,7 +879,7 @@ sildex
<child_name>Toolbar:button</child_name>
<name>button99</name>
<border_width>4</border_width>
<tooltip>Start the testing process (r)</tooltip>
<tooltip>Start testing (r)</tooltip>
<accelerator>
<modifiers>0</modifiers>
<key>GDK_r</key>
......@@ -1005,8 +1005,8 @@ sildex
<widget>
<class>GtkLabel</class>
<child_name>Notebook:tab</child_name>
<name>label9</name>
<label> Main </label>
<name>label74</name>
<label> Main </label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
......@@ -1062,7 +1062,7 @@ sildex
<widget>
<class>GtkLabel</class>
<name>label69</name>
<name>label75</name>
<label></label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
......
......@@ -568,7 +568,7 @@ let button99 = toolbar28#insert_button
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:((Unix.getenv "PIXMAP_DIR") ^ "run.xpm") ()) ())#coerce
()
in
let _ = tooltips#set_tip ~text:"Start the testing process (r)" button99#coerce in
let _ = tooltips#set_tip ~text:"Start testing (r)" button99#coerce in
let _ = button99#misc#add_accelerator
~group:accel_group
GdkKeysyms._r
......@@ -637,8 +637,8 @@ let _ = button105#misc#add_accelerator
GtkSignal.classe = `base }
~modi:[]
in
let label9 = GMisc.label
~text: " Main "
let label74 = GMisc.label
~text: " Main "
~xalign:0.5
~yalign:0.5
~xpad:0
......@@ -678,7 +678,7 @@ let _ = tooltips#set_tip ~text:" Select .rif file to be displayed or deleted " r
let _ = rif_file_entry#set_editable true in
let _ = rif_file_entry#set_visibility true in
let _ = rif_file_entry#set_max_length 0 in
let label69 = GMisc.label
let label75 = GMisc.label
~packing:(vbox31#pack ~padding:0
~fill:false
~expand:false
......@@ -942,12 +942,12 @@ method button101 = button101
method button103 = button103
method help_button = help_button
method button105 = button105
method label9 = label9
method label74 = label74
method option_panel = option_panel
method vbox31 = vbox31
method rif_file = rif_file
method rif_file_entry = rif_file
method label69 = label69
method label75 = label75
method toolbar31 = toolbar31
method button125 = button125
method button126 = button126
......@@ -965,7 +965,7 @@ initializer callbacks#set_xlurette self;
notebook1#prepend_page
~tab_label:timing_diagram_label#coerce option_panel#coerce;
notebook1#prepend_page
~tab_label:label9#coerce vbox26#coerce;
~tab_label:label74#coerce vbox26#coerce;
notebook1#goto_page 0;
end
......
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette")
(Project-Version lurette 1 37)
(Parent-Version lurette 1 36)
(Project-Version lurette 1 38)
(Parent-Version lurette 1 37)
(Version-Log "
source/lurettetop.ml
source/gen_stubs.ml
Call the automatically generated oracle <node_name>_always_true.lus
instead of always_true.
source/util.ml:
put the C_GENERATOR_FLAG at the end of the list of options of lustre2C
so that the -name_lenght lustre2C option can be taken into account.
user-rules
Put the tgz for the release in joly to save disk space
source/Makefile.lucky
source/Makefile.lurette_lib
source/fair_bddd.ml
source/fair_bddd.mli
source/bddd.ml
source/bddd.mli
source/solver.ml
source/sol_nb.ml [new] :
put all the stuff related to the counting of the solution number in a dedicated
module.
Make the representation of solution numbers abstract.
ihm/xlurette/xlurette_glade_main.ml
fix a bug where xlurettte was crashing down when the seed field
(spin button) was empty.
Use the log-based coding instead of the real value so that it does not overflow,
which was the case when the programs have more than 1200 variables.
ihm/xlurette/makefile
ihm/xlurette/xlurette_glade_main.ml
Put a fake min and max value and transform it with sed at
the makefile level in order to turn around a bug in glade
where one cannot put negative values in spin buttons.
source/parse_c_scade.ml
Fix a bug when parsing C scade files due to the fact that not all
variable name start with '_' (one start with 'SYNCHRO_')
source/gen_fake_lucky.ml
When no environment is provided, also generate a file named
<node>_env_UD in addition to the fake env in <node>_env. That one
is more elaborated and contraints the output variables so that they
move up and down.
ihm/xlurette/xlurette.glade
ihm/xlurette/xlurette_glade_interface.ml
share/Makefile.lurette.in
include user test dir before scade dir, otherwise, inconsistent definitions
of reals may coexist.
")
(New-Version-Log ""
)
(Checkin-Time "Wed, 29 Sep 2004 15:37:07 +0200")
(Checkin-Time "Tue, 09 Nov 2004 08:50:49 +0100")
(Checkin-Login jahier)
(Populate-Ignore ())
(Project-Keywords)
......@@ -46,7 +65,7 @@ ihm/xlurette/xlurette_glade_main.ml
;; Sources files for lurette only
(source/lurette.mli (lurette/11_lurette.ml 1.17 644))
(source/lurette.ml (lurette/12_lurette.ml 1.95 644))
(source/lurette.ml (lurette/12_lurette.ml 1.96 644))
(source/command_line.ml (lurette/b/20_command_li 1.23 644))
(source/command_line.mli (lurette/b/21_command_li 1.19 644))
......@@ -58,18 +77,18 @@ ihm/xlurette/xlurette_glade_main.ml
(source/lucky.mli (lurette/15_env.mli 1.25 644))
(source/lucky.ml (lurette/16_env.ml 1.44 644))
(source/util.ml (lurette/35_util.ml 1.73 644))
(source/util.ml (lurette/35_util.ml 1.74 644))
(source/formula_to_bdd.ml (lurette/g/34_formula_to 1.10 644))
(source/formula_to_bdd.mli (lurette/g/35_formula_to 1.7 644))
(source/fair_bddd.ml (lurette/g/38_fair_bddd. 1.9 644))
(source/fair_bddd.mli (lurette/g/39_fair_bddd. 1.7 644))
(source/bddd.ml (lurette/g/36_bddd.ml 1.10 644))
(source/bddd.mli (lurette/g/37_bddd.mli 1.10 644))
(source/fair_bddd.ml (lurette/g/38_fair_bddd. 1.10 644))
(source/fair_bddd.mli (lurette/g/39_fair_bddd. 1.8 644))
(source/bddd.ml (lurette/g/36_bddd.ml 1.11 644))
(source/bddd.mli (lurette/g/37_bddd.mli 1.11 644))
(source/solver.mli (lurette/38_solver.mli 1.24 644))
(source/solver.ml (lurette/39_solver.ml 1.62 644))
(source/solver.ml (lurette/39_solver.ml 1.63 644))
(source/polyhedron.ml (lurette/d/25_polyhedron 1.18 644))
(source/polyhedron.mli (lurette/d/26_polyhedron 1.10 644))
......@@ -110,7 +129,7 @@ ihm/xlurette/xlurette_glade_main.ml
(source/gen_stubs.ml (lurette/24_generate_l 1.61 644))
(source/gen_stubs_common.ml (lurette/e/39_gen_stubs_ 1.6 644))
(source/gen_stubs_common.mli (lurette/e/40_gen_stubs_ 1.4 644))
(source/parse_c_scade.ml (lurette/e/41_parse_c_sc 1.5 644))
(source/parse_c_scade.ml (lurette/e/41_parse_c_sc 1.6 644))
(source/parse_c_scade.mli (lurette/e/42_parse_c_sc 1.4 644))
(source/control.mli (lurette/c/3_control.ml 1.4 644))
......@@ -140,7 +159,7 @@ ihm/xlurette/xlurette_glade_main.ml
;; Make files
(share/lucky.el (lurette/f/7_lucky.el 1.10 644))
(share/lucky.el (lurette/f/7_lucky.el 1.11 644))
(share/pixmaps/stop.xpm (lurette/f/8_stop.xpm 1.1 644))
(share/pixmaps/stock_save.xpm (lurette/f/9_stock_save 1.1 644))
(share/pixmaps/step.xpm (lurette/f/11_step.xpm 1.1 644))
......@@ -161,18 +180,18 @@ ihm/xlurette/xlurette_glade_main.ml
(share/configure.in (lurette/d/11_configure. 1.21 644))
(Makefile.common.source (lurette/e/33_Makefile.c 1.12 644))
(OcamlMakefile (lurette/17_OcamlMakef 1.52 644))
(share/Makefile.lurette.in (lurette/b/38_Makefile.l 1.35 644))
(user-rules (lurette/c/14_myrules 1.69 644))
(share/Makefile.lurette.in (lurette/b/38_Makefile.l 1.36 644))
(user-rules (lurette/c/14_myrules 1.70 644))
(share/Makefile.test.in (lurette/c/25_user-rules 1.13 644))
(Makefile (lurette/d/13_Makefile 1.4 644))
(source/Makefile.lurettetop (lurette/d/14_Makefile.l 1.7 644))
(source/Makefile.gen_fake_lutin (lurette/d/17_Makefile.g 1.5 644))
(source/Makefile.show_luc (lurette/b/40_Makefile.s 1.16 644))
(source/Makefile.lucky (lurette/b/41_Makefile.i 1.34 644))
(source/Makefile.lucky (lurette/b/41_Makefile.i 1.35 644))
(source/Makefile.gen_stubs (lurette/b/42_Makefile.g 1.12 644))
(source/Makefile.lurette_lib (lurette/c/2_Makefile.l 1.32 644))
(source/Makefile (lurette/c/20_Makefile 1.38 644))
(source/Makefile.lurette_lib (lurette/c/2_Makefile.l 1.33 644))
(source/Makefile (lurette/c/20_Makefile 1.39 644))
;; Documentation
(doc/Interface_draft (lurette/19_Interface_ 1.1 644))
......@@ -186,7 +205,7 @@ ihm/xlurette/xlurette_glade_main.ml
(ID_EN_VRAC (lurette/0_ID_EN_VRAC 1.1 644))
(INSTALL (lurette/f/26_INSTALL 1.3 744))
(TAGS (lurette/21_TAGS 1.6 644))
(TODO (lurette/d/22_TODO 1.54 644))
(TODO (lurette/d/22_TODO 1.55 644))
(share/lucky_init.csh.in (lurette/e/23_lucky_init 1.8 644))
(share/lucky_init.sh.in (lurette/e/24_lucky_init 1.12 644))
......@@ -195,10 +214,10 @@ ihm/xlurette/xlurette_glade_main.ml
(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))
(test/time-joly.exp (lurette/b/48_time.exp 1.69 644))
(test/time-joly.res (lurette/b/49_time.res 1.76 644))
(test/time-ecrins.res (lurette/d/20_time-ecrin 1.46 644))
(test/time-ecrins.exp (lurette/d/21_time-ecrin 1.45 644))
(test/time-joly.exp (lurette/b/48_time.exp 1.70 644))
(test/time-joly.res (lurette/b/49_time.res 1.77 644))
(test/time-ecrins.res (lurette/d/20_time-ecrin 1.47 644))
(test/time-ecrins.exp (lurette/d/21_time-ecrin 1.46 644))
(test/time-moucherotte.exp (lurette/e/37_time-mouch 1.23 644))
(test/time-moucherotte.res (lurette/e/38_time-mouch 1.24 644))
......@@ -296,12 +315,12 @@ ihm/xlurette/xlurette_glade_main.ml
(test/test9.rif.exp (lurette/g/17_test9.rif. 1.7 644))
(test/test8.rif.exp (lurette/g/18_test8.rif. 1.7 644))
(test/Makefile (lurette/c/0_Makefile 1.22 644))
(test/Makefile (lurette/c/0_Makefile 1.23 644))
;; xlurette
(ihm/xlurette/xlurette_glade_main.ml (lurette/c/12_xlurette_g 1.46 644))
(ihm/xlurette/xlurette.glade (lurette/c/13_xlurette.g 1.34 644))
(ihm/xlurette/xlurette_glade_interface.ml (lurette/c/15_xlurette_g 1.32 644))
(ihm/xlurette/xlurette.glade (lurette/c/13_xlurette.g 1.35 644))
(ihm/xlurette/xlurette_glade_interface.ml (lurette/c/15_xlurette_g 1.33 644))
(ihm/xlurette/makefile (lurette/c/16_makefile 1.24 644))
......@@ -396,7 +415,7 @@ ihm/xlurette/xlurette_glade_main.ml
;; Files added by populate at Tue, 26 Aug 2003 15:45:55 +0200,
;; to version 0.143(w), by jahier:
(source/gen_fake_lucky.ml (lurette/g/8_gen_fake_l 1.10 644))
(source/gen_fake_lucky.ml (lurette/g/8_gen_fake_l 1.11 644))
;; Files added by populate at Tue, 26 Aug 2003 15:46:03 +0200,
;; to version 0.143(w), by jahier:
......@@ -416,7 +435,7 @@ ihm/xlurette/xlurette_glade_main.ml
(share/xlurette_sh.in (lurette/g/20_xlurette_s 1.1 644))
(share/xlurette.sh.in (lurette/g/21_xlurette.s 1.2 644))
(share/xlurette.bat.in (lurette/g/22_xlurette.b 1.1 644))
(share/set_env_var.in (lurette/g/23_set_env_va 1.6 644))
(share/set_env_var.in (lurette/g/23_set_env_va 1.7 644))
(share/lurettetop_sh.in (lurette/g/24_lurettetop 1.1 644))
(share/lurettetop.sh.in (lurette/g/25_lurettetop 1.3 644))
(share/lurettetop.bat.in (lurette/g/26_lurettetop 1.1 644))
......@@ -531,7 +550,7 @@ ihm/xlurette/xlurette_glade_main.ml
;; to version 1.19(w), by jahier:
(demo-xlurette/fault-tolerant-heater/degradable-sensors.luc (lurette/h/15_wearing-se 1.2 644))
(demo-xlurette/fault-tolerant-heater/heater_control_env.luc (lurette/h/16_heater_con 1.1 644))
(demo-xlurette/fault-tolerant-heater/heater_control_env.luc (lurette/h/16_heater_con 1.2 644))
(demo-xlurette/fault-tolerant-heater/heater_control.lus (lurette/h/17_heater_con 1.4 644))
(demo-xlurette/fault-tolerant-heater/sensors.luc (lurette/h/18_sensors.lu 1.2 644))
......@@ -615,18 +634,18 @@ ihm/xlurette/xlurette_glade_main.ml
;; Files added by populate at Mon, 28 Jun 2004 10:29:06 +0200,
;; to version 1.29(w), by jahier:
(test/time-asti.res (lurette/h/40_time-asti. 1.8 644))
(test/time-asti.exp (lurette/h/41_time-asti. 1.6 644))
(test/time-asti.res (lurette/h/40_time-asti. 1.9 644))
(test/time-asti.exp (lurette/h/41_time-asti. 1.7 644))
;; Files added by populate at Mon, 19 Jul 2004 16:17:17 +0200,
;; to version 1.32(w), by jahier:
(share/show_luc.sh (lurette/h/42_show_luc.s 1.3 744))
(share/show_luc.sh (lurette/h/42_show_luc.s 1.4 755))
;; Files added by populate at Mon, 19 Jul 2004 16:17:58 +0200,
;; to version 1.32(w), by jahier: