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

lurette 0.141 Thu, 26 Jun 2003 10:38:20 +0200 by jahier

Parent-Version:      0.140
Version-Log:

source/lurette.ml
source/luc_exe.ml
source/env_state.ml:
   Infer that environments share controllable vars instead of asking it to
users.

   Also allow any string to be a valid node name.

   Also fix a bug where, when several env were provided, the
Env_state.file_name
   was not returning the rigth file name. Actually it was not really a bug
since
   it could not be triggered before this change ... It just happen to work
   correctly by chance.

Project-Description: Lurette
parent 45dee352
;; This file is automatically generated, editing may cause PRCS to do
;; REALLY bad things.
(Created-By-Prcs-Version 1 3 3)
(source/show_env.mli 1091 1033738731 42_show_env.m 1.8)
(source/util.ml 23531 1056374363 35_util.ml 1.50)
(source/show_env.mli 1143 1056616700 42_show_env.m 1.9)
(source/util.ml 24271 1056616700 35_util.ml 1.51)
(cuddaux/cuddauxGenCof.c 12011 1034006019 c/29_cuddauxGen 1.1)
(test/cygwin-scade/lib_pilot.vsp 1433 1055926783 f/47_lib_pilot. 1.1)
(source/constraint.mli 1601 1045489850 c/18_constraint 1.5)
(test/ControleurPorte.lus 3219 1032940601 c/17_Controleur 1.1)
(mlcuddidl/Changes 64 1034006019 d/10_Changes 1.1)
(TODO 5249 1056374363 d/22_TODO 1.19)
(TODO 5063 1056616700 d/22_TODO 1.20)
(mlcuddidl/rdd.mli 7174 1034006019 c/40_rdd.mli 1.1)
(source/ne.mli 2138 1050421093 c/22_ne.mli 1.6)
(share/config.guess 39153 1055926783 f/25_config.gue 1.1)
......@@ -19,16 +19,17 @@
(mlcuddidl/idd.idl 10595 1034006019 d/1_idd.idl 1.1)
(share/pixmaps/open.xpm 782 1055926783 f/17_open.xpm 1.1)
(polka/C/internal.c 699 1047029868 e/8_internal.c 1.1)
(source/solver.ml 30978 1055487917 39_solver.ml 1.48)
(source/solver.ml 30979 1056616700 39_solver.ml 1.49)
(ihm/xlurette/makefile 1825 1056374363 c/16_makefile 1.16)
(polka/C/internal.h 958 1047029868 e/0_internal.h 1.1)
(source/command_line.ml 5079 1050578564 b/20_command_li 1.13)
(source/command_line.ml 4768 1056616700 b/20_command_li 1.14)
(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)
(test/ControleurPorte.c 9407 1012914629 b/19_Controleur 1.1)
(share/lucky_init.sh.in 731 1056374363 e/24_lucky_init 1.8)
(test/ControleurPorte.h 2306 1012914629 b/18_Controleur 1.1)
(test/test-scade-cygwin.res 0 1055926783 f/28_test-scade 1.1)
(source/gen_stubs_common.ml 6381 1055487917 e/39_gen_stubs_ 1.1)
(doc/synthese 2556 1007379917 b/2_synthese 1.1)
(test/cygwin-scade/Pilot_cst.saofd 788 1055926783 f/38_Pilot_cst. 1.1)
......@@ -40,7 +41,7 @@
(README 2803 1056374363 10_README 1.10)
(source/pnumsolver.ml 9273 1045489850 d/23_pnumsolver 1.2)
(source/gen_stubs_scade.ml 9106 1055926783 f/5_gen_stubs_ 1.1)
(source/polyhedron.ml 7661 1049961831 d/25_polyhedron 1.5)
(source/polyhedron.ml 7908 1056616700 d/25_polyhedron 1.6)
(cuddaux/cuddauxMisc.c 13842 1034006019 c/27_cuddauxMis 1.1)
(polka/C/poly.c 48492 1047029868 e/5_poly.c 1.1)
(source/luc_exe.mli 447 1033738731 b/31_ima_exe.ml 1.2)
......@@ -48,13 +49,13 @@
(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)
(polka/C/poly.h 4314 1047029868 d/49_poly.h 1.1)
(source/formula.mli 2967 1053337243 44_formula.ml 1.23)
(source/formula.mli 3005 1056616700 44_formula.ml 1.24)
(polka/C/cherni.h 2217 1047029868 e/1_cherni.h 1.1)
(share/pixmaps/chrono.xpm 703 1055926783 f/23_chrono.xpm 1.1)
(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 555 1046768487 d/28_losange-3d 1.2)
(test/time-moucherotte.res 4417 1056374363 e/38_time-mouch 1.4)
(test/time-moucherotte.res 4417 1056616700 e/38_time-mouch 1.5)
(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)
......@@ -73,7 +74,6 @@
(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)
(test/cygwin-scade/test-scade-cygwin.res 0 1055926783 f/28_test-scade 1.1)
(ihm/xlurette/xlurette_glade_main.ml 40723 1056374363 c/12_xlurette_g 1.24)
(TAGS 9825 1007379917 21_TAGS 1.6)
(polka/C/main.tex 1961 1047029868 e/14_main.tex 1.1)
......@@ -84,12 +84,12 @@
(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 10946 1053337243 e/36_gyro.rif.e 1.2)
(test/time-ecrins.exp 8229 1056374363 d/21_time-ecrin 1.22)
(test/time-ecrins.exp 8230 1056616700 d/21_time-ecrin 1.23)
(source/value.ml 2358 1049961831 c/23_value.ml 1.4)
(source/gne.ml 2774 1046682069 b/37_gne.ml 1.5)
(test/cygwin-scade/Pilot.vsp 2075 1055926783 f/40_Pilot.vsp 1.1)
(source/parse_c_scade.ml 5984 1055926783 e/41_parse_c_sc 1.2)
(source/formula.ml 6028 1053337243 45_formula.ml 1.29)
(source/formula.ml 6086 1056616700 45_formula.ml 1.30)
(test/cygwin-scade/position_validation.saofd 10188 1055926783 f/36_position_v 1.1)
(test/sparc-scade/exo1.saofdm 320 1055487917 e/50_exo1.saofd 1.1)
(share/pixmaps/plus.xpm 473 1055926783 f/15_plus.xpm 1.1)
......@@ -100,9 +100,9 @@
(source/control.ml 4445 1036675177 c/4_control.ml 1.4)
(test/cygwin-scade/.lurette_rc~ 505 1055926783 f/30_.lurette_r 1.1)
(test/cygwin-scade/Pilot.vsw 431 1055926783 f/39_Pilot.vsw 1.1)
(source/parse_env.mli 1196 1050421093 40_parse_env. 1.14)
(source/parse_env.mli 1211 1056616700 40_parse_env. 1.15)
(share/pixmaps/open_plus.xpm 787 1055926783 f/16_open_plus. 1.1)
(source/env_state.ml 23766 1055487917 51_env_state. 1.44)
(source/env_state.ml 25744 1056616700 51_env_state. 1.45)
(polka/caml/matrix.idl 5301 1047029868 d/34_matrix.idl 1.1)
(cuddaux/cuddauxAddIte.c 12812 1034006019 c/32_cuddauxAdd 1.1)
(source/gen_stubs_scade.mli 641 1055926783 f/6_gen_stubs_ 1.1)
......@@ -117,7 +117,7 @@
(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 1645 1051024737 c/25_user-rules 1.6)
(share/Makefile.test 2040 1056616700 c/25_user-rules 1.7)
(source/Makefile.lurette_lib 2392 1053337243 c/2_Makefile.l 1.20)
(polka/caml/polka_parser.mly 1729 1047029868 d/40_polka_pars 1.1)
(mlcuddidl/bdd.idl 18233 1034006019 d/7_bdd.idl 1.1)
......@@ -148,12 +148,12 @@
(source/gen_stubs_poc.ml 8873 1055926783 f/3_gen_stubs_ 1.1)
(mlcuddidl/session.ml 603 1034006019 c/37_session.ml 1.1)
(demo-xlurette/chaudiere/chaudiere_oracle.lus 107 1031732392 c/8_chaudiere_ 1.1)
(source/parse_env.ml 43028 1055487917 41_parse_env. 1.45)
(share/Makefile.lurette.in 4415 1055926783 b/38_Makefile.l 1.25)
(source/parse_env.ml 43560 1056616700 41_parse_env. 1.46)
(share/Makefile.lurette.in 4395 1056616700 b/38_Makefile.l 1.26)
(source/graph.mli 2185 1037625990 13_graph.mli 1.10)
(source/store.mli 2891 1046074449 b/26_rnumsolver 1.16)
(test/time-ossau.res 8230 1056374363 b/49_time.res 1.48)
(source/automata.ml 19517 1055487917 b/47_automata.m 1.9)
(test/time-ossau.res 8230 1056616700 b/49_time.res 1.49)
(source/automata.ml 19448 1056616700 b/47_automata.m 1.10)
(test/sparc-scade/libmath.saofdm 1378 1055487917 e/45_libmath.sa 1.1)
(Makefile 68 1051024737 d/13_Makefile 1.4)
(cuddaux/cuddauxBridge.c 6099 1034006019 c/31_cuddauxBri 1.1)
......@@ -163,7 +163,7 @@
(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 8230 1056374363 b/48_time.exp 1.45)
(test/time-ossau.exp 8230 1056616700 b/48_time.exp 1.46)
(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 5794 1053337243 47_print.ml 1.23)
......@@ -178,23 +178,23 @@
(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 44125 1056374363 c/1_lurettetop 1.37)
(source/lurettetop.ml 44119 1056616700 c/1_lurettetop 1.38)
(source/constraint.ml 2762 1050421093 c/19_constraint 1.7)
(test/cygwin-scade/counter.saofd 587 1055926783 g/2_counter.sa 1.1)
(polka/caml/Makefile.depend 0 1053337243 d/32_Makefile.d 1.2)
(doc/archi.fig 3693 1003928781 20_archi.fig 1.1)
(ihm/xlurette/xlurette_glade_interface.ml 64794 1055926783 c/15_xlurette_g 1.17)
(INSTALL 81 1055926783 f/26_INSTALL 1.1)
(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 368 1050421093 e/32_losange-3d 1.1)
(test/Makefile 26 1051024737 c/0_Makefile 1.12)
(user-rules 24733 1056374363 c/14_myrules 1.38)
(user-rules 24712 1056616700 c/14_myrules 1.39)
(mlcuddidl/cudd_caml.c 22890 1034006019 d/3_cudd_caml. 1.1)
(polka/C/config.h 77 1047029868 e/13_config.h 1.1)
(test/usager.luc 508 1046682069 b/14_usager.env 1.11)
(mlcuddidl/manager.idl 11024 1034006019 c/48_manager.id 1.1)
(mlcuddidl/cudd_caml.h 1210 1034006019 d/2_cudd_caml. 1.1)
(source/show_env.ml 3642 1037192189 43_show_env.m 1.16)
(source/show_env.ml 3691 1056616700 43_show_env.m 1.17)
(polka/C/essai.c 1001 1047029868 e/11_essai.c 1.1)
(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)
......@@ -208,19 +208,19 @@
(share/pixmaps/halt.xpm 511 1055926783 f/18_halt.xpm 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 7688 1056374363 d/11_configure. 1.10)
(share/configure.in 7463 1056616700 d/11_configure. 1.11)
(test/tram.luc 1092 1046682069 b/15_tram.env 1.10)
(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)
(polka/C/matrix.h 3461 1047029868 d/51_matrix.h 1.1)
(cuddaux/cuddaux.h 2381 1034006019 c/33_cuddaux.h 1.1)
(source/pnumsolver.mli 2322 1045489850 d/24_pnumsolver 1.2)
(share/lucky.el 1912 1056374363 f/7_lucky.el 1.2)
(share/lucky.el 1909 1056616700 f/7_lucky.el 1.3)
(mlcuddidl/sedscript 203 1034006019 c/38_sedscript 1.1)
(test/cygwin-scade/.lurette_rc 483 1055926783 f/29_.lurette_r 1.1)
(source/env_state.mli 7269 1053337243 50_env_state. 1.30)
(test/ControleurPorte.rif.exp 4676 1053337243 b/29_Controleur 1.15)
(source/show_luc.ml 3449 1052229068 e/25_show_luc.m 1.3)
(source/env_state.mli 6742 1056616700 50_env_state. 1.31)
(test/ControleurPorte.rif.exp 4676 1056616700 b/29_Controleur 1.16)
(source/show_luc.ml 3244 1056616700 e/25_show_luc.m 1.4)
(share/pixmaps/quit.xpm 494 1055926783 f/14_quit.xpm 1.1)
(polka/caml/polka_lexer.mli 200 1047029868 d/41_polka_lexe 1.1)
(polka/caml/polka.mli 716 1047029868 d/38_polka.mli 1.1)
......@@ -242,16 +242,16 @@
(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 4417 1056374363 e/37_time-mouch 1.4)
(source/command_line_luc_exe.ml 3558 1055487917 b/33_command_li 1.15)
(test/time-moucherotte.exp 4417 1056616700 e/37_time-mouch 1.5)
(source/command_line_luc_exe.ml 3431 1056616700 b/33_command_li 1.16)
(source/lurette_exe.c 220 1050421093 e/27_lurette_ex 1.2)
(source/env.ml 7849 1050421093 16_env.ml 1.30)
(share/pixmaps/close.xpm 803 1055926783 f/21_close.xpm 1.1)
(test/time-ecrins.res 8229 1056374363 d/20_time-ecrin 1.22)
(test/time-ecrins.res 8230 1056616700 d/20_time-ecrin 1.23)
(source/value.mli 1100 1049961831 c/24_value.mli 1.2)
(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 7026 1056374363 c/20_Makefile 1.20)
(source/Makefile 8395 1056616700 c/20_Makefile 1.21)
(source/graph.ml 2339 1037625990 14_graph.ml 1.8)
(test/cudd_gc_problem.luc 227680 1050421093 e/29_cudd_gc_pr 1.1)
(demo-xlurette/chaudiere/chaudiere_ctrl.lus 177 1031732392 c/9_chaudiere_ 1.1)
......@@ -259,10 +259,10 @@
(polka/documentation/Makefile 476 1047029868 e/18_Makefile 1.1)
(source/sim2chro.ml 3029 1054647149 b/24_sim2chro.m 1.18)
(cuddaux/cuddauxTDGenCof.c 15712 1034006019 c/26_cuddauxTDG 1.1)
(source/luc_exe.ml 14073 1053337243 b/32_ima_exe.ml 1.32)
(source/luc_exe.ml 13603 1056616700 b/32_ima_exe.ml 1.33)
(source/gne.mli 1557 1046682069 b/36_gne.mli 1.5)
(test/cygwin-scade/Direction_D1.saofd 1298 1055926783 f/50_Direction_ 1.1)
(source/lurette.ml 18378 1054647149 12_lurette.ml 1.70)
(source/lurette.ml 17215 1056616700 12_lurette.ml 1.71)
(polka/C/Makefile.depend 1081 1047029868 d/46_Makefile.d 1.1)
(test/sparc-scade/liblinear.saofdm 1301 1055487917 e/46_liblinear. 1.1)
(share/pixmaps/step.xpm 864 1055926783 f/11_step.xpm 1.1)
......@@ -273,6 +273,7 @@
(polka/Makefile 1636 1047029868 e/21_Makefile 1.1)
(test/porte.luc 996 1049961831 b/16_porte.env 1.10)
(source/gen_stubs_common.mli 1772 1055487917 e/40_gen_stubs_ 1.1)
(test/cygwin-scade/scade.rif.exp 1404 1056616700 g/7_scade.rif. 1.1)
(share/gnuplot-rif 1138 1054647149 e/34_gnuplot-ri 1.2)
(test/cygwin-scade/Pilot_type.saofd 962 1055926783 f/37_Pilot_type 1.1)
(mlcuddidl/Makefile 7387 1053337243 d/9_Makefile 1.7)
......
#!/bin/sh
#
CURRENT_DIR=$PWD
CURRENT_DIR=`pwd`
cd share
rm -f config.cache
./configure --prefix $CURRENT_DIR
......
......@@ -67,10 +67,15 @@ Les transitions :
(2) Faire une doc utilisateur pour lurette (moins urgent depuis qu'il y
a lurettetop et xlurette...)
* rajouter une option qui dit si les formules doivent etre tronquees
dans show_luc
* mettre qques part que j'utilise ocaml, camlidl cuddaux, mlcuddidl,
polka, gmp,autoconf, make, gcc, emacs, latex, dot, gtk, sim2chro, ...
* La notion d'epaisseur est mal branlée, surtout en presence de var
numériques. Il faudrait un 3eme parametre sui dit le nombre
de tirage que l'on fait dans chaque polyedres.
-> remplacer l'epaisseur de formules par un taux de couverture
* Utiliser l'ordre des parametres plutot que leur noms
Quoique, quand on fait le produit de plusieurs automates,
......@@ -82,16 +87,6 @@ Les transitions :
* le losange ne passe pas avec polkai et passe avec polkag.
Regarder pourquoi et dire à Bertrand
* Inferer la croix, plutot que de verifier !!!
* La notion d'epaisseur est mal branlée, surtout en presence de var
numériques. Il faudrait un 3eme parametre sui dit le nombre
de tirage que l'on fait dans chaque polyedres.
-> remplacer l'epaisseur de formules par un taux de couverture
* rajouter une option qui dit si les formules doivent etre tronquees
dans show_luc
* Faire un gestionnaire de sessions comme le propose Pascal
......@@ -100,7 +95,7 @@ Les transitions :
peut-etre chercher a remettre en cause les choix qui ont été faits
lors des egalités (ie, le choix de la variable à substituer). Ce calcul
coute peut-etre un peu cher (car, comment faire autrement qu'essayer
toutes les possibilités), mais au moins, ca donnerais une solution
toutes les possibilités), mais au moins, ca donnerait une solution
dans des cas ou les polyedres peteraient...
......@@ -109,7 +104,7 @@ Les transitions :
* giro :
-> Il faudrait rajouter la possibilité de faire, par ex, des
tirages selon une loi normale pour les variables a générer.
-> En faire un plus realiste
-> En faire un envt plus realiste
* Rajouter les pragmas suivants :
......
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette")
(Project-Version lurette 0 140)
(Parent-Version lurette 0 139)
(Project-Version lurette 0 141)
(Parent-Version lurette 0 140)
(Version-Log "
source/lurette.ml
source/luc_exe.ml
source/env_state.ml:
Infer that environments share controllable vars instead of asking it to users.
Also allow any string to be a valid node name.
ihm/xlurette/xlurette_main.ml:
Change the current dir when the sut changes so that the current dir is the
dir of the sut.
source/lurettetop.ml:
Add a change_dir command.
Make user_dir and tmp_lurette global vars.
share/configure.in:
create .bat and sh scripts take set env vars and run tools
(xlurette and lurettetop) so that sourcing lucky_init.cs is
no longer necessary.
Also fix a bug where, when several env were provided, the Env_state.file_name
was not returning the rigth file name. Actually it was not really a bug since
it could not be triggered before this change ... It just happen to work
correctly by chance.
")
(New-Version-Log ""
)
(Checkin-Time "Mon, 23 Jun 2003 15:19:23 +0200")
(Checkin-Time "Thu, 26 Jun 2003 10:38:20 +0200")
(Checkin-Login jahier)
(Populate-Ignore ())
(Project-Keywords)
......@@ -36,16 +30,16 @@ share/configure.in:
;; 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.32 644))
(source/luc_exe.ml (lurette/b/32_ima_exe.ml 1.33 644))
(source/command_line_luc_exe.ml (lurette/b/33_command_li 1.15 644))
(source/command_line_luc_exe.ml (lurette/b/33_command_li 1.16 644))
(source/command_line_luc_exe.mli (lurette/b/34_command_li 1.10 644))
;; Sources files for lurette only
(source/lurette.mli (lurette/11_lurette.ml 1.13 644))
(source/lurette.ml (lurette/12_lurette.ml 1.70 644))
(source/lurette.ml (lurette/12_lurette.ml 1.71 644))
(source/command_line.ml (lurette/b/20_command_li 1.13 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))
;; Sources files common to lurette and luc_exe
......@@ -55,12 +49,12 @@ share/configure.in:
(source/env.mli (lurette/15_env.mli 1.17 644))
(source/env.ml (lurette/16_env.ml 1.30 644))
(source/util.ml (lurette/35_util.ml 1.50 644))
(source/util.ml (lurette/35_util.ml 1.51 644))
(source/solver.mli (lurette/38_solver.mli 1.14 644))
(source/solver.ml (lurette/39_solver.ml 1.48 644))
(source/solver.ml (lurette/39_solver.ml 1.49 644))
(source/polyhedron.ml (lurette/d/25_polyhedron 1.5 644))
(source/polyhedron.ml (lurette/d/25_polyhedron 1.6 644))
(source/polyhedron.mli (lurette/d/26_polyhedron 1.1 644))
(source/store.mli (lurette/b/26_rnumsolver 1.16 644))
......@@ -69,14 +63,14 @@ share/configure.in:
(source/pnumsolver.ml (lurette/d/23_pnumsolver 1.2 644))
(source/pnumsolver.mli (lurette/d/24_pnumsolver 1.2 644))
(source/parse_env.mli (lurette/40_parse_env. 1.14 644))
(source/parse_env.ml (lurette/41_parse_env. 1.45 644))
(source/parse_env.mli (lurette/40_parse_env. 1.15 644))
(source/parse_env.ml (lurette/41_parse_env. 1.46 644))
(source/show_env.mli (lurette/42_show_env.m 1.8 644))
(source/show_env.ml (lurette/43_show_env.m 1.16 644))
(source/show_env.mli (lurette/42_show_env.m 1.9 644))
(source/show_env.ml (lurette/43_show_env.m 1.17 644))
(source/formula.mli (lurette/44_formula.ml 1.23 644))
(source/formula.ml (lurette/45_formula.ml 1.29 644))
(source/formula.mli (lurette/44_formula.ml 1.24 644))
(source/formula.ml (lurette/45_formula.ml 1.30 644))
(source/print.mli (lurette/46_print.mli 1.13 644))
(source/print.ml (lurette/47_print.ml 1.23 644))
......@@ -84,11 +78,11 @@ share/configure.in:
(source/eval.mli (lurette/48_eval.mli 1.11 644))
(source/eval.ml (lurette/49_eval.ml 1.14 644))
(source/env_state.mli (lurette/50_env_state. 1.30 644))
(source/env_state.ml (lurette/51_env_state. 1.44 644))
(source/env_state.mli (lurette/50_env_state. 1.31 644))
(source/env_state.ml (lurette/51_env_state. 1.45 644))
(source/automata.mli (lurette/b/46_automata.m 1.3 644))
(source/automata.ml (lurette/b/47_automata.m 1.9 644))
(source/automata.ml (lurette/b/47_automata.m 1.10 644))
(source/sim2chro.mli (lurette/b/23_sim2chro.m 1.7 644))
(source/sim2chro.ml (lurette/b/24_sim2chro.m 1.18 644))
......@@ -96,7 +90,7 @@ share/configure.in:
(source/gne.mli (lurette/b/36_gne.mli 1.5 644))
(source/gne.ml (lurette/b/37_gne.ml 1.5 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.37 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.38 644))
(source/draw.mli (lurette/f/1_draw.mli 1.1 644))
(source/draw.ml (lurette/f/2_draw.ml 1.1 644))
......@@ -130,7 +124,7 @@ share/configure.in:
(source/parse_poc.mli (lurette/d/29_parse_poc. 1.2 644))
(source/gen_fake_lutin.ml (lurette/d/16_gen_fake_l 1.5 644))
(source/show_luc.ml (lurette/e/25_show_luc.m 1.3 644))
(source/show_luc.ml (lurette/e/25_show_luc.m 1.4 644))
(source/ocaml2c.idl (lurette/e/26_ocaml2c.id 1.2 644))
(source/lurette_exe.c (lurette/e/27_lurette_ex 1.2 644))
(source/call_lurette_main.c (lurette/e/28_call_luret 1.1 644))
......@@ -138,7 +132,7 @@ share/configure.in:
;; Make files
(share/lucky.el (lurette/f/7_lucky.el 1.2 644))
(share/lucky.el (lurette/f/7_lucky.el 1.3 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/stock_exec.xpm (lurette/f/10_stock_exec 1.1 644))
......@@ -157,13 +151,13 @@ share/configure.in:
(share/pixmaps/chrono.xpm (lurette/f/23_chrono.xpm 1.1 644))
(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.10 644))
(share/configure.in (lurette/d/11_configure. 1.11 644))
(share/Makefile.common.in (lurette/d/12_Makefile.c 1.5 644))
(Makefile.common.source (lurette/e/33_Makefile.c 1.5 644))
(OcamlMakefile (lurette/17_OcamlMakef 1.51 644))
(share/Makefile.lurette.in (lurette/b/38_Makefile.l 1.25 644))
(user-rules (lurette/c/14_myrules 1.38 644))
(share/Makefile.test (lurette/c/25_user-rules 1.6 644))
(share/Makefile.lurette.in (lurette/b/38_Makefile.l 1.26 644))
(user-rules (lurette/c/14_myrules 1.39 644))
(share/Makefile.test (lurette/c/25_user-rules 1.7 644))
(Makefile (lurette/d/13_Makefile 1.4 644))
(source/Makefile.lurettetop (lurette/d/14_Makefile.l 1.3 644))
......@@ -172,7 +166,7 @@ share/configure.in:
(source/Makefile.lucky (lurette/b/41_Makefile.i 1.21 644))
(source/Makefile.gen_stubs (lurette/b/42_Makefile.g 1.7 644))
(source/Makefile.lurette_lib (lurette/c/2_Makefile.l 1.20 644))
(source/Makefile (lurette/c/20_Makefile 1.20 644))
(source/Makefile (lurette/c/20_Makefile 1.21 644))
;; Documentation
(doc/Interface_draft (lurette/19_Interface_ 1.1 644))
......@@ -185,21 +179,21 @@ share/configure.in:
;; Misc
(README (lurette/10_README 1.10 644))
(ID_EN_VRAC (lurette/0_ID_EN_VRAC 1.1 644))
(INSTALL (lurette/f/26_INSTALL 1.1 744))
(INSTALL (lurette/f/26_INSTALL 1.2 744))
(TAGS (lurette/21_TAGS 1.6 644))
(TODO (lurette/d/22_TODO 1.19 644))
(TODO (lurette/d/22_TODO 1.20 644))
(share/lucky_init.csh.in (lurette/e/23_lucky_init 1.6 644))
(share/lucky_init.sh.in (lurette/e/24_lucky_init 1.8 644))
(share/gnuplot-rif (lurette/e/34_gnuplot-ri 1.2 744))
(share/plot (lurette/e/35_plot 1.3 744))
(test/time-ossau.exp (lurette/b/48_time.exp 1.45 644))
(test/time-ossau.res (lurette/b/49_time.res 1.48 644))
(test/time-ecrins.res (lurette/d/20_time-ecrin 1.22 644))
(test/time-ecrins.exp (lurette/d/21_time-ecrin 1.22 644))
(test/time-moucherotte.exp (lurette/e/37_time-mouch 1.4 644))
(test/time-moucherotte.res (lurette/e/38_time-mouch 1.4 644))
(test/time-ossau.exp (lurette/b/48_time.exp 1.46 644))
(test/time-ossau.res (lurette/b/49_time.res 1.49 644))
(test/time-ecrins.res (lurette/d/20_time-ecrin 1.23 644))
(test/time-ecrins.exp (lurette/d/21_time-ecrin 1.23 644))
(test/time-moucherotte.exp (lurette/e/37_time-mouch 1.5 644))
(test/time-moucherotte.res (lurette/e/38_time-mouch 1.5 644))
;; Various files used for testing purposes
(test/cudd_gc_problem.luc (lurette/e/29_cudd_gc_pr 1.1 644))
......@@ -227,7 +221,7 @@ share/configure.in:
(test/heater_int.rif.exp (lurette/b/28_heater_int 1.13 644))
(test/ControleurPorte.rif.exp (lurette/b/29_Controleur 1.15 644))
(test/ControleurPorte.rif.exp (lurette/b/29_Controleur 1.16 644))
(test/heater_float.rif.exp (lurette/b/30_heater_flo 1.15 644))
(test/heater_int.lus (lurette/b/43_heater_int 1.1 644))
(test/heater_float.lus (lurette/b/44_heater_flo 1.2 644))
......@@ -246,7 +240,7 @@ share/configure.in:
(test/sparc-scade/Direction_D1.saofd (lurette/e/51_Direction_ 1.1 644))
(test/sparc-scade/scade.rif.exp (lurette/f/0_scade.rif. 1.1 644))
(test/cygwin-scade/test-scade-cygwin.res (lurette/f/28_test-scade 1.1 644))
(test/test-scade-cygwin.res (lurette/f/28_test-scade 1.1 644))
(test/cygwin-scade/.lurette_rc (lurette/f/29_.lurette_r 1.1 644))
(test/cygwin-scade/.lurette_rc~ (lurette/f/30_.lurette_r 1.1 644))
(test/cygwin-scade/det_mvt_mode_env.luc (lurette/f/31_det_mvt_mo 1.1 644))
......@@ -387,6 +381,11 @@ share/configure.in:
;; Files added by populate at Tue, 17 Jun 2003 15:16:25 +0200,
;; to version 0.138(w), by jahier:
;; Files added by populate at Wed, 25 Jun 2003 18:18:57 +0200,
;; to version 0.140(w), by jahier:
(test/cygwin-scade/scade.rif.exp (lurette/g/7_scade.rif. 1.1 644))
)
(Merge-Parents)
(New-Merge-Parents)
......@@ -65,7 +65,7 @@ CFLAGS_0= #-Xc -DSIM
MEMORIES=$(SCADE_INSTALL_DIR)/lib/memories.c
LIB_GC=$(SCADE_INSTALL_DIR)@LIB_GC@
LIB_GC=@LIB_GC@
LIB_OS= -lm
......
......@@ -5,36 +5,45 @@
test1:
rm -f ControleurPorte.rif0; \
$(LURETTE_PATH)/$(HOST_TYPE)/bin/lurettetop --sut ControleurPorte.lus -msn ControleurPorte -l 100 -tf 10 -td 10 \
--do-not-show-step -o ControleurPorte.rif0 --seed 1013219512 -ns2c -go \
../$(HOST_TYPE)/bin/lurettetop.sh --sut ControleurPorte.lus -msn ControleurPorte -l 100 -tf 10 -td 10 \
--do-not-show-step -o ControleurPorte.rif0 \
--seed 1013219512 -ns2c -go \
tram.luc usager.luc porte.luc passerelle.luc ;\
grep -v "lurette chronogram" ControleurPorte.rif0 > ControleurPorte.rif ;\
grep -v "lurette chronogram" ControleurPorte.rif0 | sed -e "s/^M//" > ControleurPorte.rif ;\
rm -f test1.res; diff -u ControleurPorte.rif.exp ControleurPorte.rif > test1.res
test2:
rm -f heater_int.rif0; \
$(LURETTE_PATH)/$(HOST_TYPE)/bin/lurettetop -l 30 -tf 10 -td 10 --sut heater_int -msn heater_int --seed 1013219512 \
--do-not-show-step -ns2c -go -o heater_int.rif0 -go temp_int ;\
grep -v "lurette chronogram" heater_int.rif0 > heater_int.rif ;\
../$(HOST_TYPE)/bin/lurettetop.sh -l 30 -tf 10 -td 10 --sut heater_int -msn heater_int --seed 1013219512 \
--do-not-show-step -ns2c -go -o heater_int.rif0 \
-go temp_int ;\
grep -v "lurette chronogram" heater_int.rif0 | sed -e "s/^M//" > heater_int.rif ;\
rm -f test2.res; diff -u heater_int.rif.exp heater_int.rif > test2.res
test3:
rm -f heater_float.rif0; \
$(LURETTE_PATH)/$(HOST_TYPE)/bin/lurettetop --precision 4 -go -l 30 -tf 10 -td 10 -msn heater_float --sut heater_float --seed 1013219512 \
--do-not-show-step -ns2c -o heater_float.rif0 temp_float;\
grep -v "lurette chronogram" heater_float.rif0 > heater_float.rif ;\
../$(HOST_TYPE)/bin/lurettetop.sh --precision 4 -go -l 30 -tf 10 -td 10 -msn heater_float --sut heater_float --seed 1013219512 \
--do-not-show-step -ns2c -o heater_float.rif0 \
temp_float;\
grep -v "lurette chronogram" heater_float.rif0 | sed -e "s/^M//"> heater_float.rif ;\
rm -f test3.res; diff -u heater_float.rif.exp heater_float.rif > test3.res
test4 :
$(LURETTE_PATH)/$(HOST_TYPE)/bin/lucky -seed 1014504087 -l 100 cudd_gc_problem.luc > cudd_gc_problem.rif
../$(HOST_TYPE)/bin/lucky.sh -seed 1014504087 -l 100 cudd_gc_problem.luc | sed -e "s/^M//" > cudd_gc_problem.rif
rm -f test4.res; diff -u cudd_gc_problem.rif.exp cudd_gc_problem.rif > test4.res
test5 :
$(LURETTE_PATH)/$(HOST_TYPE)/bin/lucky -seed 834966010 -l 100 losange-3d2.luc > losange-3d.rif
../$(HOST_TYPE)/bin/lucky.sh -seed 834966010 -l 100 losange-3d2.luc | sed -e "s/^M//" > losange-3d.rif
rm -f test5.res; diff -u losange-3d.rif.exp losange-3d.rif > test5.res
test6 :
rm -f gyro.rif0; \
../$(HOST_TYPE)/bin/lurettetop.sh --precision 4 -go -l 50 -tf 1 -td 1 -msn onlyroll --sut onlyroll --seed 1013219512 \
--do-not-show-step -ns2c -o gyro.rif0 giro;\
grep -v "lurette chronogram" gyro.rif0 | sed -e "s/^M//" > gyro.rif ;\
rm -f test6.res; diff -u gyro.rif.exp gyro.rif > test6.res
test: test1 test2 test3 test4 test5
ls -l *.res
test: test1 test2 test3 test4 test5 test6
ls -l *.res
......@@ -302,12 +302,6 @@ case "$HOST_TYPE" in
;;
esac
echo " "
echo " if you want to install tools anywhere else than lurette-XXX/$HOST_TYPE/{bin,lib}"
echo " you can type "
echo " cd share "
echo " ./configure --prefix <where to install bins and libs>"
echo
echo " bye!"
......@@ -20,7 +20,7 @@
(setq lucky-font-lock-keywords
'(
("\\(*.*$" . font-lock-comment-face)
;;("*$" . font-lock-comment-face)
("\\<\\(weight\\|max\\|min\\|default\\|cond\\|max\\|With\\)\\>" . font-lock-string-face)
("\\<\\(IfThenElse\\|IfThenElseNum\\|Dec\\|Return_not_sig\\|Return_sig\\|Draw_between\\|Draw_gauss\\|Set\\|Set_between\\|+\\|*\\|-\\|/\\|mod\\)\\>"
......
......@@ -105,6 +105,35 @@ liblurette_lib_dc.a:
ar r liblurette_lib_dc.a *.o ; rm *.o ;\
cp liblurette_lib_dc.a ..
liblurette_lib_pbc.a:
cd lurette_util ;rm * ;\
ar rcs liblurette_lib_pbc.a ../lurette_lib.o$(EXE) ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libcudd_caml.a ;\
ar r liblurette_lib_pbc.a *.o ; rm *.o ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libcuddaux.a ;\
ar r liblurette_lib_pbc.a ../lurette_lib.o *.o ; rm *.o ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libcudd.a ;\
ar r liblurette_lib_pbc.a *.o ; rm *.o ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libpolkag_caml.a ;\
ar r liblurette_lib_pbc.a *.o ; rm *.o ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libpolkag.a ;\
ar r liblurette_lib_pbc.a *.o ; rm *.o ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libcamlidl.a ;\
ar r liblurette_lib_pbc.a *.o ; rm *.o ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libmtr.a ;\
ar r liblurette_lib_pbc.a *.o ; rm *.o ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libst.a ;\
ar r liblurette_lib_pbc.a *.o ; rm *.o ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libepd.a ;\
ar r liblurette_lib_pbc.a *.o ; rm *.o ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libutil.a ;\
ar r liblurette_lib_pbc.a *.o ; rm *.o ;\
ar x $(HOME)/$(HOST_TYPE)/lib/ocaml/libstr.a ;\
ar r liblurette_lib_pbc.a *.o ; rm *.o ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libcamlrun.a ;\
ar r liblurette_lib_pbc.a *.o ; rm *.o ;\
cp liblurette_lib_pbc.a ..
libnc:
make clean -f Makefile.lurette_lib
make nc -f Makefile.lurette_lib OCAMLFLAGS="-noassert -unsafe"
......@@ -125,6 +154,13 @@ libdc:
make liblurette_lib_dc.a
libpbc:
rm -f lurette_lib.o
make pbc -f Makefile.lurette_lib OCAMLFLAGS=""
rm -f liblurette_lib_pbc.a
make liblurette_lib_pbc.a
lib_gprof:liblurette_lib_gprof.a
......
......@@ -14,19 +14,19 @@ open List