Skip to content

GitLab

L
lutin
Commit d66521bd authored by Erwan Jahier's avatar Erwan Jahier
Browse files
Options

lurette 1.3 Tue, 23 Sep 2003 16:56:51 +0200 by jahier 

Parent-Version:      1.2
Version-Log:

source/store.ml:
source/store.ml:
source/solver.ml:
   Add a numeric thickness at the numeric level.

Project-Description: Lurette
parent 36ab3ebb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2979 additions and 1882 deletions
.lurette.prcs_aux
View file @ d66521bd
......@@ -3,12 +3,12 @@
(Created-By-Prcs-Version 1 3 3)
(cuddaux/cuddauxGenCof.c 12011 1034006019 c/29_cuddauxGen 1.1)
(source/show_env.mli 1150 1056619073 42_show_env.m 1.10)
(source/util.ml 25305 1063786164 35_util.ml 1.53)
(source/util.ml 25757 1064329011 35_util.ml 1.54)
(test/cygwin-scade/lib_pilot.vsp 1433 1055926783 f/47_lib_pilot. 1.1)
(source/constraint.mli 1606 1063029729 c/18_constraint 1.6)
(test/ControleurPorte.lus 3219 1032940601 c/17_Controleur 1.1)
(mlcuddidl/Changes 64 1034006019 d/10_Changes 1.1)
(TODO 5935 1063786164 d/22_TODO 1.23)
(TODO 5308 1064329011 d/22_TODO 1.24)
(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/ne.mli 2220 1063029729 c/22_ne.mli 1.7)
......@@ -21,11 +21,11 @@
(share/pixmaps/open.xpm 782 1055926783 f/17_open.xpm 1.1)
(source/parse_luc.mli 2297 1063029729 40_parse_env. 1.16)
(polka/C/internal.c 699 1047029868 e/8_internal.c 1.1)
(source/solver.ml 34506 1063786164 39_solver.ml 1.51)
(source/solver.ml 34807 1064329011 39_solver.ml 1.52)
(ihm/xlurette/makefile 1853 1063786164 c/16_makefile 1.17)
(share/gen_fake_lucky.sh.in 115 1063786164 g/31_gen_fake_l 1.1)
(polka/C/internal.h 958 1047029868 e/0_internal.h 1.1)
(source/command_line.ml 4768 1056616700 b/20_command_li 1.14)
(source/command_line.ml 4534 1064329011 b/20_command_li 1.15)
(test/cudd_gc_problem.rif.exp 7882 1053337243 e/30_cudd_gc_pr 1.2)
(test/sparc-scade/libpwlinear.saofdm 1379 1055487917 e/43_libpwlinea 1.1)
(test/cygwin-scade/ConfAnnot.aty 13661 1055926783 g/4_ConfAnnot. 1.1)
......@@ -39,7 +39,7 @@
(doc/synthese 2556 1007379917 b/2_synthese 1.1)
(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 1503 1046074449 b/21_command_li 1.11)
(source/command_line.mli 1580 1064329011 b/21_command_li 1.12)
(source/Makefile.lucky 2917 1063786164 b/41_Makefile.i 1.23)
(polka/README 1437 1047029868 e/19_README 1.1)
(polka/Makefile.depend 136 1047029868 d/30_Makefile.d 1.1)
......@@ -54,7 +54,7 @@
(source/luc_exe.mli 447 1033738731 b/31_ima_exe.ml 1.2)
(doc/ocamldoc.sty 1380 1008328137 b/12_ocamldoc.s 1.1)
(polka/C/cherni.c 28811 1047029868 e/9_cherni.c 1.1)
(source/command_line_luc_exe.mli 1187 1050421093 b/34_command_li 1.10)
(source/command_line_luc_exe.mli 1276 1064329011 b/34_command_li 1.11)
(polka/C/poly.h 4314 1047029868 d/49_poly.h 1.1)
(source/formula.mli 4392 1063029729 44_formula.ml 1.25)
(polka/C/cherni.h 2217 1047029868 e/1_cherni.h 1.1)
......@@ -62,7 +62,7 @@
(polka/caml/polka_caml.c 6499 1047029868 d/37_polka_caml 1.1)
(source/gen_stubs_poc.mli 636 1055926783 f/4_gen_stubs_ 1.1)
(test/losange-3d.luc 514 1063786164 d/28_losange-3d 1.4)
(test/time-moucherotte.res 4415 1063029729 e/38_time-mouch 1.6)
(test/time-moucherotte.res 4851 1064329011 e/38_time-mouch 1.7)
(polka/caml/poly.idl 8449 1047029868 d/33_poly.idl 1.1)
(polka/documentation/texinfo.tex 200195 1047029868 e/16_texinfo.te 1.1)
(polka/caml/polka_caml.h 1922 1047029868 d/36_polka_caml 1.1)
......@@ -74,24 +74,24 @@
(test/giro/onlyroll.lus 18298 1031732392 c/7_onlyroll.l 1.1)
(source/eval.ml 7245 1063029729 49_eval.ml 1.15)
(polka/Changes 1502 1047029868 e/22_Changes 1.1)
(source/env.mli 1900 1063029729 15_env.mli 1.18)
(source/env.mli 1937 1064329011 15_env.mli 1.19)
(test/sparc-scade/libdigital.saofdm 1256 1055487917 e/47_libdigital 1.1)
(test/temp_int.luc 517 1063786164 b/50_temp_int.e 1.7)
(source/automata.mli 3477 1063029729 b/46_automata.m 1.4)
(source/automata.mli 3595 1064329011 b/46_automata.m 1.5)
(source/print.mli 1136 1045558187 46_print.mli 1.13)
(polka/caml/Makefile 6559 1047029868 d/45_Makefile 1.1)
(test/cygwin-scade/det_mvt_mode.saofd 4184 1055926783 f/51_det_mvt_mo 1.1)
(ihm/xlurette/xlurette_glade_main.ml 44877 1063786164 c/12_xlurette_g 1.26)
(ihm/xlurette/xlurette_glade_main.ml 44984 1064329011 c/12_xlurette_g 1.27)
(TAGS 9825 1007379917 21_TAGS 1.6)
(polka/C/main.tex 1961 1047029868 e/14_main.tex 1.1)
(ihm/xlurette/xlurette.glade 94695 1063786164 c/13_xlurette.g 1.20)
(ihm/xlurette/xlurette.glade 104700 1064329011 c/13_xlurette.g 1.21)
(test/cygwin-scade/det_mvt_mode_env.lut 333 1055926783 f/32_det_mvt_mo 1.1)
(test/cygwin-scade/MODULE.saofd 3026 1055926783 f/45_MODULE.sao 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 10953 1063029729 e/36_gyro.rif.e 1.3)
(test/time-ecrins.exp 8228 1063029729 d/21_time-ecrin 1.24)
(test/time-ecrins.exp 8233 1064329011 d/21_time-ecrin 1.25)
(source/value.ml 2539 1063786164 c/23_value.ml 1.6)
(source/gne.ml 3467 1063029729 b/37_gne.ml 1.6)
(test/cygwin-scade/Pilot.vsp 2075 1055926783 f/40_Pilot.vsp 1.1)
......@@ -110,7 +110,7 @@
(test/cygwin-scade/Pilot.vsw 431 1055926783 f/39_Pilot.vsw 1.1)
(share/pixmaps/open_plus.xpm 787 1055926783 f/16_open_plus. 1.1)
(share/xlurettetop.bat.in 613 1063786164 g/19_xluretteto 1.1)
(source/env_state.ml 23077 1063786164 51_env_state. 1.47)
(source/env_state.ml 22609 1064329011 51_env_state. 1.48)
(test/test8.rif.exp 341 1063786164 g/18_test8.rif. 1.1)
(polka/caml/matrix.idl 5301 1047029868 d/34_matrix.idl 1.1)
(cuddaux/cuddauxAddIte.c 12812 1034006019 c/32_cuddauxAdd 1.1)
......@@ -127,7 +127,6 @@
(source/call_lurette_main.c 322 1050421093 e/28_call_luret 1.1)
(polka/C/vector.c 13780 1047029868 e/3_vector.c 1.1)
(test/sparc-scade/Direction_D1.saofd 1335 1055487917 e/51_Direction_ 1.1)
(share/Makefile.test 2076 1063786164 c/25_user-rules 1.9)
(source/Makefile.lurette_lib 2620 1063029729 c/2_Makefile.l 1.21)
(polka/caml/polka_parser.mly 1729 1047029868 d/40_polka_pars 1.1)
(mlcuddidl/bdd.idl 18233 1034006019 d/7_bdd.idl 1.1)
......@@ -149,9 +148,9 @@
(mlcuddidl/manager.ml 8017 1034006019 c/47_manager.ml 1.1)
(share/plot 11394 1063786164 e/35_plot 1.4)
(share/pixmaps/save.xpm 867 1055926783 f/12_save.xpm 1.1)
(source/solver.mli 1216 1063029729 38_solver.mli 1.15)
(source/solver.mli 1545 1064329011 38_solver.mli 1.16)
(test/passerelle.luc 963 1063786164 b/17_passerelle 1.12)
(source/store.ml 34202 1063029729 b/27_rnumsolver 1.25)
(source/store.ml 33806 1064329011 b/27_rnumsolver 1.26)
(mlcuddidl/mtbdd.mli 4395 1034006019 c/43_mtbdd.mli 1.1)
(test/sparc-scade/exo1.vsp 2089 1055487917 e/49_exo1.vsp 1.1)
(polka/C/satmat.h 1254 1047029868 d/48_satmat.h 1.1)
......@@ -163,46 +162,47 @@
(demo-xlurette/chaudiere/chaudiere_oracle.lus 107 1031732392 c/8_chaudiere_ 1.1)
(share/Makefile.lurette.in 4414 1063029729 b/38_Makefile.l 1.27)
(source/graph.mli 2382 1063029729 13_graph.mli 1.11)
(source/store.mli 3147 1063029729 b/26_rnumsolver 1.17)
(test/time-ossau.res 8240 1063786164 b/49_time.res 1.51)
(source/automata.ml 19565 1063029729 b/47_automata.m 1.11)
(source/store.mli 3265 1064329011 b/26_rnumsolver 1.18)
(test/time-ossau.res 8420 1064329011 b/49_time.res 1.52)
(source/automata.ml 20675 1064329011 b/47_automata.m 1.12)
(test/sparc-scade/libmath.saofdm 1378 1055487917 e/45_libmath.sa 1.1)
(Makefile 68 1051024737 d/13_Makefile 1.4)
(share/Makefile.test.in 2712 1064329011 c/25_user-rules 1.10)
(cuddaux/cuddauxBridge.c 6099 1034006019 c/31_cuddauxBri 1.1)
(test/sparc-scade/libmathadvanced.saofdm 3267 1055487917 e/44_libmathadv 1.1)
(test/sparc-scade/exo1.vsw 400 1055487917 e/48_exo1.vsw 1.1)
(test/heater_float.rif.exp 1052 1063029729 b/30_heater_flo 1.16)
(test/heater_float.rif.exp 1058 1064329011 b/30_heater_flo 1.17)
(cuddaux/Makefile 3326 1053337243 c/35_Makefile 1.7)
(polka/C/bit.c 3026 1047029868 e/10_bit.c 1.1)
(source/draw.mli 467 1055926783 f/1_draw.mli 1.1)
(test/time-ossau.exp 8232 1063029729 b/48_time.exp 1.47)
(test/time-ossau.exp 8240 1064329011 b/48_time.exp 1.48)
(polka/caml/polkaIO.ml 1652 1047029868 d/44_polkaIO.ml 1.1)
(mlcuddidl/macros.m4 11290 1034006019 c/49_macros.m4 1.1)
(source/print.ml 5732 1063029729 47_print.ml 1.24)
(test/heater_int.rif.exp 822 1063029729 b/28_heater_int 1.14)
(test/sparc-scade/scade.rif.exp 1163 1063786164 f/0_scade.rif. 1.2)
(test/heater_int.rif.exp 820 1064329011 b/28_heater_int 1.15)
(test/sparc-scade/scade.rif.exp 1166 1064329011 f/0_scade.rif. 1.3)
(source/parse_poc.ml 4417 1055926783 d/15_parse_poc. 1.4)
(test/cygwin-scade/det_center.saofd 4993 1055926783 g/0_det_center 1.1)
(share/pixmaps/stock_save.xpm 3420 1055926783 f/9_stock_save 1.1)
(polka/C/bit.h 1380 1047029868 e/2_bit.h 1.1)
(source/parse_c_scade.mli 656 1055487917 e/42_parse_c_sc 1.1)
(demo-xlurette/chaudiere/chaudiere.luc 681 1063786164 c/11_chaudiere. 1.7)
(demo-xlurette/chaudiere/chaudiere.luc 681 1064329011 c/11_chaudiere. 1.8)
(test/giro/allocator.lus 1087 1031732392 c/5_allocator. 1.1)
(cuddaux/README 1427 1034006019 c/34_README 1.1)
(mlcuddidl/bdd.ml 10889 1034006019 d/6_bdd.ml 1.1)
(source/lurettetop.ml 44964 1063786164 c/1_lurettetop 1.40)
(source/lurettetop.ml 46392 1064329011 c/1_lurettetop 1.41)
(source/constraint.ml 2784 1063029729 c/19_constraint 1.8)
(test/structured_type.luc 2224 1063786164 g/32_structured 1.1)
(test/cygwin-scade/counter.saofd 587 1055926783 g/2_counter.sa 1.1)
(test/test7.rif.exp 269 1063786164 g/12_test7.rif. 1.1)
(polka/caml/Makefile.depend 744 1063029729 d/32_Makefile.d 1.3)
(doc/archi.fig 3693 1003928781 20_archi.fig 1.1)
(ihm/xlurette/xlurette_glade_interface.ml 68747 1063786164 c/15_xlurette_g 1.19)
(ihm/xlurette/xlurette_glade_interface.ml 76896 1064329011 c/15_xlurette_g 1.20)
(INSTALL 101 1056616700 f/26_INSTALL 1.2)
(test/cygwin-scade/MyConsts.saofd 153 1055926783 f/44_MyConsts.s 1.1)
(test/losange-3d2.luc 361 1063786164 e/32_losange-3d 1.3)
(test/Makefile 26 1051024737 c/0_Makefile 1.12)
(user-rules 26632 1063786164 c/14_myrules 1.42)
(test/Makefile 2756 1064329011 c/0_Makefile 1.13)
(user-rules 28780 1064329011 c/14_myrules 1.43)
(test/infinite_weight.luc 889 1063786164 g/13_infinite_w 1.1)
(mlcuddidl/cudd_caml.c 22890 1034006019 d/3_cudd_caml. 1.1)
(polka/C/config.h 77 1047029868 e/13_config.h 1.1)
......@@ -226,7 +226,7 @@
(share/xlurette_sh.in 779 1063786164 g/20_xlurette_s 1.1)
(polka/C/matrix.c 19090 1047029868 e/7_matrix.c 1.1)
(mlcuddidl/rdd.ml 8746 1034006019 c/41_rdd.ml 1.1)
(share/configure.in 8499 1063786164 d/11_configure. 1.13)
(share/configure.in 8503 1064329011 d/11_configure. 1.14)
(test/tram.luc 1325 1063786164 b/15_tram.env 1.12)
(share/Makefile.common.in 189 1052229068 d/12_Makefile.c 1.5)
(demo-xlurette/chaudiere/buggy_chaudiere_ctrl.lus 219 1031732392 c/10_buggy_chau 1.1)
......@@ -237,8 +237,8 @@
(share/lucky.el 1934 1063786164 f/7_lucky.el 1.5)
(mlcuddidl/sedscript 203 1034006019 c/38_sedscript 1.1)
(test/cygwin-scade/.lurette_rc 551 1063029729 f/29_.lurette_r 1.2)
(source/env_state.mli 6353 1063029729 50_env_state. 1.32)
(test/ControleurPorte.rif.exp 4688 1063029729 b/29_Controleur 1.17)
(source/env_state.mli 6081 1064329011 50_env_state. 1.33)
(test/ControleurPorte.rif.exp 4688 1064329011 b/29_Controleur 1.18)
(source/show_luc.ml 4271 1063029729 e/25_show_luc.m 1.6)
(share/pixmaps/quit.xpm 494 1055926783 f/14_quit.xpm 1.1)
(share/xlurette.sh.in 110 1063786164 g/21_xlurette.s 1.1)
......@@ -263,12 +263,12 @@
(share/pixmaps/ediff-quit.xpm 494 1055926783 f/20_ediff-quit 1.1)
(test/cygwin-scade/Pilot.saofd 3645 1055926783 f/42_Pilot.saof 1.1)
(test/time-moucherotte.exp 4415 1063029729 e/37_time-mouch 1.6)
(source/command_line_luc_exe.ml 3436 1063786164 b/33_command_li 1.17)
(source/command_line_luc_exe.ml 3526 1064329011 b/33_command_li 1.18)
(source/lurette_exe.c 220 1050421093 e/27_lurette_ex 1.2)
(source/env.ml 8051 1063029729 16_env.ml 1.31)
(source/env.ml 8206 1064329011 16_env.ml 1.32)
(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 8233 1063786164 d/20_time-ecrin 1.25)
(test/time-ecrins.res 8431 1064329011 d/20_time-ecrin 1.26)
(source/value.mli 1159 1063786164 c/24_value.mli 1.4)
(polka/Makefile.config 1683 1053337243 e/20_Makefile.c 1.5)
(test/vrai_tram.lus 564 1027066799 b/6_vrai_tram. 1.2)
......@@ -281,10 +281,10 @@
(polka/documentation/Makefile 476 1047029868 e/18_Makefile 1.1)
(source/sim2chro.ml 3260 1063786164 b/24_sim2chro.m 1.20)
(cuddaux/cuddauxTDGenCof.c 15712 1034006019 c/26_cuddauxTDG 1.1)
(source/luc_exe.ml 13809 1063029729 b/32_ima_exe.ml 1.34)
(source/luc_exe.ml 14273 1064329011 b/32_ima_exe.ml 1.35)
(source/gne.mli 1853 1063029729 b/36_gne.mli 1.6)
(test/cygwin-scade/Direction_D1.saofd 1298 1055926783 f/50_Direction_ 1.1)
(source/lurette.ml 17353 1063786164 12_lurette.ml 1.73)
(source/lurette.ml 18027 1064329011 12_lurette.ml 1.74)
(polka/C/Makefile.depend 1081 1047029868 d/46_Makefile.d 1.1)
(share/lucky.bat.in 584 1063786164 g/28_lucky.bat. 1.1)
(share/lucky.sh.in 106 1063786164 g/27_lucky.sh.i 1.1)
......@@ -300,7 +300,7 @@
(test/porte.luc 1014 1063786164 b/16_porte.env 1.12)
(source/gen_stubs_common.mli 1772 1055487917 e/40_gen_stubs_ 1.1)
(test/cygwin-scade/scade.rif.exp 1380 1063029729 g/7_scade.rif. 1.2)
(share/gnuplot-rif 1188 1063786164 e/34_gnuplot-ri 1.4)
(share/gnuplot-rif 1427 1064329011 e/34_gnuplot-ri 1.5)
(test/cygwin-scade/Pilot_type.saofd 962 1055926783 f/37_Pilot_type 1.1)
(mlcuddidl/Makefile 7387 1053337243 d/9_Makefile 1.7)
(source/eval.mli 1265 1050421093 48_eval.mli 1.11)
......
TODO
View file @ d66521bd
......@@ -42,6 +42,9 @@
puis on tronque (truncate) => l'entier tiré n'est alors parfois
meme pas solution des contraintes !!!
* dire aussi comment le tirage pour les entiers est effectué (cf brrr)
en dimension > 2
* dire dans la doc que on ne peut avoir qu'au plus une transition sortante
avec un poids infini (ca n'a pas un sens bien clair et on peut toujours
faire autrement). Dire aussi que 2 transitions ne peuvent a la fois avoir
......@@ -52,26 +55,16 @@
*********** A faire
* Integrer la possibilité d'utiliser des types structurés avec lurette et scade
* supprimer l'epaisseur au niveau des transitions (?) et rajouter une
au niveau des numérique
La notion d'epaisseur est mal branlée, surtout en presence de var
numériques. Il faudrait un 3eme parametre qui dit le nombre
de tirage que l'on fait dans chaque polyedres.
-> remplacer l'epaisseur de formules par un taux de couverture
* Integrer la possibilité d'utiliser des types structurés avec lurette et scade
* il faudrait au moins pouvoir avoir des pre sur des var de types structurés
* mettre les fichiers de test dans un repertoire exemple et faire des liens symbo
* autoriser plusieurs automates dans le meme fichier
* il faudrait au moins pouvoir avoir des pre sur des var de types structurés
* Faire un lustre2lucky comme TP avec Yussef
* Faire l'elimination des DAGS, ie,
......@@ -80,22 +73,21 @@
* faire un passage sur map vs rev_map
(1) Portage Reluc
* ajouter les options --product-mode {multiply | arbiter}
qui disent comment on multiplie 2 automates (cf papier)
* env_state devrait etre un objet ...
* ajouter les options --product-mode {multiply | arbiter}
qui disent comment on multiplie 2 automates (cf papier)
(1) Portage Reluc
* compiler sim2chrogtk sous cygwin
* Chercher a detecter des egalites lors de l'ajout d'une inegalité.
pour les contraintes de dimension > 1 (cf code commenté dans store.ml)
* compiler sim2chrogtk sous cygwin
......@@ -113,7 +105,6 @@
* Faire un gestionnaire de sessions comme le propose Pascal
* zipper et dezipper les .rif a la vollée (cf zlib et camlzip)
......@@ -148,29 +139,6 @@
dans des cas ou les polyedres peteraient...
*********** Cosmétisme
* changer le nom du type formula en Formula.t (faire pareil partout)
ce qui devrait permettre d'enlever tout plein de <<open Formula>>
* Le type node n'a rien a faire dans le module formula ...
de meme pour arc_info. Les mettre dans un module type par exemple.
*********** Performances
* Pour le train, que je fais le produit de tous les environnements,
j'ai quand meme un pb de perf que je n'avais pas avant. Regarder
pourquoi (cf version 0.68). D'une maniere générale, Graph.t est elle
vraiment la bonne structure de donnees pour les sous-graphes ?
*********** A faire
* Ecrire une batterie de test plus sérieuse !
* Réfléchir à une version d'un tireur sans bdd ou les choix seraient
effectués pendant le parcours de la formule (pas d'équité, mais bon) +
backtracking quand ca n'est pas satisfiable. Le gros pb a priori
......@@ -181,8 +149,19 @@
meme dimension que le polyhedre (quitte à faire un changement de
variable) puis tirer dans le cube enveloppant.
* dans gne.ml, rajouter partout assertion <<is_a_partition>>
*********** Cosmétisme
* env_state devrait etre un objet ...
* changer le nom du type formula en Formula.t (faire pareil partout)
ce qui devrait permettre d'enlever tout plein de <<open Formula>>
* Le type node n'a rien a faire dans le module formula ...
de meme pour arc_info. Les mettre dans un module type par exemple.
***********************************************************************
......
demo-xlurette/chaudiere/chaudiere.luc
View file @ d66521bd
......@@ -15,12 +15,12 @@ locals {
}
start_node { 0 }
nodes {
}
start_node { 0 }
transitions {
......
ihm/xlurette/xlurette.glade
View file @ d66521bd
This diff is collapsed.
ihm/xlurette/xlurette_glade_interface.ml
View file @ d66521bd
This diff is collapsed.
ihm/xlurette/xlurette_glade_main.ml
View file @ d66521bd
......@@ -107,7 +107,6 @@ let (cygpath_w2u : string -> string) =
output_string stderr ("cygpath_w2u " ^ str0 ^ " failed.\n");
str0
type draw_mode = Vertices | Edges | Inside
type tok = Genlex.token Stream.t
let ok_str = " OK!
......@@ -437,6 +436,14 @@ class customized_callbacks = object(self)
method ok_oracle_help_clicked () =
self#top_oracle_help_window#oracle_help_window#misc#hide ()
(* test_thickness help window *)
method on_test_thickness_help_button_clicked () =
self#top_test_thickness_help_window#test_thickness_help_window#show ()
method ok_test_thickness_help_clicked () =
self#top_test_thickness_help_window#test_thickness_help_window#misc#hide ()
(* set env var window *)
method on_extra_var_button_clicked () =
......@@ -491,7 +498,6 @@ class customized_callbacks = object(self)
method cancel_oracle_clicked () =
self#top_fileselection_oracle#fileselection_oracle#misc#hide ()
(* env file selection window *)
method browse_env_clicked () =
self#top_fileselection_env#fileselection_env#show ()
......@@ -766,9 +772,6 @@ class customized_callbacks = object(self)
let test_length = self#top_xlurette#test_length#text in
let cmd_test_length = ("set_test_length " ^ test_length ^ "\n") in
let formula_nb = self#top_xlurette#formula_nb#text in
let cmd_formula_nb = ("set_formula_nb " ^ formula_nb ^ "\n") in
let draw_nb = self#top_xlurette#draw_nb#text in
let cmd_draw_nb = ("set_draw_nb " ^ draw_nb ^ "\n") in
......@@ -789,12 +792,25 @@ class customized_callbacks = object(self)
else ("set_seed " ^ self#top_xlurette#user_seed#text ^ "\n")
in
let cmd_draw_mode =
if self#top_xlurette#radiobutton_inside#active
then "set_draw_mode inside \n"
else if self#top_xlurette#radiobutton_edges#active
then "set_draw_mode edges \n"
else "set_draw_mode vertices \n"
let cmd_draw_all_formula =
if self#top_xlurette#radiobutton_draw_all_formula#active
then "set_draw_all_formula true\n"
else "set_draw_all_formula false\n"
in
let cmd_draw_inside =
("set_draw_inside " ^ self#top_xlurette#inside_nb#text ^ "\n")
in
let cmd_draw_edges =
("set_draw_edges " ^ self#top_xlurette#edges_nb#text ^ "\n")
in
let cmd_draw_vertices =
if
self#top_xlurette#radiobutton_draw_all#active
then
"set_draw_all_vertices true\n"
else
("set_draw_all_vertices false" ^
"\nset_draw_vertices " ^ self#top_xlurette#vertices_nb#text ^ "\n")
in
let cmd_call_sim2chro =
......@@ -836,11 +852,12 @@ class customized_callbacks = object(self)
(String.escaped self#top_extra_env_var_window#extra_includedirs_entry#text) ^ "\"\n")
in
cmd_test_length ^ cmd_formula_nb ^ cmd_draw_nb
cmd_test_length ^ cmd_draw_nb
^ cmd_rif_file ^ cmd_sut ^ cmd_env ^ cmd_oracle ^ cmd_step ^ cmd_seed
^ cmd_draw_mode ^ cmd_call_sim2chro ^ cmd_display_local
^ cmd_verbose ^ cmd_show_step ^ cmd_sut_compiler ^ cmd_oracle_compiler ^
extra_cfiles ^ extra_libs ^ extra_libdirs ^ extra_includedirs
^ cmd_draw_inside ^ cmd_draw_edges ^ cmd_draw_vertices ^ cmd_call_sim2chro
^ cmd_display_local ^ cmd_verbose ^ cmd_show_step ^ cmd_sut_compiler
^ cmd_oracle_compiler ^ extra_cfiles ^ extra_libs ^ extra_libdirs
^ extra_includedirs
method on_sut_name_changed () =
......@@ -1052,16 +1069,31 @@ class customized_callbacks = object(self)
method set_seed i =
self#top_xlurette#user_seed#set_text (string_of_int i)
method get_formula_nb () =
int_of_string self#top_xlurette#formula_nb#text
method set_formula_nb i =
self#top_xlurette#formula_nb#set_text (string_of_int i)
method get_draw_nb () =
int_of_string self#top_xlurette#draw_nb#text
method set_draw_nb i =
self#top_xlurette#draw_nb#set_text (string_of_int i)
method get_draw_inside () =
int_of_string self#top_xlurette#inside_nb#text
method set_draw_inside i =
self#top_xlurette#inside_nb#set_text (string_of_int i)
method get_draw_edges () =
int_of_string self#top_xlurette#edges_nb#text
method set_draw_edges i =
self#top_xlurette#edges_nb#set_text (string_of_int i)
method get_draw_vertices () =
int_of_string self#top_xlurette#vertices_nb#text
method set_draw_vertices i =
self#top_xlurette#inside_nb#set_text (string_of_int i)
method get_rif_file_basename () =
self#top_xlurette#rif_file_basename#text
method set_rif_file_basename str =
......@@ -1072,12 +1104,6 @@ class customized_callbacks = object(self)
method set_restore str =
self#top_xlurette#saved_session_file#set_text str
method set_draw_mode dm =
match dm with
Edges -> self#top_xlurette#radiobutton_edges#set_active true
| Vertices -> self#top_xlurette#radiobutton_vertices#set_active true
| Inside -> self#top_xlurette#radiobutton_inside#set_active true
......@@ -1121,14 +1147,7 @@ class customized_callbacks = object(self)
(* : 'a -> tok -> unit) = *)
( match tok with parser
| [< 'Genlex.Ident "set_draw_mode" ;'Genlex.Ident id >] ->
(
match id with
"inside" -> self#set_draw_mode Inside
| "edges" -> self#set_draw_mode Edges
| "vertices" -> self#set_draw_mode Vertices
| _ -> print_string ("Unknown draw mode (" ^ id ^ ")\n")
)
| [< 'Genlex.Ident "set_env" ; 'Genlex.String str >] ->
self#set_env str
......@@ -1150,8 +1169,6 @@ class customized_callbacks = object(self)
| [< 'Genlex.Ident "set_test_length" ; 'Genlex.Int i >] ->
self#set_test_length i
| [< 'Genlex.Ident "set_formula_nb" ; 'Genlex.Int i >] ->
self#set_formula_nb i
| [< 'Genlex.Ident "set_draw_nb" ; 'Genlex.Int i >] ->
self#set_draw_nb i
......@@ -1254,26 +1271,20 @@ let rec speclist callbacks =
"-l", Arg.Int (fun i -> callbacks#set_test_length i),
("<int>\t\t(default=" ^ (string_of_int (callbacks#get_test_length ())) ^ ").\n");
"--thick-form", Arg.Int (fun i -> callbacks#set_formula_nb i),
"<int>\tNumber of formula to be drawn at each step";
"-tf", Arg.Int (fun i -> callbacks#set_formula_nb i),
("<int>\t\t(default=" ^ (string_of_int (callbacks#get_formula_nb ())) ^ ").\n");
"--thick-draw", Arg.Int (fun i -> callbacks#set_draw_nb i),
"<int>\tNumber of draw to be done in each formula ";
"-td", Arg.Int (fun i -> callbacks#set_draw_nb i),
("<int>\t\tat each step (default=" ^
(string_of_int (callbacks#get_draw_nb ())) ^ ").\n");
"--draw-inside", Arg.Unit (fun _ -> callbacks#set_draw_mode Inside),
"\tDraw inside the polyhedron of solutions.\n ";
"--draw-edges", Arg.Unit (fun _ -> callbacks#set_draw_mode Edges),
"\t\tDraw on the edges of the polyhedron of solutions.\n ";
"--draw-inside", Arg.Int (fun i -> callbacks#set_draw_inside i),
"<int>\tDraw on the edges of the convex hull of solutions.";
"--draw-vertices", Arg.Unit (fun _ -> callbacks#set_draw_mode Vertices),
"\tDraw among the vertices of the polyhedron of solutions.\n ";
"--draw-edges", Arg.Int (fun i -> callbacks#set_draw_edges i),
"<int>\t\tDraw on the edges of the convex hull of solutions.";
"--draw-vertices", Arg.Int (fun i -> callbacks#set_draw_vertices i),
"<int>\tDraw among the vertices of the convex hull of solutions.\n ";
"--output", Arg.String (fun s -> callbacks#set_rif_file_basename s),
......@@ -1352,6 +1363,9 @@ let main () =
let on_oracle_help_button =
new Xlurette_glade_interface.top_oracle_help_window callbacks
in
let on_test_thickness_help_button =
new Xlurette_glade_interface.top_test_thickness_help_window callbacks
in
let on_extra_env_var_button =
new Xlurette_glade_interface.top_extra_env_var_window callbacks
......
lurette.prj
View file @ d66521bd
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette")
(Project-Version lurette 1 2)
(Parent-Version lurette 1 1)
(Project-Version lurette 1 3)
(Parent-Version lurette 1 2)
(Version-Log "
share/
Do not use the lucky_init.sh to set up env var anymore but wrap executables
by scripts that set them.
test/
Add more test cases.
source/lurettetop.ml:
lauch gnuplot via an xterm to turn around a buggy behavior of gnuplot
(this fix is far from ideal however, because the xterm window have to
be killed manually, which is boring).
source/store.ml:
source/store.ml:
source/solver.ml:
Add a numeric thickness at the numeric level.
")
(New-Version-Log ""
)
(Checkin-Time "Wed, 17 Sep 2003 10:09:24 +0200")
(Checkin-Time "Tue, 23 Sep 2003 16:56:51 +0200")
(Checkin-Login jahier)
(Populate-Ignore ())
(Project-Keywords)
......@@ -33,35 +24,35 @@ source/lurettetop.ml:
;; Sources files for luc_exe
(source/luc_exe.mli (lurette/b/31_ima_exe.ml 1.2 644))
(source/luc_exe.ml (lurette/b/32_ima_exe.ml 1.34 644))
(source/luc_exe.ml (lurette/b/32_ima_exe.ml 1.35 644))
(source/command_line_luc_exe.ml (lurette/b/33_command_li 1.17 644))
(source/command_line_luc_exe.mli (lurette/b/34_command_li 1.10 644))
(source/command_line_luc_exe.ml (lurette/b/33_command_li 1.18 644))
(source/command_line_luc_exe.mli (lurette/b/34_command_li 1.11 644))
;; Sources files for lurette only
(source/lurette.mli (lurette/11_lurette.ml 1.13 644))
(source/lurette.ml (lurette/12_lurette.ml 1.73 644))
(source/lurette.ml (lurette/12_lurette.ml 1.74 644))
(source/command_line.ml (lurette/b/20_command_li 1.14 644))
(source/command_line.mli (lurette/b/21_command_li 1.11 644))
(source/command_line.ml (lurette/b/20_command_li 1.15 644))
(source/command_line.mli (lurette/b/21_command_li 1.12 644))
;; Sources files common to lurette and luc_exe
(source/graph.mli (lurette/13_graph.mli 1.11 644))
(source/graph.ml (lurette/14_graph.ml 1.9 644))
(source/env.mli (lurette/15_env.mli 1.18 644))
(source/env.ml (lurette/16_env.ml 1.31 644))
(source/env.mli (lurette/15_env.mli 1.19 644))
(source/env.ml (lurette/16_env.ml 1.32 644))
(source/util.ml (lurette/35_util.ml 1.53 644))
(source/util.ml (lurette/35_util.ml 1.54 644))
(source/solver.mli (lurette/38_solver.mli 1.15 644))
(source/solver.ml (lurette/39_solver.ml 1.51 644))
(source/solver.mli (lurette/38_solver.mli 1.16 644))
(source/solver.ml (lurette/39_solver.ml 1.52 644))
(source/polyhedron.ml (lurette/d/25_polyhedron 1.7 644))
(source/polyhedron.mli (lurette/d/26_polyhedron 1.2 644))
(source/store.mli (lurette/b/26_rnumsolver 1.17 644))
(source/store.ml (lurette/b/27_rnumsolver 1.25 644))
(source/store.mli (lurette/b/26_rnumsolver 1.18 644))
(source/store.ml (lurette/b/27_rnumsolver 1.26 644))
(source/pnumsolver.ml (lurette/d/23_pnumsolver 1.2 644))
(source/pnumsolver.mli (lurette/d/24_pnumsolver 1.2 644))
......@@ -81,11 +72,11 @@ source/lurettetop.ml:
(source/eval.mli (lurette/48_eval.mli 1.11 644))
(source/eval.ml (lurette/49_eval.ml 1.15 644))
(source/env_state.mli (lurette/50_env_state. 1.32 644))