Commit 21390374 authored by Erwan Jahier's avatar Erwan Jahier

lurette 1.13 Fri, 12 Dec 2003 14:21:26 +0100 by jahier

Parent-Version:      1.12
Version-Log:

aesthetic changes in mli files so that
the automatically generated doc looks ok.

Project-Description: Lurette
parent c3ab83b6
......@@ -8,7 +8,7 @@
(source/constraint.mli 1706 1069150632 c/18_constraint 1.8)
(test/ControleurPorte.lus 3219 1032940601 c/17_Controleur 1.1)
(mlcuddidl/Changes 64 1034006019 d/10_Changes 1.1)
(TODO 5795 1070981068 d/22_TODO 1.31)
(TODO 6030 1071235286 d/22_TODO 1.32)
(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 20626 1069833150 g/38_fair_bddd. 1.5)
......@@ -20,10 +20,10 @@
(test/cygwin-scade/lib_pilot.vsw 435 1055926783 f/46_lib_pilot. 1.1)
(mlcuddidl/idd.idl 10595 1034006019 d/1_idd.idl 1.1)
(share/pixmaps/open.xpm 782 1055926783 f/17_open.xpm 1.1)
(source/parse_luc.mli 2741 1069833150 40_parse_env. 1.18)
(source/parse_luc.mli 2846 1071235286 40_parse_env. 1.19)
(polka/C/internal.c 699 1047029868 e/8_internal.c 1.1)
(source/solver.ml 7687 1069833150 39_solver.ml 1.59)
(ihm/xlurette/makefile 1836 1070981068 c/16_makefile 1.18)
(source/solver.ml 7714 1071235286 39_solver.ml 1.60)
(ihm/xlurette/makefile 1840 1071235286 c/16_makefile 1.19)
(share/gen_fake_lucky.sh.in 115 1063786164 g/31_gen_fake_l 1.1)
(test/test_losange-10d.lus 108 1065787303 g/41_test_losan 1.1)
(polka/C/internal.h 958 1047029868 e/0_internal.h 1.1)
......@@ -32,7 +32,7 @@
(test/sparc-scade/libpwlinear.saofdm 1379 1055487917 e/43_libpwlinea 1.1)
(test/cygwin-scade/ConfAnnot.aty 13661 1055926783 g/4_ConfAnnot. 1.1)
(test/ControleurPorte.c 9407 1012914629 b/19_Controleur 1.1)
(source/bddd.mli 1120 1070981068 g/37_bddd.mli 1.7)
(source/bddd.mli 1340 1071235286 g/37_bddd.mli 1.8)
(share/lucky_init.sh.in 1061 1063786164 e/24_lucky_init 1.11)
(test/heater.lus 176 1063786164 g/33_heater.lus 1.1)
(test/ControleurPorte.h 2306 1012914629 b/18_Controleur 1.1)
......@@ -49,13 +49,13 @@
(README 2803 1056374363 10_README 1.10)
(source/gen_stubs_scade.ml 9106 1055926783 f/5_gen_stubs_ 1.1)
(test/test9.rif.exp 2322 1064411282 g/17_test9.rif. 1.2)
(source/exp.ml 5974 1069150632 g/47_exp.ml 1.1)
(source/exp.ml 5911 1071235286 g/47_exp.ml 1.2)
(cuddaux/cuddauxMisc.c 13842 1034006019 c/27_cuddauxMis 1.1)
(source/polyhedron.ml 12967 1070981068 d/25_polyhedron 1.12)
(source/polyhedron.ml 12951 1071235286 d/25_polyhedron 1.13)
(source/Makefile.gen_fake_lucky 528 1063786164 g/9_Makefile.g 1.2)
(polka/C/poly.c 48492 1047029868 e/5_poly.c 1.1)
(source/luc_exe.mli 449 1069150632 b/31_ima_exe.ml 1.3)
(doc/ocamldoc.sty 1732 1069150632 b/12_ocamldoc.s 1.2)
(doc/ocamldoc.sty 1720 1071235286 b/12_ocamldoc.s 1.3)
(polka/C/cherni.c 28868 1065787303 e/9_cherni.c 1.2)
(source/command_line_luc_exe.mli 1298 1069833150 b/34_command_li 1.14)
(polka/C/poly.h 4314 1047029868 d/49_poly.h 1.1)
......@@ -64,26 +64,26 @@
(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 6291 1070981068 e/38_time-mouch 1.13)
(test/time-moucherotte.res 6278 1071235286 e/38_time-mouch 1.14)
(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)
(mlcuddidl/mtbdd.ml 10185 1034006019 c/44_mtbdd.ml 1.1)
(source/draw.ml 2942 1069150632 f/2_draw.ml 1.3)
(source/prevar.ml 3090 1063029729 d/18_prevar.ml 1.4)
(source/var.mli 3033 1069833150 g/50_var.mli 1.2)
(source/var.mli 3612 1071235286 g/50_var.mli 1.3)
(mlcuddidl/idd.ml 7061 1034006019 d/0_idd.ml 1.1)
(test/cygwin-scade/C_SQRT.saofd 214 1055926783 g/1_C_SQRT.sao 1.1)
(test/giro/onlyroll.lus 18298 1031732392 c/7_onlyroll.l 1.1)
(polka/Changes 1502 1047029868 e/22_Changes 1.1)
(source/poly_draw.mli 1416 1069150632 g/44_polyDraw.m 1.2)
(source/poly_draw.mli 1519 1071235286 g/44_polyDraw.m 1.3)
(test/losange-10d.luc 1550 1066840252 g/42_losange-10 1.2)
(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/print.mli 1135 1069150632 46_print.mli 1.14)
(polka/caml/Makefile 6886 1070981068 d/45_Makefile 1.3)
(test/cygwin-scade/det_mvt_mode.saofd 4184 1055926783 f/51_det_mvt_mo 1.1)
(ihm/xlurette/xlurette_glade_main.ml 46690 1070981068 c/12_xlurette_g 1.30)
(ihm/xlurette/xlurette_glade_main.ml 46762 1071235286 c/12_xlurette_g 1.31)
(TAGS 9825 1007379917 21_TAGS 1.6)
(polka/C/main.tex 1961 1047029868 e/14_main.tex 1.1)
(ihm/xlurette/xlurette.glade 103402 1069833150 c/13_xlurette.g 1.25)
......@@ -92,8 +92,8 @@
(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 10964 1069150632 e/36_gyro.rif.e 1.7)
(test/time-ecrins.exp 9332 1070981068 d/21_time-ecrin 1.33)
(source/value.ml 2539 1063786164 c/23_value.ml 1.6)
(test/time-ecrins.exp 9334 1071235286 d/21_time-ecrin 1.34)
(source/value.ml 2534 1071235286 c/23_value.ml 1.7)
(source/gne.ml 3467 1063029729 b/37_gne.ml 1.6)
(test/cygwin-scade/Pilot.vsp 2075 1055926783 f/40_Pilot.vsp 1.1)
(source/parse_c_scade.ml 6943 1070981068 e/41_parse_c_sc 1.3)
......@@ -103,7 +103,7 @@
(share/pixmaps/plus.xpm 473 1055926783 f/15_plus.xpm 1.1)
(polka/C/Makefile 3528 1047029868 e/15_Makefile 1.1)
(source/Makefile.gen_fake_lutin 528 1063786164 d/17_Makefile.g 1.4)
(Makefile.common.source 548 1070981068 e/33_Makefile.c 1.8)
(Makefile.common.source 544 1071235286 e/33_Makefile.c 1.9)
(test/giro/giro.luc 2755 1033738731 c/6_giro.ima 1.4)
(source/control.ml 4586 1065787303 c/4_control.ml 1.5)
(test/cygwin-scade/.lurette_rc~ 505 1055926783 f/30_.lurette_r 1.1)
......@@ -119,7 +119,7 @@
(share/pixmaps/clean-up.xpm 1565 1055926783 f/22_clean-up.x 1.1)
(source/Makefile.lurettetop 470 1063786164 d/14_Makefile.l 1.5)
(test/cygwin-scade/Control.saofd 6690 1055926783 g/3_Control.sa 1.1)
(source/exp.mli 2477 1069150632 g/48_exp.mli 1.1)
(source/exp.mli 2131 1071235286 g/48_exp.mli 1.2)
(test/cygwin-scade/telemetry_validation.saofd 4738 1055926783 f/34_telemetry_ 1.1)
(share/lurettetop_sh.in 781 1063786164 g/24_lurettetop 1.1)
(mlcuddidl/manager.mli 7912 1034006019 c/46_manager.ml 1.1)
......@@ -141,7 +141,7 @@
(mlcuddidl/README 1574 1034006019 d/8_README 1.1)
(source/sim2chro.mli 1549 1069833150 b/23_sim2chro.m 1.10)
(share/lucky_init.csh.in 150 1063786164 e/23_lucky_init 1.8)
(source/lustreExp.ml 21223 1069150632 g/45_lustreExp. 1.1)
(source/lustreExp.ml 21259 1071235286 g/45_lustreExp. 1.2)
(source/gen_fake_lucky.ml 4626 1070981068 g/8_gen_fake_l 1.3)
(polka/C/vector.h 2103 1047029868 d/47_vector.h 1.1)
(ID_EN_VRAC 2184 1002196285 0_ID_EN_VRAC 1.1)
......@@ -151,9 +151,9 @@
(mlcuddidl/manager.ml 8017 1034006019 c/47_manager.ml 1.1)
(share/plot 11416 1070981068 e/35_plot 1.6)
(share/pixmaps/save.xpm 867 1055926783 f/12_save.xpm 1.1)
(source/solver.mli 1201 1069833150 38_solver.mli 1.21)
(source/solver.mli 1780 1071235286 38_solver.mli 1.22)
(test/passerelle.luc 963 1063786164 b/17_passerelle 1.12)
(source/store.ml 35266 1070981068 b/27_rnumsolver 1.32)
(source/store.ml 35209 1071235286 b/27_rnumsolver 1.33)
(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)
......@@ -161,13 +161,13 @@
(test/window.luc 4336 1063786164 g/15_window.luc 1.1)
(source/ne.ml 10667 1069150632 c/21_ne.ml 1.11)
(source/gen_stubs_poc.ml 8873 1055926783 f/3_gen_stubs_ 1.1)
(source/thickness.ml 1194 1069833150 g/51_thickness. 1.1)
(source/thickness.ml 1386 1071235286 g/51_thickness. 1.2)
(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 4494 1070981068 b/38_Makefile.l 1.28)
(source/lucky.ml 9042 1069833150 16_env.ml 1.36)
(source/lucky.ml 8904 1071235286 16_env.ml 1.37)
(source/graph.mli 2339 1069150632 13_graph.mli 1.12)
(source/store.mli 3288 1069833150 b/26_rnumsolver 1.23)
(source/store.mli 3823 1071235286 b/26_rnumsolver 1.24)
(test/time-ossau.res 9336 1070981068 b/49_time.res 1.58)
(test/sparc-scade/libmath.saofdm 1378 1055487917 e/45_libmath.sa 1.1)
(Makefile 68 1051024737 d/13_Makefile 1.4)
......@@ -179,7 +179,7 @@
(cuddaux/Makefile 3326 1070981068 c/35_Makefile 1.8)
(polka/C/bit.c 3026 1047029868 e/10_bit.c 1.1)
(source/draw.mli 452 1065787303 f/1_draw.mli 1.2)
(test/time-ossau.exp 9334 1070981068 b/48_time.exp 1.54)
(test/time-ossau.exp 9336 1071235286 b/48_time.exp 1.55)
(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 5904 1069150632 47_print.ml 1.25)
......@@ -192,7 +192,7 @@
(source/parse_c_scade.mli 651 1070981068 e/42_parse_c_sc 1.2)
(demo-xlurette/chaudiere/chaudiere.luc 681 1064329011 c/11_chaudiere. 1.8)
(test/giro/allocator.lus 1087 1031732392 c/5_allocator. 1.1)
(source/run_aut.ml 21927 1069833150 b/47_automata.m 1.18)
(source/run_aut.ml 22149 1071235286 b/47_automata.m 1.19)
(cuddaux/README 1427 1034006019 c/34_README 1.1)
(mlcuddidl/bdd.ml 10889 1034006019 d/6_bdd.ml 1.1)
(source/lurettetop.ml 47197 1070981068 c/1_lurettetop 1.44)
......@@ -209,7 +209,7 @@
(test/cygwin-scade/MyConsts.saofd 153 1055926783 f/44_MyConsts.s 1.1)
(test/losange-3d2.luc 371 1066840252 e/32_losange-3d 1.5)
(test/Makefile 2729 1064411282 c/0_Makefile 1.14)
(user-rules 34669 1069833150 c/14_myrules 1.49)
(user-rules 34634 1071235286 c/14_myrules 1.50)
(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)
......@@ -224,12 +224,12 @@
(mlcuddidl/rdd.idl 14806 1034006019 c/42_rdd.idl 1.1)
(test/cygwin-scade/det_mvt_mode_env.luc 283 1063029729 f/31_det_mvt_mo 1.2)
(doc/Interface_draft 5232 1003928781 19_Interface_ 1.1)
(source/lustreExp.mli 1740 1069150632 g/46_lustreExp. 1.1)
(source/lustreExp.mli 1903 1071235286 g/46_lustreExp. 1.2)
(polka/sedscript 261 1047029868 d/31_sedscript 1.1)
(source/parse_luc.ml 38360 1069833150 41_parse_env. 1.50)
(source/parse_luc.ml 38474 1071235286 41_parse_env. 1.51)
(OcamlMakefile 21310 1055487917 17_OcamlMakef 1.51)
(polka/caml/polka.ml 5485 1047029868 d/39_polka.ml 1.1)
(source/lurette.mli 739 1069150632 11_lurette.ml 1.14)
(source/lurette.mli 750 1071235286 11_lurette.ml 1.15)
(share/pixmaps/halt.xpm 511 1055926783 f/18_halt.xpm 1.1)
(share/xlurette_sh.in 779 1063786164 g/20_xlurette_s 1.1)
(polka/C/matrix.c 19090 1047029868 e/7_matrix.c 1.1)
......@@ -237,14 +237,14 @@
(share/configure.in 8503 1064329011 d/11_configure. 1.14)
(test/tram.luc 1325 1063786164 b/15_tram.env 1.12)
(demo-xlurette/chaudiere/buggy_chaudiere_ctrl.lus 219 1031732392 c/10_buggy_chau 1.1)
(source/run_aut.mli 3695 1069833150 b/46_automata.m 1.8)
(source/run_aut.mli 4464 1071235286 b/46_automata.m 1.9)
(polka/C/matrix.h 3461 1047029868 d/51_matrix.h 1.1)
(cuddaux/cuddaux.h 2381 1034006019 c/33_cuddaux.h 1.1)
(share/lurettetop.bat.in 672 1063786164 g/26_lurettetop 1.1)
(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 1645 1069833150 50_env_state. 1.37)
(source/env_state.mli 1704 1071235286 50_env_state. 1.38)
(test/ControleurPorte.rif.exp 4688 1069833150 b/29_Controleur 1.20)
(source/show_luc.ml 4292 1069150632 e/25_show_luc.m 1.7)
(share/pixmaps/quit.xpm 494 1055926783 f/14_quit.xpm 1.1)
......@@ -262,21 +262,21 @@
(source/Makefile.gen_stubs 741 1063786164 b/42_Makefile.g 1.8)
(test/temp_float.luc 680 1063786164 b/51_temp_float 1.10)
(polka/C/polka.c 4969 1047029868 e/6_polka.c 1.1)
(source/polyhedron.mli 1481 1069150632 d/26_polyhedron 1.6)
(source/polyhedron.mli 1493 1071235286 d/26_polyhedron 1.7)
(test/test_losange.lus 88 1055926783 f/27_test_losan 1.1)
(mlcuddidl/bdd.mli 8573 1034006019 d/5_bdd.mli 1.1)
(test/cygwin-scade/compute_path.saofd 1662 1055926783 g/5_compute_pa 1.1)
(source/lucky.mli 820 1069833150 15_env.mli 1.22)
(source/lucky.mli 1519 1071235286 15_env.mli 1.23)
(polka/C/polka.h 1478 1047029868 d/50_polka.h 1.1)
(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 4862 1070981068 e/37_time-mouch 1.12)
(test/time-moucherotte.exp 6291 1071235286 e/37_time-mouch 1.13)
(source/command_line_luc_exe.ml 3804 1069833150 b/33_command_li 1.21)
(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 9334 1070981068 d/20_time-ecrin 1.34)
(source/value.mli 1172 1069150632 c/24_value.mli 1.5)
(test/time-ecrins.res 9333 1071235286 d/20_time-ecrin 1.35)
(source/value.mli 1181 1071235286 c/24_value.mli 1.6)
(polka/Makefile.config 1683 1053337243 e/20_Makefile.c 1.5)
(test/vrai_tram.lus 564 1027066799 b/6_vrai_tram. 1.2)
(source/Makefile 9457 1070981068 c/20_Makefile 1.27)
......@@ -287,12 +287,12 @@
(test/losange-3d.rif.exp 27445 1066840252 e/31_losange-3d 1.5)
(polka/documentation/Makefile 476 1047029868 e/18_Makefile 1.1)
(source/sim2chro.ml 3167 1069833150 b/24_sim2chro.m 1.23)
(source/poly_draw.ml 22086 1069150632 g/43_polyDraw.m 1.2)
(source/poly_draw.ml 22013 1071235286 g/43_polyDraw.m 1.3)
(cuddaux/cuddauxTDGenCof.c 15712 1034006019 c/26_cuddauxTDG 1.1)
(source/luc_exe.ml 13991 1069833150 b/32_ima_exe.ml 1.41)
(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 18675 1070981068 12_lurette.ml 1.80)
(source/lurette.ml 18728 1071235286 12_lurette.ml 1.81)
(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)
......@@ -303,10 +303,10 @@
(source/gen_fake_lutin.ml 4709 1055487917 d/16_gen_fake_l 1.5)
(test/heater_float.lus 177 1034351455 b/44_heater_flo 1.2)
(share/set_env_var.in 949 1063786164 g/23_set_env_va 1.1)
(source/formula_to_bdd.mli 1278 1069833150 g/35_formula_to 1.5)
(source/formula_to_bdd.mli 1270 1071235286 g/35_formula_to 1.6)
(polka/Makefile 1636 1047029868 e/21_Makefile 1.1)
(test/dynamic_weight.luc 563 1063786164 g/14_dynamic_we 1.1)
(source/var.ml 5286 1069833150 g/49_var.ml 1.2)
(source/var.ml 5286 1071235286 g/49_var.ml 1.3)
(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)
......
......@@ -5,13 +5,13 @@
# Where to find libs
INCDIRS = $(HOME)/$(HOST_TYPE)/lib
LIBDIRS = $(HOME)/$(HOST_TYPE)/lib
# INCDIRS = $(HOME)/$(HOST_TYPE)/lib
# LIBDIRS = $(HOME)/$(HOST_TYPE)/lib
# INCDIRS = $(HOME)/$(HOST_TYPE)/lib $(SCADE_INSTALL_DIR)/lib \
# $(SCADE_INSTALL_DIR)/SimulinkGateway/include \
# $(SCADE_INSTALL_DIR)/include
# LIBDIRS = $(HOME)/$(HOST_TYPE)/lib $(SCADE_INSTALL_DIR)/lib
INCDIRS = $(HOME)/$(HOST_TYPE)/lib $(SCADE_INSTALL_DIR)/lib \
$(SCADE_INSTALL_DIR)/SimulinkGateway/include \
$(SCADE_INSTALL_DIR)/include
LIBDIRS = $(HOME)/$(HOST_TYPE)/lib $(SCADE_INSTALL_DIR)/lib
OCAMLMAKEFILE = $(HOME)/lurette/OcamlMakefile
......
* faire un passage pour verifier que je ne cree pas de hash tbl que
n'utilise plus apres, auquel cas
-> soit je nettoie
-> soit j'utilise des map.
* essayer les versions precedentes de scade sous sparcs avec les programmes
de HS
*********** BUGS
......
......@@ -57,7 +57,7 @@
\newenvironment{ocamldocdescription}
{ %\color{green3}
\list{}{\rightmargin0pt \topsep0pt}\raggedright\item\relax}
\list{}{\rightmargin0pt \topsep0pt}\item\relax}
{\endlist\medskip}
\newenvironment{ocamldoccomment}
......
......@@ -51,7 +51,7 @@ all: opt cp
cp:
ifeq ($(HOST_TYPE),cygwin)
cp xlurette_exe.exe $(BIN_INSTALL_DIR)
cp xlurette_exe.exe /cygdrive/u/cygwin/bin
else
cp xlurette_exe $(BIN_INSTALL_DIR)
endif
......
......@@ -1025,7 +1025,9 @@ class customized_callbacks = object(self)
self#read_rif_files ()
method on_env_name_entry_changed () =
self#read_env_files ()
method save_parameters () =
let msg = "Saving current parameters in .lurette_rc \n"
and cmds = self#get_all_cmds ()
......
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette")
(Project-Version lurette 1 12)
(Parent-Version lurette 1 11)
(Project-Version lurette 1 13)
(Parent-Version lurette 1 12)
(Version-Log "
Various fixes in the C scade parsing.
aesthetic changes in mli files so that
the automatically generated doc looks ok.
")
(New-Version-Log ""
)
(Checkin-Time "Tue, 09 Dec 2003 15:44:28 +0100")
(Checkin-Time "Fri, 12 Dec 2003 14:21:26 +0100")
(Checkin-Login jahier)
(Populate-Ignore ())
(Project-Keywords)
......@@ -27,8 +28,8 @@ Various fixes in the C scade parsing.
(source/command_line_luc_exe.mli (lurette/b/34_command_li 1.14 644))
;; Sources files for lurette only
(source/lurette.mli (lurette/11_lurette.ml 1.14 644))
(source/lurette.ml (lurette/12_lurette.ml 1.80 644))
(source/lurette.mli (lurette/11_lurette.ml 1.15 644))
(source/lurette.ml (lurette/12_lurette.ml 1.81 644))
(source/command_line.ml (lurette/b/20_command_li 1.17 644))
(source/command_line.mli (lurette/b/21_command_li 1.14 644))
......@@ -37,30 +38,30 @@ Various fixes in the C scade parsing.
(source/graph.mli (lurette/13_graph.mli 1.12 644))
(source/graph.ml (lurette/14_graph.ml 1.10 644))
(source/lucky.mli (lurette/15_env.mli 1.22 644))
(source/lucky.ml (lurette/16_env.ml 1.36 644))
(source/lucky.mli (lurette/15_env.mli 1.23 644))
(source/lucky.ml (lurette/16_env.ml 1.37 644))
(source/util.ml (lurette/35_util.ml 1.60 644))
(source/formula_to_bdd.ml (lurette/g/34_formula_to 1.4 644))
(source/formula_to_bdd.mli (lurette/g/35_formula_to 1.5 644))
(source/formula_to_bdd.mli (lurette/g/35_formula_to 1.6 644))
(source/fair_bddd.ml (lurette/g/38_fair_bddd. 1.5 644))
(source/fair_bddd.mli (lurette/g/39_fair_bddd. 1.5 644))
(source/bddd.ml (lurette/g/36_bddd.ml 1.7 644))
(source/bddd.mli (lurette/g/37_bddd.mli 1.7 644))
(source/bddd.mli (lurette/g/37_bddd.mli 1.8 644))
(source/solver.mli (lurette/38_solver.mli 1.21 644))
(source/solver.ml (lurette/39_solver.ml 1.59 644))
(source/solver.mli (lurette/38_solver.mli 1.22 644))
(source/solver.ml (lurette/39_solver.ml 1.60 644))
(source/polyhedron.ml (lurette/d/25_polyhedron 1.12 644))
(source/polyhedron.mli (lurette/d/26_polyhedron 1.6 644))
(source/polyhedron.ml (lurette/d/25_polyhedron 1.13 644))
(source/polyhedron.mli (lurette/d/26_polyhedron 1.7 644))
(source/store.mli (lurette/b/26_rnumsolver 1.23 644))
(source/store.ml (lurette/b/27_rnumsolver 1.32 644))
(source/store.mli (lurette/b/26_rnumsolver 1.24 644))
(source/store.ml (lurette/b/27_rnumsolver 1.33 644))
(source/parse_luc.mli (lurette/40_parse_env. 1.18 644))
(source/parse_luc.ml (lurette/41_parse_env. 1.50 644))
(source/parse_luc.mli (lurette/40_parse_env. 1.19 644))
(source/parse_luc.ml (lurette/41_parse_env. 1.51 644))
(source/show_env.mli (lurette/42_show_env.m 1.11 644))
(source/show_env.ml (lurette/43_show_env.m 1.20 644))
......@@ -68,11 +69,11 @@ Various fixes in the C scade parsing.
(source/print.mli (lurette/46_print.mli 1.14 644))
(source/print.ml (lurette/47_print.ml 1.25 644))
(source/env_state.mli (lurette/50_env_state. 1.37 644))
(source/env_state.mli (lurette/50_env_state. 1.38 644))
(source/env_state.ml (lurette/51_env_state. 1.52 644))
(source/run_aut.mli (lurette/b/46_automata.m 1.8 644))
(source/run_aut.ml (lurette/b/47_automata.m 1.18 644))
(source/run_aut.mli (lurette/b/46_automata.m 1.9 644))
(source/run_aut.ml (lurette/b/47_automata.m 1.19 644))
(source/sim2chro.mli (lurette/b/23_sim2chro.m 1.10 644))
(source/sim2chro.ml (lurette/b/24_sim2chro.m 1.23 644))
......@@ -104,8 +105,8 @@ Various fixes in the C scade parsing.
(source/ne.ml (lurette/c/21_ne.ml 1.11 644))
(source/ne.mli (lurette/c/22_ne.mli 1.9 644))
(source/value.ml (lurette/c/23_value.ml 1.6 644))
(source/value.mli (lurette/c/24_value.mli 1.5 644))
(source/value.ml (lurette/c/23_value.ml 1.7 644))
(source/value.mli (lurette/c/24_value.mli 1.6 644))
(source/prevar.ml (lurette/d/18_prevar.ml 1.4 644))
(source/prevar.mli (lurette/d/19_prevar.mli 1.5 644))
......@@ -142,10 +143,10 @@ Various fixes in the C scade parsing.
(share/pixmaps/button-close.xpm (lurette/f/24_button-clo 1.1 644))
(share/config.guess (lurette/f/25_config.gue 1.1 755))
(share/configure.in (lurette/d/11_configure. 1.14 644))
(Makefile.common.source (lurette/e/33_Makefile.c 1.8 644))
(Makefile.common.source (lurette/e/33_Makefile.c 1.9 644))
(OcamlMakefile (lurette/17_OcamlMakef 1.51 644))
(share/Makefile.lurette.in (lurette/b/38_Makefile.l 1.28 644))
(user-rules (lurette/c/14_myrules 1.49 644))
(user-rules (lurette/c/14_myrules 1.50 644))
(share/Makefile.test.in (lurette/c/25_user-rules 1.10 644))
(Makefile (lurette/d/13_Makefile 1.4 644))
......@@ -162,7 +163,7 @@ Various fixes in the C scade parsing.
(doc/archi.fig (lurette/20_archi.fig 1.1 644))
(doc/synthese (lurette/b/2_synthese 1.1 644))
(doc/automata_format (lurette/b/3_automata_f 1.1 644))
(doc/ocamldoc.sty (lurette/b/12_ocamldoc.s 1.2 644))
(doc/ocamldoc.sty (lurette/b/12_ocamldoc.s 1.3 644))
(doc/ocamldoc.hva (lurette/b/13_ocamldoc.h 1.1 644))
;; Misc
......@@ -170,19 +171,19 @@ Various fixes in the C scade parsing.
(ID_EN_VRAC (lurette/0_ID_EN_VRAC 1.1 644))
(INSTALL (lurette/f/26_INSTALL 1.2 744))
(TAGS (lurette/21_TAGS 1.6 644))
(TODO (lurette/d/22_TODO 1.31 644))
(TODO (lurette/d/22_TODO 1.32 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.11 644))
(share/gnuplot-rif (lurette/e/34_gnuplot-ri 1.5 744))
(share/plot (lurette/e/35_plot 1.6 744))
(test/time-ossau.exp (lurette/b/48_time.exp 1.54 644))
(test/time-ossau.exp (lurette/b/48_time.exp 1.55 644))
(test/time-ossau.res (lurette/b/49_time.res 1.58 644))
(test/time-ecrins.res (lurette/d/20_time-ecrin 1.34 644))
(test/time-ecrins.exp (lurette/d/21_time-ecrin 1.33 644))
(test/time-moucherotte.exp (lurette/e/37_time-mouch 1.12 644))
(test/time-moucherotte.res (lurette/e/38_time-mouch 1.13 644))
(test/time-ecrins.res (lurette/d/20_time-ecrin 1.35 644))
(test/time-ecrins.exp (lurette/d/21_time-ecrin 1.34 644))
(test/time-moucherotte.exp (lurette/e/37_time-mouch 1.13 644))
(test/time-moucherotte.res (lurette/e/38_time-mouch 1.14 644))
;; Various files used for testing purposes
(test/cudd_gc_problem.luc (lurette/e/29_cudd_gc_pr 1.2 644))
......@@ -281,10 +282,10 @@ Various fixes in the C scade parsing.
(test/Makefile (lurette/c/0_Makefile 1.14 644))
;; xlurette
(ihm/xlurette/xlurette_glade_main.ml (lurette/c/12_xlurette_g 1.30 644))
(ihm/xlurette/xlurette_glade_main.ml (lurette/c/12_xlurette_g 1.31 644))
(ihm/xlurette/xlurette.glade (lurette/c/13_xlurette.g 1.25 644))
(ihm/xlurette/xlurette_glade_interface.ml (lurette/c/15_xlurette_g 1.23 644))
(ihm/xlurette/makefile (lurette/c/16_makefile 1.18 644))
(ihm/xlurette/makefile (lurette/c/16_makefile 1.19 644))
;; cudaux
......@@ -438,48 +439,48 @@ Various fixes in the C scade parsing.
;; Files added by populate at Fri, 17 Oct 2003 12:22:17 +0200,
;; to version 1.7(w), by jahier:
(source/poly_draw.ml (lurette/g/43_polyDraw.m 1.2 644))
(source/poly_draw.ml (lurette/g/43_polyDraw.m 1.3 644))
;; Files added by populate at Fri, 17 Oct 2003 12:22:20 +0200,
;; to version 1.7(w), by jahier:
(source/poly_draw.mli (lurette/g/44_polyDraw.m 1.2 644))
(source/poly_draw.mli (lurette/g/44_polyDraw.m 1.3 644))
;; Files added by populate at Thu, 13 Nov 2003 16:59:39 +0100,
;; to version 1.8(w), by jahier:
(source/lustreExp.ml (lurette/g/45_lustreExp. 1.1 644))
(source/lustreExp.ml (lurette/g/45_lustreExp. 1.2 644))
;; Files added by populate at Thu, 13 Nov 2003 16:59:41 +0100,
;; to version 1.8(w), by jahier:
(source/lustreExp.mli (lurette/g/46_lustreExp. 1.1 644))
(source/lustreExp.mli (lurette/g/46_lustreExp. 1.2 644))
;; Files added by populate at Fri, 14 Nov 2003 14:32:47 +0100,
;; to version 1.8(w), by jahier:
(source/exp.ml (lurette/g/47_exp.ml 1.1 644))
(source/exp.ml (lurette/g/47_exp.ml 1.2 644))
;; Files added by populate at Fri, 14 Nov 2003 14:32:49 +0100,
;; to version 1.8(w), by jahier:
(source/exp.mli (lurette/g/48_exp.mli 1.1 644))
(source/exp.mli (lurette/g/48_exp.mli 1.2 644))
;; Files added by populate at Fri, 14 Nov 2003 14:32:53 +0100,
;; to version 1.8(w), by jahier:
(source/var.ml (lurette/g/49_var.ml 1.2 644))
(source/var.ml (lurette/g/49_var.ml 1.3 644))
;; Files added by populate at Fri, 14 Nov 2003 14:32:55 +0100,
;; to version 1.8(w), by jahier:
(source/var.mli (lurette/g/50_var.mli 1.2 644))
(source/var.mli (lurette/g/50_var.mli 1.3 644))
;; Files added by populate at Wed, 26 Nov 2003 08:47:27 +0100,
;; to version 1.10(w), by jahier:
(source/thickness.ml (lurette/g/51_thickness. 1.1 644))
(source/thickness.ml (lurette/g/51_thickness. 1.2 644))
)
(Merge-Parents)
(New-Merge-Parents)
......@@ -10,21 +10,25 @@
(** Bdd Drawer. *)
(** Machinery to perform a draw in a bdd (hence the third d ...) *)
(** Machinery to perform a draw in a bdd. *)
type sol_nb = float
val draw_in_bdd : Var.env_in -> Env_state.t -> Exp.var list -> Bdd.t ->
Bdd.t -> Var.subst list * Store.t' * Store.p
(** [draw_in_bdd inputs state vars bdd comb] returns a draw of the
Boolean variables as well as a range based and a polyhedron based
representation of numeric constraints.
representation of numeric constraints (cf the [Store] module).
*)
type sol_nb = float
(** We use floats to count solution numbers because it can be very
big. Moreover, for big numbers, we do not really care the extra
precision an abitrary-long-integer data-type would offer. *)
val sol_number : Bdd.t -> sol_nb * sol_nb
(** Returns the solution number in the then and else branches of the bdd *)
(** [sol_number bdd] returns the solution number in the then and else
branches of [bdd]. *)
(**/**)
......
(*-----------------------------------------------------------------------
** Copyright (C) - Verimag.
** Copyright (C) - Verimag.
** This file may only be copied under the terms of the GNU Library General
** Public License
**-----------------------------------------------------------------------
......@@ -8,12 +8,12 @@
** Author: jahier@imag.fr
*)
(** Defines the environment state data type.
(** The environment state.
Such state contains two parts :
- a static part, that is set after the lucky files parsing,
and which never changes after
- a dynamic part, which changes after each step.
Such a state is a structure that contains two parts :
- a static part ([static_state_fields]), which is set after the lucky files
parsing, and which never changes after
- a dynamic part ([dynamic_state_fields]), which changes after each step.
*)
......@@ -26,9 +26,9 @@ type node_info = {
source : source_info
}
(**
There are some redundancies, but it is on purpose. The goal is to
precompute here and once for all what will be needed at runtime.
(** There are some redundancies, but it is on purpose: the goal is to
pre-compute here and once for anything what will be needed at
runtime.
*)
type static_state_fields = {
bool_vars_to_gen : Exp.var list list ;
......@@ -55,10 +55,11 @@ type t = {
val read_env_state : Parse_luc.automata list -> t
(** Build the initial state from the list of parsed automata *)
(** Builds the initial state from the list of parsed automata *)
(**/**)
val is_node_transient : Parse_luc.node -> t -> bool
......
(*-----------------------------------------------------------------------
** Copyright (C) 2001 - 2003 - Verimag.
** Copyright (C) - Verimag.
** This file may only be copied under the terms of the GNU Library General
** Public License
**-----------------------------------------------------------------------
......@@ -64,7 +64,6 @@ and
type vut = (Var.name * (Var.user_type * var list))
(****************************************************************************)
......
(*-----------------------------------------------------------------------
** Copyright (C) 2001, 2002 - Verimag.
** Copyright (C) - Verimag.
** This file may only be copied under the terms of the GNU Library General
** Public License
**-----------------------------------------------------------------------
......@@ -8,11 +8,7 @@
** Author: jahier@imag.fr
*)
(** Defines the formula data type that labels lucky automata. *)
(* open Constraint *)
(****************************************************************************)
(** Lucky Boolean and numeric expressions. *)
type t =
......@@ -21,28 +17,6 @@ type t =
| Liste of simple list
(** struct and arrays are flattened in such a list *)
and simple =
Fo of formula
| Nu of num
and num =
| Sum of num * num
| Diff of num * num
| Prod of num * num
| Quot of num * num
| Mod of num * num (** modulo *)
| Div of num * num (** euclidian division *)
| Uminus of num
| Inf_int
| Ival of int
| Fval of float
| Ivar of var
| Fvar of var
| Ite of formula * num * num
and formula =