1. 15 Jul, 2003 1 commit
    • Alexandre Duret-Lutz's avatar
      Homogenize passing of automata as pointers, not references. · 66b1630c
      Alexandre Duret-Lutz authored
      Disallow copy for security.
      
      * src/tgba/tgbabddconcrete.hh (tgba_bdd_concrete): Disallow copy.
      * src/tgba/tgbaexplicit.hh (tgba_explicit): Likewise.
      * src/tgba/tgbaexplicit.cc (tgba_explicit::operator=,
      tgba_explicit::tgba_explicit(tgba_explicit)): Remove.
      * src/tgba/tgbabddconcreteproduct.cc
      (tgba_bdd_concrete_product_factory::tgba_bdd_concrete_product_factory,
      product): Take operand automata as pointers.
      * src/tgba/tgbabddconcreteproduct.hh (product): Likewise.
      * src/tgba/tgbaproduct.cc, src/tgba/tgbaproduct.hh:
      (tgba_product): Disallow copy.
      (tgba_product::tgba_product): Take operand automata as pointers.
      * src/tgbaalgos/dotty.cc (dotty_state, dotty_rec, dotty_reachable):
      Take tgba arguments as pointer.
      * src/tgbaalgos/dotty.hh (dotty_reachable): Likewise.
      * src/tgbaalgos/lbtt.cc (fill_todo, lbtt_reachable): Likewise.
      * src/tgbaalgos/lbtt.hh (lbtt_reachable): Likewise.
      * src/tgbaalgos/ltl2tgba.cc, src/tgbaalgos/ltl2tgba.hh (ltl_to_tgba):
      Likewise.
      * src/tgbaalgos/save.cc (save_rec, tgba_save_reachable): Likewise.
      * src/tgbaalgos/save.hh (save): Likewise.
      * src/tgbatest/explicit.cc, src/tgbatest/explprod.cc,
      src/tgbatest/ltl2tgba.cc, src/tgbatest/ltlprod.cc,
      src/tgbatest/mixprod.cc, src/tgbatest/readsave.cc,
      src/tgbatest/spotlbtt.cc, src/tgbatest/tgbaread.cc,
      src/tgbatest/tripprod.cc: Likewise.
      66b1630c
  2. 14 Jul, 2003 1 commit
    • Alexandre Duret-Lutz's avatar
      Before this change, all automata would construct their own · cab3be97
      Alexandre Duret-Lutz authored
      dictionaries (map of BDD variables to LTL formulae).  This was
      cumbersome, because to multiply two automata we had to build a
      common dictionary (the union of the two LTL formula spaces), and
      install wrappers to translate each automaton's BDD answers into
      the common dictionary.  This translation, that had to be repeated
      when several products were nested, was time consuming and was a
      hindrance for some optimizations.
      In the new scheme, all automata involved in a product must
      share the same dictionary.  An empty dictionary should be
      constructed by the user and passed to the automaton' constructors
      as necessary.
      This huge change removes most code than it adds.
      
      * src/Makefile.am (libspot_la_LIBADD): Add misc/libmisc.la.
      * src/misc/bddalloc.hh, src/misc/bddalloc.cc: New files.  These
      partly replace src/tgba/bddfactory.hh and src/tgba/bddfactory.cc.
      * src/misc/Makefile.am: Adjust to build bddalloc.hh and bddalloc.cc.
      * src/tgba/bddfactory.hh, src/tgba/bddfactory.cc,
      src/tgba/dictunion.hh, src/tgba/dictunion.cc,
      src/tgba/tgbabdddict.hh, src/tgba/tgbabdddict.cc,
      src/tgba/tgbabddtranslatefactory.hh,
      src/tgba/tgbabddtranslatefactory.cc,
      src/tgba/tgbatranslateproxy.hh, src/tgba/tgbatranslateproxy.cc:
      Delete.
      * src/tgba/bdddict.hh, src/tgba/bdddict.cc: New files.  These
      replaces tgbabdddict.hh and tgbabdddict.cc, and also part of
      bddfactory.hh and bddfactory.cc.
      * src/tgba/bddprint.cc, src/tgba/bddprint.hh: Adjust to
      use bdd_dict* instead of tgba_bdd_dict&.
      * src/tgba/succiterconcrete.cc (succ_iter_concrete::next()):
      Get next_to_now from the dictionary.
      * src/tgba/tgba.hh (tgba::get_dict): Return a bdd_dict*,
      not a const tgba_bdd_dict*.
      * src/tgba/tgbabddconcrete.cc, src/tgba/tgbabddconcrete.hh:
      Adjust to use the new dictionary, stored in data_.
      * src/tgba/tgbabddconcretefactory.cc,
      src/tgba/tgbabddconcretefactory.hh: Likewise.  Plus
      now_to_next_ is now also stored in the dictionary.
      * src/tgba/tgbabddconcreteproduct.cc: Likewise.  Now
      that both operand share the same product, there is not
      point in using tgba_bdd_translate_factory.
      * src/tgba/tgbabddcoredata.cc, src/tgba/tgbabddcoredata.hh:
      Store a bdd_dict (taken as constructor argument).
      (tgba_bdd_core_data::~tgba_bdd_core_data): Remove.
      (tgba_bdd_core_data::translate): Remove.
      (tgba_bdd_core_data::next_to_now): Remove (now in dict).
      (tgba_bdd_core_data::dict): New pointer.
      * src/tgba/tgbabddfactory.hh: (tgba_bdd_factory::get_dict): Remove.
      * src/tgba/tgbaexplicit.cc, src/tgba/tgbaexplicit.hh:
      Adjust to use the new dictionary.
      * src/tgba/tgbaproduct.cc, src/tgba/tgbaproduct.hh: Likewise.  Do
      not use tgba_bdd_dict_union and tgba_bdd_translate_proxy anymore.
      * src/tgbaalgos/lbtt.cc, src/tgbaalgos/save.cc: Adjust to
      use bdd_dict* instead of tgba_bdd_dict&.
      * src/tgbaalgos/ltl2tgba.cc, src/tgbaalgos/ltl2tgba.cc: Likewise.
      (ltl_to_tgba): Take a dict argument.
      * src/tgbaparse/public.hh (tgba_parse): Take a dict argument.
      * src/tgbaparse/tgbaparse.yy (tgba_parse): Take a dict argument.
      * src/tgbatest/explicit.cc, src/tgbatest/explprod.cc,
      src/tgbatest/ltlprod.cc, src/tgbatest/mixprod.cc,
      src/tgbatest/readsave.cc, src/tgbatest/spotlbtt.cc,
      src/tgbatest/tgbaread.cc, src/tgbatest/tripprod.cc: Instantiate
      a dictionary, and pass it to the automata' constructors.
      * src/tgbatest/ltl2tgba.cc: Likewise, and remove the -o (defrag)
      option.
      * iface/gspn/gspn.hh (tgba_gspn::tgba_gspn): Take a bdd_dict argument.
      (tgba_gspn::get_dict): Adjust return type.
      * iface/gspn/gspn.cc: Do not use bdd_factory, adjust to
      use the new dictionary instead.
      cab3be97
  3. 10 Jul, 2003 6 commits
  4. 09 Jul, 2003 5 commits
  5. 08 Jul, 2003 3 commits
  6. 07 Jul, 2003 4 commits
  7. 04 Jul, 2003 1 commit
  8. 03 Jul, 2003 2 commits
    • Alexandre Duret-Lutz's avatar
      * src/tgba/tgbaproduct.cc (tgba_product_succ_iterator::first): · 4432b238
      Alexandre Duret-Lutz authored
      Simplify, do not call next_non_false_() either side is done.
      4432b238
    • Alexandre Duret-Lutz's avatar
      * src/tgba/succiter.hh (tgba_succ_iterator::current_condition): · c09f646e
      Alexandre Duret-Lutz authored
      State that this is a boolean function.
      * src/tgba/succiterconcrete.hh
      (tgba_succ_iterator_concrete::trans_dest_,
      tgba_succ_iterator_concrete::trans_set_,
      tgba_succ_iterator_concrete::trans_set_left_,
      tgba_succ_iterator_concrete::neg_trans_set_): Remove.
      * src/tgba/succiterconcrete.cc
      (tgba_succ_iterator_concrete::tgba_succ_iterator_concrete,
      tgba_succ_iterator_concrete::first): Adjust to removed members.
      (tgba_succ_iterator_concrete::next): Simplify, transitions
      are no labelled by boolean functions, not only conjunctions.
      Suggested by Denis Poitrenaud.
      c09f646e
  9. 02 Jul, 2003 5 commits
    • Alexandre Duret-Lutz's avatar
      spacing · 3281b6e9
      Alexandre Duret-Lutz authored
      3281b6e9
    • Alexandre Duret-Lutz's avatar
      * src/tgba/tgbabddcoredata.hh (tgba_bdd_core_data::translate): New · 0fe98c6d
      Alexandre Duret-Lutz authored
      function.
      * src/tgba/tgbabddcoredata.cc (tgba_bdd_core_data::translate):
      Likewise.
      * src/tgba/tgbabddtranslatefactory.cc
      (tgba_bdd_translate_factory::tgba_bdd_translate_factory): Use
      tgba_bdd_core_data::translate.
      0fe98c6d
    • Alexandre Duret-Lutz's avatar
      * src/tgba/tgbabddcoredata.hh (tgba_bdd_core_data::nownext_set): · 2ea7cbe0
      Alexandre Duret-Lutz authored
      New attribute.
      * tgba/tgbabddcoredata.cc, tgba/tgbabddtranslatefactory.cc:
      Handle nownext_set.
      * src/tgba/succiterconcrete.cc
      (tgba_succ_iterator_concrete::next): Use nownext_set to simplify.
      2ea7cbe0
    • Alexandre Duret-Lutz's avatar
      typo · 2ed07475
      Alexandre Duret-Lutz authored
      2ed07475
    • Alexandre Duret-Lutz's avatar
      Rewrite tgba_succ_iterator_concrete::next for the fourth time · dfe74f31
      Alexandre Duret-Lutz authored
      (or is it the fifth?).
      
      * src/tgba/succiterconcrete.hh
      (tgba_succ_iterator_concrete::trans_dest_,
      tgba_succ_iterator_concrete::trans_set_,
      tgba_succ_iterator_concrete::trans_set_left_,
      tgba_succ_iterator_concrete::neg_trans_set_): New attributes.
      * src/tgba/succiterconcrete.cc
      (tgba_succ_iterator_concrete::tgba_succ_iterator_concrete): Initialize
      new members.
      (tgba_succ_iterator_concrete::first): Likewise.
      (tgba_succ_iterator_concrete::next): Rewrite.
      * tgba/tgbabddcoredata.hh (tgba_bdd_core_data::acc_set): New attribute.
      * tgba/tgbabddcoredata.cc, tgba/tgbabddtranslatefactory.cc:
      Handle acc_set.
      dfe74f31
  10. 01 Jul, 2003 1 commit
  11. 30 Jun, 2003 4 commits
    • Alexandre Duret-Lutz's avatar
    • Alexandre Duret-Lutz's avatar
      * doc/Doxyfile.in (HAVE_DOT): Set to YES to output · e5626208
      Alexandre Duret-Lutz authored
      collaboration diagrams.
      * doc/mainpage.dox: Typo.
      
      * src/tgba/state.hh (state::as_bdd): Delete.
      * src/tgba/tgbaproduct.hh (state_bdd_product): Inherit from state,
      not state_bdd.
      (state_bdd_product::state_bdd_product): Adjust.
      * src/tgba/tgbaproduct.cc (state_bdd_product::state_bdd_product):
      Adjust.
      
      * src/tgba/succiter.hh (tgba_bdd_succ_iterator::done):
      Mark as const.
      * src/tgba/succiterconcrete.cc
      (tgba_succ_iterator_concrete::done): Likewise.
      * src/tgba/succiterconcrete.hh
      (tgba_succ_iterator_concrete::done): Likewise.
      * src/tgba/tgbaexplicit.cc
      (tgba_explicit_succ_iterator::done): Likewise.
      * src/tgba/tgbaexplicit.hh
      (tgba_explicit_succ_iterator::done): Likewise.
      * src/tgba/tgbaproduct.cc
      (tgba_product_succ_iterator::done): Likewise.
      * src/tgba/tgbaproduct.hh
      (tgba_product_succ_iterator::done): Likewise.
      * src/tgba/tgbatranslateproxy.hh
      (tgba_translate_proxy_succ_iterator::done): Likewise.
      * src/tgba/tgbatranslateproxy.cc
      (tgba_translate_proxy_succ_iterator::done): Likewise.
      
      * src/tgba/succiterconcrete.cc
      (tgba_succ_iterator_concrete::next): Call bdd_satoneset
      on data_.varandnext_set.  The previous implementation
      was wrong for GFa.
      * src/tgba/tgbabddcoredata.hh: Declare varandnext_set.
      * src/tgba/tgbabddcoredata.cc: Handle varandnext_set.
      e5626208
    • Alexandre Duret-Lutz's avatar
      * src/tgba/tgbabddconcretefactory.cc: · 12f66a3b
      Alexandre Duret-Lutz authored
      (tgba_bdd_concrete_factory::tgba_bdd_concrete_factory): New.
      (tgba_bdd_concrete_factory::create_state): Update now_to_next_.
      (tgba_bdd_concrete_factory::finish): Constraint Next variables
      in the relation.
      * src/tgba/tgbabddconcretefactory.hh
      (tgba_bdd_concrete_factory::now_to_next_): New variable.
      12f66a3b
    • Alexandre Duret-Lutz's avatar
      * src/tgba/tgbabddconcretefactory.cc: · cf136e84
      Alexandre Duret-Lutz authored
      (tgba_bdd_concrete_factory::tgba_bdd_concrete_factory): New.
      (tgba_bdd_concrete_factory::create_state): Update now_to_next_.
      (tgba_bdd_concrete_factory::finish): Constraint Next variables
      in the relation.
      * src/tgba/tgbabddconcretefactory.hh
      (tgba_bdd_concrete_factory::now_to_next_): New variable.
      cf136e84
  12. 28 Jun, 2003 1 commit
    • Alexandre Duret-Lutz's avatar
      Fix errors reported by ICC. · 692f78d6
      Alexandre Duret-Lutz authored
      * src/tgba/state.hh (state_ptr_less_than::operator()): Make it const.
      * src/tgba/tgbaproduct.cc: Include string.hh.
      * src/ltlast/multop.hh (multop::add, multop::add_sorted): Do
      not use qualified names in declarations.
      * m4/gccwarn.m4 (CF_GXX_WARNINGS): Fix GXX test.
      * src/ltlenv/defaultenv.hh, src/ltlenv/defaultenv.cc,
      src/ltlenv/environment.hh: Add virtual destructors.
      692f78d6
  13. 26 Jun, 2003 6 commits
    • Alexandre Duret-Lutz's avatar
      d852f2c8
    • Alexandre Duret-Lutz's avatar
      * src/tgba/ltl2tgba.hh, src/tgba/ltl2tgba.cc: Move ... · 7fdd7861
      Alexandre Duret-Lutz authored
      * src/tgbaalgos/ltl2tgba.hh, src/tgbaalgos/ltl2tgba.cc: ... here.
      * src/tgba/Makefile.am, src/tgbaalgos/Makefile.am: Adjust.
      * src/tgba/public.hh: Do not include ltl2tgba.hh.
      * src/tgbatests/explprod.cc, src/tgbatests/ltl2tgba.cc,
      src/tgbatests/ltlprod.cc, src/tgbatests/mixprod.cc,
      src/tgbatests/reach.cc, src/tgbatests/tripprod.cc: Adjust inclusions.
      7fdd7861
    • Alexandre Duret-Lutz's avatar
      * src/tgba/tgbabddcoredata.hh: Fix some Doxygen comments. · f4629246
      Alexandre Duret-Lutz authored
      * src/ltlast/formula.hh: More Doxygen comments.
      * src/tgba/tgba.hh: Use <tt> in Doxygen comments.
      f4629246
    • Alexandre Duret-Lutz's avatar
      * src/tgba/succiter.hh: Adjust comments about promises to · 8e3a24ad
      Alexandre Duret-Lutz authored
      refer to accepting conditions.
      * src/tgba/tgbabddconcretefactory.hh: Likewise.
      * src/tgba/tgbabddcoredata.hh: Likewise.
      * src/tgba/dictunion.cc: Likewise.
      * src/tgba/tgba.hh: Likewise.
      8e3a24ad
    • Alexandre Duret-Lutz's avatar
      * doc/Makefile.am (doc): Typo. · 483507f1
      Alexandre Duret-Lutz authored
      * src/ltlvisit/tostring.hh (to_string): Add doxygen comments.
      * src/ltlast/multop.hh (multop::paircmp): Add doxygen comments.
      * src/ltlvisit/postfix.hh: Typo.
      483507f1
    • Alexandre Duret-Lutz's avatar
      * src/ltlast/Makefile.am (ltlastdir, ltlast_HEADERS): New variables. · 05f72410
      Alexandre Duret-Lutz authored
      (libltlast_la_SOURCES): Move all headers to ltlast_HEADERS.
      * src/ltlenv/Makefile.am (ltlenvdir, ltlenv_HEADERS): New variables.
      (libltlenv_la_SOURCES): Move all headers to ltlenv_HEADERS.
      * src/ltlparse/Makefile.am (ltlparsedir, ltlparse_HEADERS): New
      variables.
      (libltlparse_la_SOURCES): Move all public headers to ltlparse_HEADERS.
      * src/ltlvisit/Makefile.am (ltlvisitdir, ltlvisit_HEADERS): New
      variables.
      (libltlvisit_la_SOURCES): Move all headers to ltlparse_HEADERS.
      * src/misc/Makefile.am (include_HEADERS): Rename as ..
      (misc_HEADERS): ... this.
      (miscdir): New variable.
      * src/tgba/Makefile.am (tgbadir, tgba_HEADERS): New variables.
      (libtgba_la_SOURCES): Move all headers to tgba_HEADERS.
      * src/tgbaalgos/Makefile.am (tgbaalgosdir, tgbaalgos_HEADERS):
      New variables.
      (libtgbaalgos_la_SOURCES): Move all headers to tgbaalgos_HEADERS.
      * src/tgbaparse/Makefile.am (tgbaparsedir, tgbaparse_HEADERS): New
      variables.
      (libtgbaparse_la_SOURCES): Move all public headers to
      tgbaparse_HEADERS.
      * src/tgbaparse/public.hh: Include ltlparse/location.hh, not
      location.hh.
      05f72410