buddy: rename libbdd to libbddx

* buddy/src/bdd.h, buddy/src/bvec.h, buddy/src/fdd.h: Rename as...
* buddy/src/bddx.h, buddy/src/bvecx.h, buddy/src/fddx.h: ... these.
* buddy/src/Makefile.am: Build libbddx.la instead of libbdd.la.
* buddy/examples/Makefile.def: Use it.
* Makefile.am, buddy/src/bddtest.cxx, buddy/src/bvec.c,
buddy/src/cppext.cxx, buddy/src/fdd.c, buddy/src/imatrix.h,
buddy/src/kernel.h, buddy/examples/adder/adder.cxx,
buddy/examples/bddcalc/parser_.h, buddy/examples/bddtest/bddtest.cxx,
buddy/examples/cmilner/cmilner.c, buddy/examples/fdd/fdd.cxx,
buddy/examples/milner/milner.cxx, buddy/examples/money/money.cxx,
buddy/examples/queen/queen.cxx, buddy/examples/solitare/solitare.cxx,
m4/buddy.m4, src/ltlvisit/apcollect.hh, src/ltlvisit/simplify.hh,
src/misc/bddlt.hh, src/misc/bddop.hh, src/misc/minato.hh,
src/priv/acccompl.hh, src/priv/accconv.hh, src/priv/accmap.hh,
src/priv/bddalloc.cc, src/tgba/bdddict.hh, src/tgba/bddprint.hh,
src/tgba/tgbamask.hh, src/tgba/tgbasafracomplement.cc,
src/tgbaalgos/emptiness.hh, src/tgbaalgos/gtec/sccstack.hh,
src/tgbaalgos/neverclaim.cc, src/tgbaalgos/powerset.cc,
src/tgbaalgos/sccfilter.hh, src/tgbaalgos/sccinfo.hh,
src/tgbaalgos/weight.hh, wrap/python/buddy.i: Adjust.
* NEWS, README: Document it.
This commit is contained in:
Alexandre Duret-Lutz 2014-10-30 17:29:27 +01:00
parent f35be908c8
commit ad8d24222a
45 changed files with 253 additions and 291 deletions

View file

@ -1,5 +1,5 @@
## -*- coding: utf-8 -*-
## Copyright (C) 2011, 2012, 2013 Laboratoire de Recherche et Développement
## Copyright (C) 2011, 2012, 2013, 2014 Laboratoire de Recherche et Développement
## de l'Epita (LRDE).
## Copyright (C) 2003, 2005 Laboratoire d'Informatique de Paris 6 (LIP6),
## département Systèmes Répartis Coopératifs (SRC), Université Pierre
@ -20,9 +20,6 @@
## You should have received a copy of the GNU General Public License
## along with this program. If not, see <http://www.gnu.org/licenses/>.
if WITH_INCLUDED_BUDDY
MAYBE_BUDDY = buddy
endif WITH_INCLUDED_BUDDY
if NEVER
# For Automake a conditional directory
# is conditionally built, but unconditionally distributed.
@ -31,7 +28,7 @@ if NEVER
NEVER_BENCH = bench
endif
SUBDIRS = $(MAYBE_BUDDY) $(NEVER_BENCH) lib src wrap ltdl iface doc
SUBDIRS = buddy lib src wrap ltdl iface doc $(NEVER_BENCH)
UTF8 = utf8/doc/ReleaseNotes utf8/doc/utf8cpp.html utf8/utf8.h \
utf8/utf8/checked.h utf8/utf8/core.h utf8/utf8/unchecked.h

4
NEWS
View file

@ -2,6 +2,10 @@ New in spot 1.99a (not yet released)
* Major changes (including backward incompatible changes):
- The curstomized version of BuDDy (libbdd) used by Spot has be
renamed as (libbddx) to avoid issues with copies of BuDDy
already installed on the system.
- ltlgrind is a new tool that mutates LTL or PSL formulas. If you
have a tool that is bogus on some formula that is tool large to
debug, you can use ltlgrind to generate smaller derived formulas

32
README
View file

