- 17 Mar, 2010 40 commits
-
-
Erwan Jahier authored
Parent-Version: unstable.4 Version-Log: empty Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: unstable.3 Version-Log: empty Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: unstable.2 Version-Log: empty Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: unstable.1 Version-Log: empty Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: 1.43 Version-Log: empty Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: 1.42 Parent-Version: 1.42 Parent-Version: unstable_1_43.6 Parent-Version: unstable_1_43.10 Parent-Version: unstable_1_43.11 Version-Log: Some progress in the scade tcl gui connection. Add code to be able to parse type definitions that are coming from the Scade tcl Gui. Thanks to that, we do not need to parse generated C header files anymore. Not yet finished. Add a lot of files that were not prcs-ed. source/util.ml source/parse_luc.ml source/lustreExp.ml «from_char_pos_to_line_and_col» that is useg to guess the line and col number from the char number, was returning bad line numbers because cpp adds lines preceeded by «#». Therefore, we add boolean flag to this function so that it does not count such lines if the flag is set to true. source/lurettetop.ml: Sim2chro and gnuplot were called with a bad arg in some cases (i do not remember which ones. Probably on win32. source/parse_c_scade.ml: Enhance the debug messages wrt line numbers. source/lurette_exe.c Add ifdef-ed debug dump (in a log file). install/configure.in: Makefile.common.source: Makefile source/Makefile.show_luc source/Makefile.lucky source/Makefile Minor changes. polka/caml/polka_lexer.mll: Allow ident starting by «_». polka/Makefile.config install/set_env_var.in install/lurettetop.bat.in Minor changes. xlurette/Scade/LuretteGUILauncher.tcl xlurette/Scade/GenMake_l4sim.tcl The lurette dir in the Scade hierarchie is now «lurette/bin» instead of «lurette/win32/bin» (ditto for «lib», and «include»). Some fix after my visit to Esterel (thanks to Aubanel). source/Makefile.luc4ocaml Add mli files. xlurette/Scade/Makefile Add a few rules to copy various files at various places. source/liblutin_c.c This a change from Pascal : « The interval algorithm was completely false ». examples/Makefile Typo. examples/ocaml/crazy-rabbit/rabbit.out examples/lucky/other/test4.rif examples/lucky/other/test4.res examples/xlurette/heater/test3.rif0 A few non-reg tests broke because of the changes to lutin_lib.c. examples/luckyDraw/ocaml/Makefile examples/xlurette/Gyro/Makefile source/Makefile.release Some changes. Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: unstable_1_43.10 Version-Log: j'ai rajouté une une option --lustre a luc2c qui permet d'appeler du lucky depuis lustre. Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: unstable_1_43.9 Version-Log: Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: unstable_1_43.8 Version-Log: empty Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: unstable_1_43.7 Version-Log: Implement a luc4c API so that lucky programs can be called from C. This is meant to be used be luc2c. nb : not yet working. There is a seg fault when launched from the scade tck gui. Strangely, it seems to work when run from the command-line simulation executable. Add code to be able to parse type definitions that are coming from the Scade tcl Gui. Thanks to that, we do not need to parse generated C header files anymore. This change comes from a manual merge with the main branch. source/parse_luc.ml Enhance the parser error msgs. source/gen_stubs_common.ml Implement a typdef parser for type definition that are coming from the Scade tcl Gui (this change comes from a manual merge with the main branch). polka/caml/polka_lexer.mll Allow ident starting by _. source/gen_fake_lucky.ml: add a log file for gen_fake_lucky, which is useful for debugging, but also for users. source/type.mli: source/type.ml When generating, C code, translate ocaml float into C double instead of C float. source/gnuplot-rif.ml Allow true, false, True, and False as RIF data. source/liblutin_c.c: This a change from Pascal : The interval algorithm was completely false . source/graphUtil.ml source/graphUtil.mli Add a top_sort function that performs a topological sort in a graph with no cycle. source/luc2c.ml More work on that. source/luc_exe.ml source/lurette.ml source/lucky.ml source/util.ml source/parse_c_scade.ml install/configure.in OcamlMakefile Makefile source/Makefile source/luc4ocaml.ml source/Makefile.release Some Trivial changes. NEW FILES: source/luc4c_stubs.h source/luc4c_stubs.c source/luc4c_caml.ml source/luc4c.mli source/luc4c.ml The luc4c API files. examples/lucky/C/test.rif.exp examples/lucky/C/test.res examples/lucky/C/foo.luc examples/lucky/C/call_foo.c A few non-reg tests broke because of the changes to lutin_lib.c. examples/lucky/C/Makefile Some changes. Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: unstable_1_43.6 Version-Log: source/util.ml source/parse_luc.ml source/lurettetop.ml fix gnuplot calling under win32. source/parse_c_scade.ml give better error msg during a parse error source/lustreExp.ml source/Makefile.luc2c source/luc2c.ml A little bit more work on that. Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: unstable_1_43.5 Version-Log: empty Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: unstable_1_43.4 Version-Log: empty Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: unstable_1_43.3 Version-Log: Ditto. Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: unstable_1_43.2 Version-Log: Ditto. Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: unstable_1_43.1 Version-Log: Ditto. Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: 1.42 Version-Log: Add all the missing files in the prcs repository. Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: 1.41 Version-Log: source/luc_exe.ml source/command_line_luc_exe.ml source/lurette.ml source/graph.ml source/lucky.mli source/lucky.ml source/util.ml source/formula_to_bdd.ml source/formula_to_bdd.mli source/fair_bddd.ml source/fair_bddd.mli source/bddd.ml source/bddd.mli source/solver.mli source/solver.ml source/polyhedron.ml source/polyhedron.mli source/store.mli source/store.ml source/parse_luc.mli source/parse_luc.ml source/show_env.ml source/env_state.mli source/env_state.ml source/run_aut.mli source/run_aut.ml source/lurettetop.ml source/draw.mli source/draw.ml source/gen_stubs.ml source/parse_c_scade.ml source/ne.ml source/prevar.ml source/prevar.mli source/show_luc.ml utils/lucky.el install/configure.in Makefile.common.source install/Makefile.lurette.in user-rules source/Makefile.lurettetop source/Makefile.gen_fake_lutin source/Makefile.show_luc source/Makefile.lucky source/Makefile.gen_stubs source/Makefile.lurette_lib source/Makefile RUN_ME TODO test/time-joly.exp test/time-joly.res test/time-ecrins.exp ihm/xlurette/xlurette_glade_main.ml ihm/xlurette/xlurette_glade_interface.ml ihm/xlurette/makefile polka/caml/Makefile polka/Makefile.config source/Makefile.gen_fake_lucky install/xlurette_sh.in install/xlurette.sh.in install/xlurette.bat.in install/set_env_var.in install/lurettetop_sh.in install/lurettetop.sh.in install/lurettetop.bat.in install/gen_stubs.sh.in source/poly_draw.ml source/poly_draw.mli source/lustreExp.ml source/lustreExp.mli source/exp.ml source/var.ml source/type.mli examples/xlurette/fault-tolerant-heater/degradable-sensors.luc examples/xlurette/fault-tolerant-heater/heater_control_env.luc examples/xlurette/fault-tolerant-heater/sensors.luc source/parser.mly doc/lurette-man/lurette-man.tex source/parse_sildex.ml test/time-asti.exp RELEASE-NOTES FAQ source/gnuplot-socket.ml source/luc4ocaml.ml source/luc4ocaml.mli source/Makefile.gnuplot-rif source/gnuplot-rif.ml source/luckyDraw.mli source/luckyDraw.ml source/luc4ocaml_nolbl.mli source/luc4ocaml_nolbl.ml source/lucky2lus.ml source/Makefile.luc4ocaml source/Makefile.lurette_ocaml_lib source/Makefile.lurette_debug source/Makefile.luckyDraw source/Makefile.lucky2lus xlurette/Scade/GenMake_l4sim.tcl examples/lucky/external_code/call_external_c_code.luc examples/lucky/external_code/Makefile VERSION install/configure install/set_env_var.bat.in Quite a lot of changes this time... far too much... Fix a at least 5 bugs, and re-organize directories, in particular the test dir. too much to say... * pre pre x was always equal to pre x (bugs introduced in 1.39 or something I think...). * ... One big improvment is that I have completely changed the way runtime automaton are handled, using continuations instead of maitaining an explicit data-structure. This let me reduce the run_aut module by 75 percent, resulting in much clearer code, and less buggy, and more efficient. ouaw! thanks to that, I support DAG now (was rejected before). The executable that do not need env var are no more called via a script that call set_env_var, so that they are fully stand-alone: show_luc, lucky, gen_fake_lucky. This is why util was splitted (util+util2) source/var.ml source/lucaml.ml -> luc4ocaml.ml source/lucaml.mli -> luc4ocaml.mli source/run_aut.ml: Fix a bug during the backtraking in the dynamic tree. source/env_state.ml source/formula_to_bdd.ml sort the list of free index, because the first order of variable is generally better. source/bddd.ml source/bddd.mli source/solver.mli source/solver.ml source/polyhedron.ml source/polyhedron.mli source/store.mli Add the verbosity level in a few functions. source/store.ml FIX A BUG in the bdd traversal. Some branches were never visited because I was raising a No_numeric_solution exception instead od returning an empty store when adding a constraint... This embarassing bug is there from the begining... Ouille! Also, when a valid integer cannot be found, return a wrong one, which is a bug really. But is it better than the current state were raising the no_num expt would cut some branches in the bdd. I will fix that problem later. source/parse_luc.ml source/lustreExp.ml source/lustreExp.mli The list of pre vars was computed with a ref, which is bad. Moreover, the same pre var was created with different indexes, which did not lead to incorrect behavior, but still... source/exp.ml test/bj.luc examples/lucky/external_code/call_external_c_code.luc examples/lucky/external_code/Makefile Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: 1.40 Version-Log: source/luc_exe.ml source/lurette.ml source/util.ml source/formula_to_bdd.ml source/bddd.ml source/solver.ml source/store.ml source/parse_luc.mli source/parse_luc.ml source/env_state.mli source/env_state.ml source/run_aut.ml source/gne.mli source/gne.ml source/lurettetop.ml source/gen_stubs_poc.ml source/ne.ml source/ne.mli share/lucky.el share/configure.in Makefile.common.source OcamlMakefile user-rules source/Makefile.show_luc source/Makefile.lucky source/Makefile.gen_stubs source/Makefile.lurette_lib source/Makefile test/time-joly.res test/temp_int.luc ihm/xlurette/xlurette.glade ihm/xlurette/makefile source/Makefile.gen_fake_lucky source/lustreExp.ml source/lustreExp.mli source/exp.ml source/exp.mli source/parser.mly doc/lucky-man/lucky-man.tex source/gnuplot-socket.ml source/gnuplot-rif.ml source/luckyDraw.mli source/luckyDraw.ml source/essai-maitre.ml source/essai-esclave.ml source/Makefile.ocaml source/Makefile.luckyDraw Add the possibility to call external code via dyn lib. The generation of default lucky files from Lurette was broken. Fix warning generated by gcc4. Fix a bug where variables with default values were generated twice (bug only visible in assert mode ; in the other mode, one of the value was taken, but I am not sure which one...) Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: 1.39 Version-Log: source/luc_exe.ml source/command_line_luc_exe.ml source/command_line_luc_exe.mli source/lurette.ml source/command_line.ml source/command_line.mli source/lucky.ml source/rif.ml source/env_state.mli source/env_state.ml source/run_aut.mli source/run_aut.ml source/lurettetop.ml ihm/xlurette/xlurette_glade_main.ml Add a reactive mode where the output of the previous cycle is returned when the Lucky environment is blocked (because no transition from the current node(s) is labelled by a satisfiable constraint. Remove the dependence on cygwin to run it under windows. In particular, to be able to do that, I now use socket instead of pipes in order to communicate between lurettetop and xlurette. Also, define proper, cp, rm, etc instead of doing them by sys calls. A lot of changes to make it work with the scade gui Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: 1.38 Version-Log: source/run_aut.mli source/run_aut.ml: Fix a bug when drawing transitions in the automata that made the distribution wrong wrt weights (oups)... source/lucky.ml source/run_aut.mli run_aut.ml: Fix a bug where the repartition wrt the automata transitions was wrong in case of backtracking. source/lurette.ml Fix a bug related to the thickness (when only all the vertices where required). demo-xlurette/fault-tolerant-heater/heater_control_env.luc share/show_luc.sh share/show_luc.bat source/gen_fake_lucky.ml source/lurettetop.ml source/util.ml ihm/xlurette/xlurette_glade_main.ml ihm/xlurette/xlurette.glade Add a button in xlurette that generates default environments. Add a buildenv command for lurettetop to do it. Project-Description: Lurette
-
Erwan Jahier authored
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
-
Erwan Jahier authored
Parent-Version: 1.36 Version-Log: source/lurettetop.ml source/gen_stubs.ml Call the automatically generated oracle <node_name>_always_true.lus instead of always_true. user-rules Put the tgz for the release in joly to save disk space ihm/xlurette/xlurette_glade_main.ml fix a bug where xlurettte was crashing down when the seed field (spin button) was empty. 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. Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: 1.35 Version-Log: * A better error msg is displayed when one try to write something like <<x : int ^ 3 ~default pre x ^ 3>>, which is currently not supported. * Fix a bug in gen_fake_lucky that was introduced in V1.33 (incorrect environment were generated). Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: 1.34 Version-Log: empty Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: 1.33 Version-Log: A first steps toward an interface to sildex is done. Its seems to work. It has to be tested more though. Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: 1.32 Version-Log: source/lurette.ml: source/command_line_luc_exe.mli: source/command_line_luc_exe.ml: source/command_line.ml: source/command_line.mli: Random seed was encoded by a seed of 0, which is unfortunate when the user set the seed to 0... source/util.ml: xlurette/xlurette.glade: Add a C_GENERATOR_FLAG to let users add options to lustre2c and ec2C. source/parse_luc.ml: Issue a Warning when a node is not declared before being used. Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: 1.31 Version-Log: source/fair_bddd.ml: Fix a bug where the distribution was not correct according to the solution number Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: 1.30 Version-Log: source/run_aut.ml: source/graph.ml: source/env_state.ml source/lucky.ml: source/env_state.ml: Graph.t in now a side effet-free DT. source/lurettetop.ml: xlurette/xlurette.glade: provide an error msg to xlurette when gnuplot is not installed. Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: 1.29 Version-Log: Begin to add an interfacing code for sildex. It seems tp parse sildex-C header files ok, but the C code generator is simply a copy of the poc version.... Begin to move from the use of reg expr to Stream base parser in order to parce header file to get var names and types. source/luc_exe.ml: source/lurettetop.ml: source/command_line_exe.ml: source/command_line_exe.mli: source/command_line_luc_exe.ml: source/command_line_luc_exe.mli: source/util.ml: source/parse_luc.ml: Call a pre-processor on Lucky files before doing anything else via the -pp option Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: 1.28 Version-Log: source/ocaml2c.idl: source/lurette.ml: source/gen_stubs_poc.ml: source/gen_stubs_scade.ml: Fix a bug where the step and the tries in the sut were completely wrong. source/store.ml Fix a bug where, if only the ~min or the ~max options were used, they were ignored ... source/parse_luc.ml: Make sure that ~min and ~max are fed with values, not complex expressions. pre-process lucky files with cpp. source/sim2chro.ml: put the locals after the outputs because it is the order into which their values appear. source/gen_stubs.ml: Do not change the oracle compiler if it is provided. Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: 1.27 Version-Log: Add #locs pragmas so that sim2chro is able to print local var in green. Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: 1.26 Version-Log: Add support for a stdin/stdout pipe based mode in lurette. Also make sure that the variable order is the same as in the source .luc file. source/rif.mli: source/rif.ml: New files: move from luc_exe.ml all the stuff that is related to rif input and output. source/sut.mli: source/sut.ml: source/oracle.mli: source/oracle.ml: New files -- code moved from lurette.ml + stuff for handling the pipe mode. source/luc_exe.ml: Add the possibility to launch an oracle from lucky using pipes. Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: 1.25 Version-Log: source/parse_luc.ml: Check that 2 vars are not defined twice. source/parse_luc.ml: source/lustreExp.ml: source/var.ml: Rename local vars to avoid clashed if 2 automata uses common local var names. Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: 1.24 Version-Log: source/lustreExp.ml: Change the vut type from a list to a Map indexed by strings. source/parse_luc.ml: Use Lexing.buffer instead of my home made lucky_buff one. It is simpler, cleaner (especially AFA the ~ stuff is concerned) and probably more efficient. Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: 1.23 Version-Log: source/lustreExp.ml: use a map indexed by the var name instead of a list of variables as the search in such a list is done very often during the type checking. Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: 1.22 Version-Log: source/*.ml*: perform a sed 's/[ ]*$//' on all files to remove trailing space. Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: 1.21 Version-Log: Add a couple of scade files in the distrib so that it is easier to test scade programs under linux using the generated c files. source/value.ml use T and F instead of t and f for booleans (more visible under xlurette). share/Makefile.lurette.in: Reorganize (clean-up) the file xlurette/xlurette_glade_main.ml: share/plot: Fix the gnuplot problems (+ <<set mouse>> in share/plot). source/util.ml: source/lurettetop.ml: Move the gnuplot stuff into lurettetop. Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: 1.20 Version-Log: source/lurette.ml: source/command_line.ml: source/command_line.mli: source/lurettetop.ml: Plug the step mode stuff into xlurette. Repair the step_by_step mode that was broken under xlurette (still do not know why though...). Project-Description: Lurette
-
Erwan Jahier authored
Parent-Version: 1.19 Version-Log: source/store.ml: Fix a bug found by Bertrand where it was necessary to apply substitutions each time a constraint is added Maybe it is sometimes overkill, but it is safe, and performance does not seem to suffer that much. source/parse_luc.ml: Do not open the .luc file twice, and keep the whole file in a string to call the lustre expression parser. This was an attempt to make the debbuger work again with big .luc file, but it fails... The Stream lib really seems to suck AFA ocamldebug is concerned. Also shout when a wrong flag is used. source/lurette.ml: when an assertion is violated, put the corresponding vector in the .rif file. Project-Description: Lurette
-