1. 18 Aug, 2010 1 commit
    • Erwan Jahier's avatar
      Enhance ocaml support in lurette (cf 74f93d6c) · 533fac24
      Erwan Jahier authored
      The oracle is not necessary anymore to run a test.
      
      Moreover, the sut no more needs to (and must not) be named 'sut.ml'
      (resp.  'oracle.ml' for the oracle).
      
      Moreover, rename the env var EXTRA_CFILES into EXTRA_SOURCE_FILES, so that users
      use it for ocaml programs.
      533fac24
  2. 13 Jul, 2010 1 commit
    • Erwan Jahier's avatar
      Add ocaml support in lurette. · 74f93d6c
      Erwan Jahier authored
      For the time being, it crashes if no valid oracle.ml exists in the
      user directory. Moreover, and the sut has to be named 'sut.ml' (resp.
      oracle.ml for the oracle). But otherwise, it works fine.
      74f93d6c
  3. 06 Jul, 2010 1 commit
  4. 02 Jul, 2010 1 commit
  5. 29 Jun, 2010 1 commit
  6. 25 Jun, 2010 1 commit
  7. 02 Jun, 2010 1 commit
    • Erwan Jahier's avatar
      Code re-organisation to abstract Lucky concrete concepts from the · bd9c508e
      Erwan Jahier authored
      rest of the modules. More precisely, the lucky tools now rely only on
      Prog (see below), that is Lucky-agnostic.
      
      The rationale is to ease the plug of a Lutin programs interpreter
      afterwards. Indeed, one (ougth to) just need to implement its own
      version of the Prog module.
      
      To do that, I've splitted LusProg into :
         LucParse
         LucProg
         Prog
      
      Then, I moved the content of Env_state into LucProg. And all this
      had some consequences, that cause more code movement.
      bd9c508e
  8. 28 May, 2010 1 commit
    • Erwan Jahier's avatar
      Beautifying a little bit the code from places to places. · bd904a00
      Erwan Jahier authored
      Actually, my first idea was to change Run_aut so that the fact that
      several programs were run in parallel was hidden. But it turned out
      to be a bad idea, because of numeric unsatisfiability + the
      interaction between the module that choses a formula, and the one
      that draw (performing the numeric satisfiability solving). Indeed,
      when a formula appear to be unsatisfiable for numeric reason, we need
      to backtrack in via Run_aut.choose_on_formula in one of the
      Run_aut.t ; but of course if the list of Run_aut.t is hidden, we are
      dead. One solution would have been to complicate a little bit the
      Run_aut.t interface ; but my first motivation was actually to
      simplify it...
      bd904a00
  9. 26 May, 2010 1 commit
  10. 21 May, 2010 1 commit
  11. 19 May, 2010 1 commit
  12. 08 Apr, 2010 1 commit
  13. 25 Mar, 2010 1 commit
  14. 19 Mar, 2010 1 commit
    • Erwan Jahier's avatar
      Je viens d'effectuer la migration prcs2git (prcs est mort, vive git). · 5013c382
      Erwan Jahier authored
      Or j'étais en train de bidouiller plusieurs trucs sans avoir rien
      commité...
      
      Bon, plouf, plouf. Je synchronise et je repars sur des bases saines avec git.
      
      source/luc4c_stubs.c:
              je sauve et je restaure les fegetexcept flags pour tourner autour d'un bug dans
              caml qui se manisfestait quand j'appelais du lucky depuis Alices.
              C'est vraisemblement la source de mes déboires avec Scade/VCS.EXE il fut un temps.
      5013c382
  15. 17 Mar, 2010 26 commits
    • Erwan Jahier's avatar
      lurette 1.45 Mon, 22 Sep 2008 18:20:01 +0200 by jahier · 89aedffe
      Erwan Jahier authored
      Parent-Version:      1.44
      Version-Log:
      
      Fix an embarassing bug in the integer solver (in dimension 1).
      
      Project-Description: Lurette
      89aedffe
    • Erwan Jahier's avatar
      lurette 1.44 Tue, 04 Dec 2007 10:47:42 +0100 by jahier · b6379be0
      Erwan Jahier authored
      Parent-Version:      unstable.5
      Version-Log:
      
      source/util.ml
        add an entete function in order to decorate generated files.
      
      source/solver.ml
        Add more debug info in case of failure.
      
      source/parse_luc.ml
        better error message
      
      source/env_state.ml
        Fix a bug in the handling of the (undocumented) ~default option.
      
      source/lurettetop.ml
        better error message
      
      install/configure.in
        Add stuff for configuring mac os
        use install instead of cp.
      
      install/Makefile.lurette.in
      user-rules
        some improvements(?)
      
      source/Makefile.lucky
      source/Makefile.gen_stubs
      source/Makefile.lurette_lib
      source/Makefile
      polka/Makefile.config
      polka/Makefile
      source/gen_fake_lucky.ml
      source/Makefile.gen_fake_lucky
      install/xlurette.sh.in
      install/xlurette.bat.in
      install/set_env_var.in
      install/lurettetop.sh.in
      install/gen_stubs.sh.in
      source/exp.ml
      source/luc4ocaml.mli
      source/luckyDraw.mli
      source/Makefile.luc4ocaml
      source/Makefile.luckyDraw
      examples/lucky/external_88code/foo.c
      examples/lucky/external_code/call_external_c_code.luc
      examples/lucky/external_code/Makefile
      VERSION
      install/set_env_var.bat.in
      examples/Makefile
      examples/ocaml/crazy-rabbit/rabbit-dir-obstacle.luc
      examples/ocaml/crazy-rabbit/Makefile
      examples/ocaml/crazy-rabbit/rabbit.ml
      examples/rml/Makefile
      examples/lucky/other/Makefile
      examples/luckyDraw/c/luckyDrawC_stubs.c.m4
      examples/luckyDraw/c/essai.c
      examples/luckyDraw/c/Makefile
      examples/luckyDraw/ocaml/Makefile
      examples/xlurette/heater/Makefile
      examples/xlurette/Gyro/Makefile
      utils/lucky_cpp
      utils/luckytolatex
      source/Makefile.release
      source/version.ml
      source/Makefile.luc2c
      examples/xlurette/fault-tolerant-heater/Makefile
      examples/xlurette/tram/Makefile
      examples/xlurette/Sildex/Makefile
      xlurette/makefile
      xlurette/xlurette_glade_main.ml
      lnsw
      source/luc4c_stubs.h
      source/luc4c_stubs.c
      source/luc4c.ml
      examples/lucky/C/Makefile
      source/Makefile.luc4c
      examples/lucky/lustre/Makefile
        Figthing with library stuff.
        Add headers (time-stamps)
        + other minor changes
      
      examples/luckyDraw/c/luckyDrawC_stubs.h
        call the caml_startup() init procedure + various twix.
      
      source/luc2c.ml
        Add a --luciole option
      
      Project-Description: Lurette
      b6379be0
    • Erwan Jahier's avatar
      lurette unstable.1 Mon, 11 Dec 2006 17:53:10 +0100 by jahier · 25b18e44
      Erwan Jahier authored
      Parent-Version:      1.43
      Version-Log:         empty
      Project-Description: Lurette
      25b18e44
    • Erwan Jahier's avatar
      lurette 1.43 Fri, 08 Dec 2006 15:36:26 +0100 by jahier · 0841ce15
      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
      0841ce15
    • Erwan Jahier's avatar
      lurette unstable_1_43.11 Thu, 07 Dec 2006 17:12:19 +0100 by jahier · 5e6fc3c0
      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
      5e6fc3c0
    • Erwan Jahier's avatar
      lurette unstable_1_43.10 Thu, 07 Dec 2006 08:47:28 +0100 by jahier · 33fa4b95
      Erwan Jahier authored
      Parent-Version:      unstable_1_43.9
      Version-Log:
      
      Project-Description: Lurette
      33fa4b95
    • Erwan Jahier's avatar
      lurette unstable_1_43.9 Wed, 25 Oct 2006 14:09:20 +0200 by jahier · 761e1121
      Erwan Jahier authored
      Parent-Version:      unstable_1_43.8
      Version-Log:         empty
      Project-Description: Lurette
      761e1121
    • Erwan Jahier's avatar
      lurette unstable_1_43.8 Tue, 06 Jun 2006 14:26:40 +0200 by jahier · 85c76c08
      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
      85c76c08
    • Erwan Jahier's avatar
      lurette unstable_1_43.5 Mon, 23 Jan 2006 18:07:26 +0100 by jahier · 00ed5517
      Erwan Jahier authored
      Parent-Version:      unstable_1_43.4
      Version-Log:         empty
      Project-Description: Lurette
      00ed5517
    • Erwan Jahier's avatar
      lurette unstable_1_43.4 Mon, 23 Jan 2006 17:59:17 +0100 by jahier · 42e5d9b5
      Erwan Jahier authored
      Parent-Version:      unstable_1_43.3
      Version-Log:
      
      Ditto.
      
      Project-Description: Lurette
      42e5d9b5
    • Erwan Jahier's avatar
      lurette unstable_1_43.3 Mon, 23 Jan 2006 17:39:36 +0100 by jahier · 37b80fbc
      Erwan Jahier authored
      Parent-Version:      unstable_1_43.2
      Version-Log:
      
      Ditto.
      
      Project-Description: Lurette
      37b80fbc
    • Erwan Jahier's avatar
      lurette 0.134 Tue, 22 Apr 2003 17:18:57 +0200 by jahier · 4bc90dac
      Erwan Jahier authored
      Parent-Version:      0.133
      Version-Log:
      
      Various changes related to the packaging of lurette.
      
      Project-Description: Lurette
      4bc90dac
    • Erwan Jahier's avatar
      lurette 0.133 Thu, 17 Apr 2003 13:22:44 +0200 by jahier · dbc00f74
      Erwan Jahier authored
      Parent-Version:      0.132
      Version-Log:
      
      source/gen_stubs.ml:
      source/ocaml2C.idl:
         use double instead of floats at the C level.
      
      Project-Description: Lurette
      dbc00f74
    • Erwan Jahier's avatar
      lurette 0.131 Thu, 10 Apr 2003 10:03:51 +0200 by jahier · c6d9a1c3
      Erwan Jahier authored
      Parent-Version:      0.130
      Version-Log:
      
      Remove the need of the ocaml compilers to be able to use lurette.
      The idea is to link the final executable withh the C compiler instead
      of using ocamlopt.
      
      source/lurette.ml:
      source/gen_stubs.ml:
        The stubs files that are generated are ow completely different.
        The process is much more simple BTW. Now, idl files are no more
        generated dynamically. The only files that are generated are C files
        that interfaces the sut and the oracle with lurette.
      
      /source/lurettetop.ml:
         Add the USER_TESTING_DIR env variable.
      
      Project-Description: Lurette
      c6d9a1c3
    • Erwan Jahier's avatar
      lurette 0.106 Fri, 25 Oct 2002 09:36:48 +0200 by jahier · 75100e28
      Erwan Jahier authored
      Parent-Version:      0.105
      Version-Log:
      
      source/lurettetop.ml:
         Add a --prefix <string> option that is added before the call
         to lurette (usefull, eg, for timing purpuses).
      
      source/lurettetop.ml:
      source/lurette.ml:
      source/command_line.ml:
      ihm/xlurette/*
        Add a ---show-step options that let one control whether or not
        the step number is printed.
      
      Project-Description: Lurette
      75100e28
    • Erwan Jahier's avatar
      lurette 0.58 Fri, 19 Apr 2002 11:15:07 +0200 by jahier · 03ffa20e
      Erwan Jahier authored
      Parent-Version:      0.57
      Version-Log:
      
      Clean up Makefiles for lurette and ima_exe.
      
      Make sure that gen_stubs does not recompile the fake oracle
      (always_true.lus) if it is not necessary.
      
      Project-Description: Lurette
      03ffa20e
    • Erwan Jahier's avatar
      lurette 0.57 Thu, 04 Apr 2002 16:06:30 +0200 by jahier · da601f66
      Erwan Jahier authored
      Parent-Version:      0.56
      Version-Log:
      
      Add a --output options to specify the output file name.
      
      Project-Description: Lurette
      da601f66
    • Erwan Jahier's avatar
      lurette 0.55 Wed, 03 Apr 2002 14:41:43 +0200 by jahier · f570cc25
      Erwan Jahier authored
      Parent-Version:      0.54
      Version-Log:
      
      Allow equalities between formula by translating [A = B] into
      [Or(And(A,B), And(Not(A), Not(B)))].
      
      Fix a bug where lurette had a bad behaviour whenever a toss
      was performed on a domain which size was bigger than max_int
      or max_float.
      
      Fix a bug where lurette was not handling env with both boolean and
      numerical as output vars.  Also add a few comments in solver.ml along
      the way.
      Adds a local bool as an output of heater in order to test the fix
      above.
      
      Project-Description: Lurette
      f570cc25
    • Erwan Jahier's avatar
      lurette 0.54 Tue, 02 Apr 2002 14:25:12 +0200 by jahier · f0aff2da
      Erwan Jahier authored
      Parent-Version:      0.53
      Version-Log:
      
      Cosmetic change:
      
      Encapsulates the various fields of Env_state.
      
      Project-Description: Lurette
      f0aff2da
    • Erwan Jahier's avatar
      lurette 0.52 Thu, 28 Mar 2002 18:10:42 +0100 by jahier · edc79032
      Erwan Jahier authored
      Parent-Version:      0.51
      Version-Log:
      
      Remove the necessity to provide an oracle when the user does
      not have any assertion to check. To do that, I parse the sut
      file and automatically generates a fake oracle that answers always
      true.
      
      Project-Description: Lurette
      edc79032
    • Erwan Jahier's avatar
      lurette 0.48 Fri, 22 Mar 2002 14:29:17 +0100 by jahier · 1c7769db
      Erwan Jahier authored
      Parent-Version:      0.47
      Version-Log:
      
      Add support for (boolean and numeric) if-then-else.
      
      Remove the eval.ml module as the replacement of pre and input
      vars is now done in Solver.formula_to_bdd.
      
      Add a new module gne.ml that provides a garded normal expressions
      data structure that is used to handle if-then-elses.
      
      Also introduce a new field to env_state called bdd_tbl_global which
      is used to cache the result of formula_to_bdd for bdds that do not
      depend on pre nor input vars. The field bdd_tbl which cache the other
      reults is now cleared at each step because it is useless to store results
      that depends on pre and inputs.
      
      Project-Description: Lurette
      1c7769db
    • Erwan Jahier's avatar
      lurette 0.40 Thu, 07 Mar 2002 16:26:47 +0100 by jahier · 9d1241f6
      Erwan Jahier authored
      Parent-Version:      0.39
      Version-Log:
      
      Change the naming convention of prevars. Now, _pretoto is noted
      _pre1toto, and _pre_pre_pretoto is noted _pre3toto.
      
      Also fix a bug in the default initialization of ranges : min_float
      is the smallest positive float, not the smallet one !!
      
      Project-Description: Lurette
      9d1241f6
    • Erwan Jahier's avatar
      lurette 0.39 Thu, 07 Mar 2002 13:36:27 +0100 by jahier · 4579cc26
      Erwan Jahier authored
      Parent-Version:      0.38
      Version-Log:
      
      Use the new cudd interface based on camlidl (mlcuddidl).
      
      Now, bdds do not leaks anymore.  Remove debugging stuff that was used
      to track that problem.
      
      Project-Description: Lurette
      4579cc26
    • Erwan Jahier's avatar
      lurette 0.36 Mon, 04 Mar 2002 13:50:13 +0100 by jahier · 8b44df60
      Erwan Jahier authored
      Parent-Version:      0.35
      Version-Log:
      
      Add support to handle numerical contraints. The numerical stuff is
      untested, but the boolean part works as before.
      
      source/rnumsolver.mli:
      source/rnumsolver.ml:
          New files implementing a numeric solver based on intervals.
      
      source/*.ml:
          Change the var_type type from a string to a sum type containing
          the lower and upper bounds of numeric domains.
      
          Do not maintain a var_name to index correspondance, but a formula to
          index one. This is to be able to handle numerical constraint in bdds.
          This field is not set at init time anymore, but in formula_to_bdd.
      
          Add <>, <, and <= to the type of formula.
      
      Project-Description: Lurette
      8b44df60
    • Erwan Jahier's avatar
      lurette 0.34 Tue, 19 Feb 2002 10:40:58 +0100 by jahier · dba4992a
      Erwan Jahier authored
      Parent-Version:      0.33
      Version-Log:
      
      Fix a bug when computing the power of two.
      
      Project-Description: Lurette
      dba4992a
    • Erwan Jahier's avatar
      lurette 0.33 Mon, 18 Feb 2002 17:52:34 +0100 by jahier · ee4eb63d
      Erwan Jahier authored
      Parent-Version:      0.32
      Version-Log:
      
      Avoid recomputing everytime the list of output vars by storing it
      in an env_state field.
      
      Project-Description: Lurette
      ee4eb63d