@ -28,18 +28,21 @@ Installation
Requirements
------------
Spot requires a complete installation of Python (version 2.0 or
later). Especially, Python's headers files should be installed. If
you don't have Python installed, you should run configure with
the --disable-python option (see below).
Spot requires a C++11-compliant compiler.
Spot expects a complete installation of Python (version 2.0 or later).
Especially, Python's headers files should be installed. If you don't
have Python installed, and do NOT want to install it, you should run
configure with the --disable-python option (see below).
Optional third-party dependencies
----------------------------------
Third-party dependencies
------------------------
Spot also uses a modified version of BuDDy (a binary decision diagram
library), that is already included in the buddy/ directory. So you
do not need to install it yourself.
If the SAT-solver glucose is found on your system, it will
be used by our test suite to test our SAT-based minimization
algorithm.
Spot used to distribute a modified version of LBTT (an LTL to Büchi
test bench), mostly fixing errors reported by recent compilers.
@ -61,15 +64,6 @@ should read the file INSTALL for generic instructions.
In addition to its usual options, ./configure will accept some
flags specific to Spot:
--with-included-buddy
After you have installed Spot the first time, a modified version
of BuDDy will be installed. The next time you reconfigure Spot,
configure will detect that this version is already installed, and
will attempt to use it directly (this is in case you had to modify
one of these yourself for another purpose). This option will
*force* the use, build, and installation of the included version
of BuDDy, even when a compatible version is already installed.
--disable-python
Turn off the compilation of Python bindings. These bindings are
currently used to run a couple of tests, and to build the CGI
@ -190,7 +184,7 @@ iface/ Interfaces to other libraries.
Third party software
--------------------
buddy/ A patched version of BuDDy 2.3 (a BDD library).
buddy/ A customized version of BuDDy 2.3 (a BDD library).
ltdl/ Libtool's portable dlopen() wrapper library.
lib/ Gnulib's portability modules.
utf8/ Nemanja Trifunovic's utf-8 routines.

View file

@ -1,2 +1,2 @@
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(srcdir)
LDADD = $(top_builddir)/src/libbdd.la
LDADD = $(top_builddir)/src/libbddx.la

View file

@ -8,7 +8,7 @@
#include <string.h>
#include <time.h>
#include <iostream>
#include "bdd.h"
#include "bddx.h"
using namespace std;

View file

@ -9,7 +9,7 @@
#define _PARSER_H
#include <stdio.h>
#include "bdd.h"
#include "bddx.h"
#define MAXIDLEN 32 /* Max. number of allowed characters in an identifier */

View file

@ -1,6 +1,6 @@
#include <iomanip>
#include <stdlib.h>
#include <bdd.h>
#include <bddx.h>
static const int varnum = 5;

View file

@ -1,7 +1,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
#include "bdd.h"
#include "bddx.h"
int N; /* Number of cyclers */
int *normvar; /* Current state variables */
@ -289,4 +289,3 @@ int main(int argc, char** argv)
return 0;
}

View file

@ -6,7 +6,7 @@
* 0 -> 1 -> 2 -> 3 -> 4 -> 5 -> -> 7 -> 0
*/
#include "fdd.h"
#include "fddx.h"
/* Use the transition relation "transRel" to iterate through the statespace
*/

View file

@ -1,7 +1,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
#include "bdd.h"
#include "bddx.h"
#include <iostream>
using namespace std;
@ -176,4 +176,3 @@ int main(int argc, char** argv)
bdd_done();
return 0;
}

View file

@ -1,4 +1,4 @@
#include "bvec.h"
#include "bvecx.h"
#include <iostream>
using namespace std;

View file

@ -27,7 +27,7 @@
**************************************************************************/
#include <stdlib.h>
#include <iostream>
#include "bdd.h"
#include "bddx.h"
using namespace std;
int N; /* Size of the chess board */

View file

@ -2,7 +2,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <iostream>
#include "bdd.h"
#include "bddx.h"
using std::cout;
using std::endl;
using std::flush;
@ -217,4 +217,3 @@ int main(void)
system("ps aux | grep \"./solitare\" | grep -v \"grep\"");
}

View file

