1. 25 Jul, 2003 1 commit
  2. 17 Jul, 2003 1 commit
    • Alexandre Duret-Lutz's avatar
      Now succ_iter() can fetch extra information from · 1d9c3d64
      Alexandre Duret-Lutz authored
      the root of a product to reduce its number of successors.
      * src/tgba/Makefile.am (libtgba_la_SOURCES): Add tgba.cc.
      * src/tgba/tgba.hh (tgba::succ_iter): Add the global_state and
      global_automaton arguments.
      (tgba::support_conditions, tgba::support_variables,
      tgba::compute_support_conditions, tgba::compute_support_variables):
      New functions.
      (tgba::last_support_conditions_input_,
      tgba::last_support_conditions_output_,
      tgba::last_support_variables_input_,
      tgba::last_support_variables_output_): New attributes.
      * src/tgba/tgbabddconcrete.cc (tgba_bdd_concrete::succ_iter):
      Handle the two new arguments.
      (tgba_bdd_concrete::compute_support_conditions,
      tgba_bdd_concrete::compute_support_variables): Implement them.
      * src/tgba/tgbabddconcrete.hh: Adjust.
      * src/tgba/tgbaexplicit.cc (tgba_explicit::succ_iter):	Ignore
      the two new arguments.
      (tgba_explicit::compute_support_conditions,
      tgba_explicit::compute_support_variables): Implement them.
      * src/tgba/tgbaexplicit.hh: Adjust.
      * src/tgba/tgbaproduct.cc (tgba_product::succ_iter): Handle the
      two new arguments.
      (tgba_product::compute_support_conditions,
      tgba_product::compute_support_variables): Implement them.
      * src/tgba/tgbaproduct.hh: Adjust.
      * iface/gspn/gspn.cc (tgba_gspn_private_::last_state_cond_input,
      tgba_gspn_private_::last_state_cond_output,
      (tgba_gspn_private_::tgba_gspn_private_): Set last_state_cond_input.
      (tgba_gspn_private_::~tgba_gspn_private_): Delete
      last_state_cond_input.
      (tgba_gspn_private_::state_conds): New function, eved out
      from tgba_gspn::succ_iter.
      (tgba_gspn::succ_iter): Use it.  Use the two new arguments.
      (tgba_gspn::compute_support_conditions,
      tgba_gspn::compute_support_variables): New functions.
      * iface/gspn/gspn.hh: Adjust.
      1d9c3d64
  3. 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
  4. 26 Jun, 2003 4 commits
    • 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
      * 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
    • Alexandre Duret-Lutz's avatar
      Distribute BuDDy. Compile and link with the included version if · 510756cd
      Alexandre Duret-Lutz authored
      explicitely requested (--with-included-buddy) or if there is
      now stuitable version already installed.
      
      * buddy/: New directory.  Contains a patched version of BuDDy 2.2.
      * m4/buddy.m4: Make sure the installed BuDDy supports bdd_mergepairs.
      Honor --with-included-buddy and --without-included-buddy.  Define
      the BUDDY_LDFLAGS and BUDDY_CPPFLAGS output variables, and the
      WITH_INCLUDED_BUDDY Automake conditional
      * Makefile.am [WITH_INCLUDED_BUDDY] (MAYBE_SUBDIRS): New variable.
      (SUBDIRS): Prepend $(MAYBE_SUBDIRS).
      * src/Makefile.am (libspot_LDFLAGS): New variable.
      * src/tgba/Makefile.am (AM_CPPFLAGS): Add $(BUDDY_CPPFLAGS).
      * src/tgbaalgos/Makefile.am (AM_CPPFLAGS): Likewise.
      * src/tgbatest/Makefile.am (AM_CPPFLAGS): Likewise.
      510756cd
  5. 16 Jun, 2003 1 commit
    • Alexandre Duret-Lutz's avatar
      * src/tgba/tgbabddprod.cc, src/tgba/tgbabddprod.hh: Rename as ... · 4db70160
      Alexandre Duret-Lutz authored
      * src/tgba/tgbaproduct.cc, src/tgba/tgbaproduct.hh: ... these.
      (tgba_bdd_product, tgba_bdd_product_succ_iterator): Rename as ...
      (tgba_product, tgba_product_succ_iterator): ... these, and adjust
      all uses.
      * src/tgba/tgbabddtranslateproxy.cc,
      src/tgba/tgbabddtranslateproxy.hh: Rename as ...
      * src/tgba/tgbatranslateproxy.cc,
      src/tgba/tgbatranslateproxy.hh: ... these.
      (tgba_bdd_translate_proxy, tgba_bdd_translate_proxy_succ_iterator):
      Rename as ...
      (tgba_translate_proxy, tgba_translate_proxy_succ_iterator): ... these,
      and adjust all uses.
      4db70160
  6. 05 Jun, 2003 1 commit
    • Alexandre Duret-Lutz's avatar
      * configure.ac: Output src/tgbatest/Makefile and src/tgbatest/defs. · 80dd0ae1
      Alexandre Duret-Lutz authored
      * src/Makefile.am (SUBDIRS): Add tgbatest.
      * src/tgba/tgbaexplicit.hh, src/tgba/tgbaexplicit.cc: New file.
      * src/tgba/Makefile.am (libtgba_la_SOURCES): Add tgbaexplicit.cc
      and tgbaexplicit.hh.
      * src/tgbatest/Makefile.am, src/tgbatest/defs.in,
      src/tgbatest/explicit.cc, src/tgbatest/explicit.test: New files.
      80dd0ae1
  7. 02 Jun, 2003 1 commit
  8. 28 May, 2003 1 commit
  9. 26 May, 2003 3 commits
    • Alexandre Duret-Lutz's avatar
      * src/tgba/bddprint.hh, src/tgba/bddprint.cc: New files. · 16c62199
      Alexandre Duret-Lutz authored
      * src/tgba/Makefile.am (libtgba_la_SOURCES): Add them.
      * src/tgba/public.hh: Include bddprint.hh.
      16c62199
    • Alexandre Duret-Lutz's avatar
      * src/tgba/tgba.hh: Rename as ... · 88514330
      Alexandre Duret-Lutz authored
      * src/tgba/public.hh: .. this.
      * src/tgba/tgba.hh: New file.
      * src/tgba/Makefile.am (libtgba_la_SOURCES): Add public.hh.
      * src/tgba/tgbabddconcrete.hh (tgba_bdd_concrete): Inherit from tgba.
      (tgba_bdd_concrete::init_iter): Delete.
      (tgba_bdd_concrete::succ_iter): Take a state_bdd as argument,
      not a bdd.
      * src/tgba/tgbabddconcrete.cc: Likewise.
      88514330
    • Alexandre Duret-Lutz's avatar
      Initial code for TGBA (Transition Generalized Bchi Automata). · c0393414
      Alexandre Duret-Lutz authored
      Contains tgba_bdd, a BDD-encoded TGBA, and ltl_to_tgba,
      a LTL-to-TGBA translator using Couvreur's algorithm.
      
      * src/Makefile.am (SUBDIRS): Add tgba.
      (libspot_la_LIBADD): Add tgba/libtgba.la.
      * src/tgba/Makefile.am, src/tgba/bddfactory.cc,
      src/tgba/bddfactory.hh, src/tgba/dictunion.cc,
      src/tgba/dictunion.hh, src/tgba/ltl2tgba.cc, src/tgba/ltl2tgba.hh,
      src/tgba/state.hh, src/tgba/statebdd.cc, src/tgba/statebdd.hh,
      src/tgba/succiter.hh, src/tgba/succiterconcrete.cc,
      src/tgba/succiterconcrete.hh, src/tgba/succlist.hh,
      src/tgba/tgba.hh, src/tgba/tgbabddconcrete.cc,
      src/tgba/tgbabddconcrete.hh, src/tgba/tgbabddconcretefactory.cc,
      src/tgba/tgbabddconcretefactory.hh,
      src/tgba/tgbabddconcreteproduct.cc,
      src/tgba/tgbabddconcreteproduct.hh, src/tgba/tgbabddcoredata.cc,
      src/tgba/tgbabddcoredata.hh, src/tgba/tgbabdddict.cc,
      src/tgba/tgbabdddict.hh, src/tgba/tgbabddfactory.hh,
      src/tgba/tgbabddtranslatefactory.cc,
      src/tgba/tgbabddtranslatefactory.hh: New files.
      c0393414