@ -1,14 +1,13 @@
include_HEADERS = bdd.h fdd.h bvec.h
include_HEADERS = bddx.h fddx.h bvecx.h
BUDDY_FLAGS = -I$(top_builddir) -DVERSION=23 -DBUDDY_DLL_EXPORTS -DBUDDY_DLL
lib_LTLIBRARIES = libbdd.la
lib_LTLIBRARIES = libbddx.la
# See the `Updating version info' node of the Libtool manual before
# changing this.
libbdd_la_LDFLAGS = -no-undefined -version-info 0:0:0
libbdd_la_CPPFLAGS = $(BUDDY_FLAGS)
libbdd_la_SOURCES = \
libbddx_la_LDFLAGS = -no-undefined -version-info 0:0:0
libbddx_la_CPPFLAGS = $(BUDDY_FLAGS)
libbddx_la_SOURCES = \
bddio.c \
bddop.c \
bddtree.h \
@ -30,4 +29,4 @@ libbdd_la_SOURCES = \
check_PROGRAMS = bddtest
bddtest_SOURCES = bddtest.cxx
bddtest_CPPFLAGS = -I$(top_builddir)
bddtest_LDADD = ./libbdd.la
bddtest_LDADD = ./libbddx.la

View file

@ -29,8 +29,8 @@
#include <string>
#include <cstdlib>
#include "bdd.h"
#include "bvec.h"
#include "bddx.h"
#include "bvecx.h"
using namespace std;

View file

@ -35,8 +35,8 @@
DATE: (C) feb 1997
*************************************************************************/
#ifndef _BDD_H
#define _BDD_H
#ifndef _BDDX_H
#define _BDDX_H
#if __GNUC__ >= 3
#define __purefn __attribute__((__pure__))
@ -1046,6 +1046,6 @@ BUDDY_API bddstrmhandler bdd_strm_hook(bddstrmhandler);
#endif /* CPLUSPLUS */
#endif /* _BDD_H */
#endif /* _BDDX_H */
/* EOF */

View file

@ -1,5 +1,5 @@
/*========================================================================
Copyright (C) 1996-2002 by Jorn Lind-Nielsen
Copyright (C) 1996-2002, 2014 by Jorn Lind-Nielsen
All rights reserved
Permission is hereby granted, without written agreement and without
@ -36,7 +36,7 @@
*************************************************************************/
#include <stdlib.h>
#include "kernel.h"
#include "bvec.h"
#include "bvecx.h"
#define DEFAULT(v) { v.bitnum=0; v.bitvec=NULL; }

View file

@ -35,10 +35,10 @@
DATE: (C) may 1999
*************************************************************************/
#ifndef _BVEC_H
#define _BVEC_H
#ifndef _BVECX_H
#define _BVECX_H
#include "fdd.h"
#include "fddx.h"
/* Boolean (BDD) vector */
/*
@ -295,6 +295,6 @@ inline bdd bvec_neq(const bvec &left, const bvec &right)
#endif /* CPLUSPLUS */
#endif /* _BVEC_H */
#endif /* _BVECX_H */
/* EOF */

View file

@ -38,7 +38,7 @@
#include <stdlib.h>
#include <iomanip>
#include "kernel.h"
#include "bvec.h"
#include "bvecx.h"
using namespace std;

View file

@ -39,7 +39,7 @@
#include <stdlib.h>
#include <string.h>
#include "kernel.h"
#include "fdd.h"
#include "fddx.h"
static void fdd_printset_rec(FILE *, int, int *);

View file

@ -35,10 +35,10 @@
DATE: (C) february 1999
*************************************************************************/
#ifndef _FDD_H
#define _FDD_H
#ifndef _FDDX_H
#define _FDDX_H
#include "bdd.h"
#include "bddx.h"
#ifdef CPLUSPLUS
@ -167,7 +167,7 @@ inline bdd fdd_neq(int bitnum, bdd *left, bdd *right)
#endif /* CPLUSPLUS */
#endif /* _FDD_H */
#endif /* _FDDX_H */
/* EOF */

View file

@ -37,7 +37,7 @@
#ifndef _IMATRIX_H
#define _IMATRIX_H
#include "bdd.h" /* for __purefn */
#include "bddx.h" /* for __purefn */
typedef struct _imatrix
{

View file

@ -42,7 +42,7 @@
#include <limits.h>
#include <setjmp.h>
#include "bdd.h"
#include "bddx.h"
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif

View file

@ -1,33 +1,5 @@
AC_DEFUN([AX_CHECK_BUDDY], [
AC_ARG_WITH([included-buddy],
[AC_HELP_STRING([--with-included-buddy],
[use the BuDDy library included here])])
AC_CHECK_LIB([bdd], [bdd_implies],
[need_included_buddy=no],
[need_included_buddy=yes])
if test "$need_included_buddy" = yes; then
if test "$with_included_buddy" = no; then
AC_MSG_ERROR([Could not link with BuDDy. Please install BuDDy first,
set CPPFLAGS/LDFLAGS appropriately, or configure with
--with-included-buddy])
else
with_included_buddy=yes
fi
fi
if test "$with_included_buddy" = yes; then
BUDDY_LDFLAGS='$(top_builddir)/buddy/src/libbdd.la'
BUDDY_CPPFLAGS='-I$(top_srcdir)/buddy/src'
else
BUDDY_LDFLAGS='-lbdd'
fi
# We always configure BuDDy, this is needed to ensure
# it gets distributed properly. Whether with_included_buddy is
# set or not affects whether we *use* or *build* BuDDy.
AC_SUBST([BUDDY_LDFLAGS], ['$(top_builddir)/buddy/src/libbddx.la'])
AC_SUBST([BUDDY_CPPFLAGS], ['-I$(top_srcdir)/buddy/src'])
AC_CONFIG_SUBDIRS([buddy])
AM_CONDITIONAL([WITH_INCLUDED_BUDDY], [test "$with_included_buddy" = yes])
AC_SUBST([BUDDY_LDFLAGS])
AC_SUBST([BUDDY_CPPFLAGS])
])

View file

@ -25,7 +25,7 @@
#include "ltlast/atomic_prop.hh"
#include <set>
#include "bdd.h"
#include <bddx.h>
#include "tgba/fwd.hh"
namespace spot

View file

@ -21,7 +21,7 @@
# define SPOT_LTLVISIT_SIMPLIFY_HH
#include "ltlast/formula.hh"
#include "bdd.h"
#include <bddx.h>
#include "tgba/bdddict.hh"
#include <iosfwd>

View file

@ -1,7 +1,8 @@
// Copyright (C) 2011 Laboratoire de Recherche et Developpement de
// -*- coding: utf-8 -*-
// Copyright (C) 2011, 2014 Laboratoire de Recherche et Developpement de
// l'Epita (LRDE).
// Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
// et Marie Curie.
//
// This file is part of Spot, a model checking library.
@ -22,7 +23,7 @@
#ifndef SPOT_MISC_BDDLT_HH
# define SPOT_MISC_BDDLT_HH
# include <bdd.h>
# include <bddx.h>
# include <functional>
namespace spot

View file

@ -1,6 +1,6 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2009, 2013 Laboratoire de Recherche et Développement
// de l'Epita (LRDE).
// Copyright (C) 2009, 2013, 2014 Laboratoire de Recherche et
// Développement de l'Epita (LRDE).
//
// This file is part of Spot, a model checking library.
//
@ -21,7 +21,7 @@
# define SPOT_MISC_BDDOP_HH
#include "common.hh"
#include "bdd.h"
#include <bddx.h>
namespace spot
{

View file

@ -1,5 +1,5 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2009, 2013 Laboratoire de Recherche et Développement
// Copyright (C) 2009, 2013, 2014 Laboratoire de Recherche et Développement
// de l'Epita (LRDE).
// Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
@ -24,7 +24,7 @@
# define SPOT_MISC_MINATO_HH
# include "common.hh"
# include <bdd.h>
# include <bddx.h>
# include <stack>
namespace spot

View file

@ -1,6 +1,6 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2012, 2013 Laboratoire de Recherche et Developpement de
// l'Epita (LRDE)
// Copyright (C) 2012, 2013, 2014 Laboratoire de Recherche et
// Developpement de l'Epita (LRDE)
//
// This file is part of Spot, a model checking library.
//
@ -22,7 +22,7 @@
# define SPOT_PRIV_ACCCOMPL_HH
#include <map>
#include <bdd.h>
#include <bddx.h>
#include "misc/hash.hh"
#include "misc/bddlt.hh"

View file

@ -1,5 +1,6 @@
// Copyright (C) 2011, 2013 Laboratoire de Recherche et Developpement de
// l'Epita (LRDE)
// -*- coding: utf-8 -*-
// Copyright (C) 2011, 2013, 2014 Laboratoire de Recherche et
// Developpement de l'Epita (LRDE)
//
// This file is part of Spot, a model checking library.
//
@ -19,7 +20,7 @@
#ifndef SPOT_PRIV_ACCCONV_HH
# define SPOT_PRIV_ACCCONV_HH
#include <bdd.h>
#include <bddx.h>
#include "misc/hash.hh"
#include "misc/bddlt.hh"

View file

@ -20,7 +20,7 @@
#ifndef SPOT_PRIV_ACCMAP_HH
# define SPOT_PRIV_ACCMAP_HH
#include <bdd.h>
#include <bddx.h>
#include "misc/hash.hh"
#include "ltlast/formula.hh"
#include "ltlenv/defaultenv.hh"

View file

@ -20,7 +20,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <bdd.h>
#include <bddx.h>
#include <cassert>
#include "bddalloc.hh"

View file

@ -27,7 +27,7 @@
#include <set>
#include <map>
#include <iosfwd>
#include <bdd.h>
#include <bddx.h>
#include <vector>
#include <memory>
#include "ltlast/formula.hh"

View file

@ -26,7 +26,7 @@
#include <string>
#include <iosfwd>
#include "bdddict.hh"
#include <bdd.h>
#include <bddx.h>
namespace spot
{

View file

@ -20,8 +20,8 @@
#ifndef SPOT_TGBA_TGBAMASK_HH
# define SPOT_TGBA_TGBAMASK_HH
#include <bddx.h>
#include "tgbaproxy.hh"
#include "bdd.h"
namespace spot
{

View file

@ -24,7 +24,7 @@
#include <sstream>
#include <algorithm>
#include "misc/bitvect.hh"
#include "bdd.h"
#include <bddx.h>
#include "misc/hash.hh"
#include "misc/bddlt.hh"
#include "tgba/bdddict.hh"

View file

@ -26,7 +26,7 @@
#include <map>
#include <list>
#include <iosfwd>
#include <bdd.h>
#include <bddx.h>
#include "misc/optionmap.hh"
#include "tgba/tgbagraph.hh"
#include "emptiness_stats.hh"

View file

@ -23,7 +23,7 @@
#ifndef SPOT_TGBAALGOS_GTEC_SCCSTACK_HH
# define SPOT_TGBAALGOS_GTEC_SCCSTACK_HH
#include <bdd.h>
#include <bddx.h>
#include <list>
#include "tgba/tgba.hh"

View file

@ -22,7 +22,6 @@
#include <ostream>
#include <sstream>
#include "bdd.h"
#include "neverclaim.hh"
#include "tgba/bddprint.hh"
#include "tgba/tgbagraph.hh"

View file

@ -27,7 +27,6 @@
#include "powerset.hh"
#include "misc/hash.hh"
#include "tgbaalgos/powerset.hh"
#include "bdd.h"
#include "tgbaalgos/sccinfo.hh"
#include "tgbaalgos/cycles.hh"
#include "tgbaalgos/gtec/gtec.hh"

View file

@ -21,7 +21,7 @@
# define SPOT_TGBAALGOS_SCCFILTER_HH
#include "misc/common.hh"
#include <bdd.h>
#include <bddx.h>
#include "tgba/fwd.hh"
namespace spot

View file

@ -21,7 +21,6 @@
# define SPOT_TGBAALGOS_SCCINFO_HH
#include <vector>
#include "bdd.h"
#include "tgba/tgbagraph.hh"
namespace spot

View file

@ -22,7 +22,7 @@
#include <iosfwd>
#include <map>
#include <bdd.h>
#include <bddx.h>
#include "tgba/acc.hh"
namespace spot

View file

@ -1,5 +1,5 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2010, 2011, 2012 Laboratoire de Recherche et
// Copyright (C) 2010, 2011, 2012, 2014 Laboratoire de Recherche et
// Développement de l'EPITA.
// Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
@ -64,9 +64,9 @@
%{
#include <sstream>
#include "bdd.h"
#include "fdd.h"
#include "bvec.h"
#include "bddx.h"
#include "fddx.h"
#include "bvecx.h"
%}
%typemap(in) (int* input_buf, int input_buf_size) {