Merge branch 'master' of git.dcc.fc.up.pt:yap-6.3
Conflicts: H/eval.h
This commit is contained in:
commit
da48f3a877
49
H/eval.h
49
H/eval.h
@ -140,7 +140,9 @@ typedef enum {
|
|||||||
*/
|
*/
|
||||||
op_pi,
|
op_pi,
|
||||||
/** e
|
/** e
|
||||||
Euler's number, the base of the natural logarithms.
|
|
||||||
|
Euler's number, the base of the natural logarithms (approximately 2.718281828).
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
op_e,
|
op_e,
|
||||||
/** epsilon
|
/** epsilon
|
||||||
@ -200,6 +202,7 @@ typedef enum {
|
|||||||
* Note that the number of bits of an integer is at least the size in bits of a Prolog term cell.
|
* Note that the number of bits of an integer is at least the size in bits of a Prolog term cell.
|
||||||
*/
|
*/
|
||||||
op_unot,
|
op_unot,
|
||||||
|
<<<<<<< HEAD
|
||||||
/** exp( _X_ ), natural exponentiation of _X_ .
|
/** exp( _X_ ), natural exponentiation of _X_ .
|
||||||
*
|
*
|
||||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.prolog}
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.prolog}
|
||||||
@ -215,7 +218,51 @@ typedef enum {
|
|||||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
=======
|
||||||
|
/** exp( _X_ ) [ISO]
|
||||||
|
*
|
||||||
|
* Natural exponential.
|
||||||
|
*
|
||||||
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.prolog}
|
||||||
|
* ?- _X = 2.3, exp(_X) =:= e ** _X.
|
||||||
|
* true.
|
||||||
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
*
|
||||||
|
* Notice that comparing whether two floating-point numbers are equal may lead to incorrect results.
|
||||||
|
*/
|
||||||
|
op_exp,
|
||||||
|
/** log( _X_ ) [ISO]
|
||||||
|
*
|
||||||
|
* Natural logarithm.
|
||||||
|
*
|
||||||
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.prolog}
|
||||||
|
* ?- _X = 2.3, log(exp(_X)) =:= exp(log(_X)).
|
||||||
|
* true.
|
||||||
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
*
|
||||||
|
* Notice that comparing whether two floating-point numbers are equal may lead to incorrect results.
|
||||||
|
*/
|
||||||
|
>>>>>>> 410efd577cd12f75b1b8c2e3676658ac725a4789
|
||||||
op_log,
|
op_log,
|
||||||
|
/** log10( _X_ ) [ISO]
|
||||||
|
*
|
||||||
|
* Decimal logarithm.
|
||||||
|
*
|
||||||
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.prolog}
|
||||||
|
* ?- between(1, 10, I), Delta is log10(I*10) + log10(1/(I*10)), format('0 == ~3g~n',[Delta]), fail.
|
||||||
|
* 0 == 0
|
||||||
|
* 0 == 0
|
||||||
|
* 0 == 0
|
||||||
|
* 0 == 0
|
||||||
|
* 0 == 0
|
||||||
|
* 0 == 0
|
||||||
|
* 0 == 0
|
||||||
|
* 0 == 0
|
||||||
|
* 0 == 2.22e-16
|
||||||
|
* 0 == 0
|
||||||
|
* false.
|
||||||
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
*/
|
||||||
op_log10,
|
op_log10,
|
||||||
op_sqrt,
|
op_sqrt,
|
||||||
op_sin,
|
op_sin,
|
||||||
|
76
configure
vendored
76
configure
vendored
@ -675,6 +675,12 @@ REAL_INCLUDES
|
|||||||
ZLIBS
|
ZLIBS
|
||||||
ZLIB_PLTARGETS
|
ZLIB_PLTARGETS
|
||||||
ZLIB_TARGETS
|
ZLIB_TARGETS
|
||||||
|
PKG_CPLINT
|
||||||
|
SHLIB_SUFFIX
|
||||||
|
CPLINT_SHLIB_LD
|
||||||
|
CPLINT_LDFLAGS
|
||||||
|
CPLINT_CFLAGS
|
||||||
|
CPLINT_LIBS
|
||||||
CUDD_CPPFLAGS
|
CUDD_CPPFLAGS
|
||||||
CUDD_LDFLAGS
|
CUDD_LDFLAGS
|
||||||
PKG_BDDLIB
|
PKG_BDDLIB
|
||||||
@ -874,6 +880,7 @@ with_time
|
|||||||
with_odbc
|
with_odbc
|
||||||
with_cudd
|
with_cudd
|
||||||
enable_bddlib
|
enable_bddlib
|
||||||
|
enable_cplint
|
||||||
with_junit
|
with_junit
|
||||||
with_raptor
|
with_raptor
|
||||||
with_matlab
|
with_matlab
|
||||||
@ -1537,6 +1544,7 @@ Optional Features:
|
|||||||
--enable-myddas-stats enable the MYDDAS library statistics support
|
--enable-myddas-stats enable the MYDDAS library statistics support
|
||||||
--enable-myddas-top-level enable the MYDDAS top-level support to MySQL
|
--enable-myddas-top-level enable the MYDDAS top-level support to MySQL
|
||||||
--enable-bddlib dynamic bdd library
|
--enable-bddlib dynamic bdd library
|
||||||
|
--enable-cplint=DIR enable the cplint library using the CUDD library in DIR/lib
|
||||||
--enable-gecode install gecode library
|
--enable-gecode install gecode library
|
||||||
|
|
||||||
Optional Packages:
|
Optional Packages:
|
||||||
@ -11942,6 +11950,58 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# Check whether --enable-cplint was given.
|
||||||
|
if test "${enable_cplint+set}" = set; then :
|
||||||
|
enableval=$enable_cplint; yap_cv_cplint=$enableval
|
||||||
|
else
|
||||||
|
yap_cv_cplint=no
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
if test ! "$yap_cv_cplint" = "no"
|
||||||
|
then
|
||||||
|
if test ! "$yap_cv_cplint" = "yes"
|
||||||
|
then
|
||||||
|
CPLINT_LDFLAGS+=" -L${yap_cv_cplint}/cudd -L${yap_cv_cplint}/mtr -L${yap_cv_cplint}/st -L${yap_cv_cplint}/util -L${yap_cv_cplint}/epd "
|
||||||
|
CPLINT_CFLAGS+=" -I${yap_cv_cplint}/include"
|
||||||
|
CPLINT_LIBS="-lcudd -lmtr -lst -lepd -lutil -lm "$CPLINT_LIBS
|
||||||
|
fi
|
||||||
|
if test "$target_os" = "cygwin" -o "$target_os" = "mingw32"
|
||||||
|
then
|
||||||
|
CPLINT_SHLIB_LD="gcc -shared ../../yap.dll"
|
||||||
|
SHLIB_SUFFIX="dll"
|
||||||
|
else
|
||||||
|
CPLINT_SHLIB_LD=$SHLIB_LD
|
||||||
|
SHLIB_SUFFIX="so"
|
||||||
|
fi
|
||||||
|
PKG_CPLINT="packages/cplint packages/cplint/splipcase packages/cplint/approx/simplecuddLPADs"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
else
|
||||||
|
PKG_CPLINT=""
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
mkdir -p packages/cplint
|
||||||
|
mkdir -p packages/cplint/approx
|
||||||
|
mkdir -p packages/cplint/approx/simplecuddLPADs
|
||||||
|
|
||||||
|
ac_config_files="$ac_config_files packages/cplint/Makefile"
|
||||||
|
|
||||||
|
ac_config_files="$ac_config_files packages/cplint/approx/simplecuddLPADs/Makefile"
|
||||||
|
|
||||||
|
ac_config_files="$ac_config_files packages/cplint/slipcase/Makefile"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if test "$PKG_ZLIB" != ""
|
if test "$PKG_ZLIB" != ""
|
||||||
then
|
then
|
||||||
|
|
||||||
@ -12372,7 +12432,7 @@ else
|
|||||||
JAVA_TEST=Test.java
|
JAVA_TEST=Test.java
|
||||||
CLASS_TEST=Test.class
|
CLASS_TEST=Test.class
|
||||||
cat << \EOF > $JAVA_TEST
|
cat << \EOF > $JAVA_TEST
|
||||||
/* #line 12375 "configure" */
|
/* #line 12435 "configure" */
|
||||||
public class Test {
|
public class Test {
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
@ -12548,7 +12608,7 @@ EOF
|
|||||||
if uudecode$EXEEXT Test.uue; then
|
if uudecode$EXEEXT Test.uue; then
|
||||||
ac_cv_prog_uudecode_base64=yes
|
ac_cv_prog_uudecode_base64=yes
|
||||||
else
|
else
|
||||||
echo "configure: 12551: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
|
echo "configure: 12611: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
|
||||||
echo "configure: failed file was:" >&5
|
echo "configure: failed file was:" >&5
|
||||||
cat Test.uue >&5
|
cat Test.uue >&5
|
||||||
ac_cv_prog_uudecode_base64=no
|
ac_cv_prog_uudecode_base64=no
|
||||||
@ -12679,7 +12739,7 @@ else
|
|||||||
JAVA_TEST=Test.java
|
JAVA_TEST=Test.java
|
||||||
CLASS_TEST=Test.class
|
CLASS_TEST=Test.class
|
||||||
cat << \EOF > $JAVA_TEST
|
cat << \EOF > $JAVA_TEST
|
||||||
/* #line 12682 "configure" */
|
/* #line 12742 "configure" */
|
||||||
public class Test {
|
public class Test {
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
@ -12714,7 +12774,7 @@ JAVA_TEST=Test.java
|
|||||||
CLASS_TEST=Test.class
|
CLASS_TEST=Test.class
|
||||||
TEST=Test
|
TEST=Test
|
||||||
cat << \EOF > $JAVA_TEST
|
cat << \EOF > $JAVA_TEST
|
||||||
/* [#]line 12717 "configure" */
|
/* [#]line 12777 "configure" */
|
||||||
public class Test {
|
public class Test {
|
||||||
public static void main (String args[]) {
|
public static void main (String args[]) {
|
||||||
System.exit (0);
|
System.exit (0);
|
||||||
@ -14260,6 +14320,9 @@ do
|
|||||||
"packages/bdd/Makefile") CONFIG_FILES="$CONFIG_FILES packages/bdd/Makefile" ;;
|
"packages/bdd/Makefile") CONFIG_FILES="$CONFIG_FILES packages/bdd/Makefile" ;;
|
||||||
"packages/ProbLog/simplecudd/Makefile") CONFIG_FILES="$CONFIG_FILES packages/ProbLog/simplecudd/Makefile" ;;
|
"packages/ProbLog/simplecudd/Makefile") CONFIG_FILES="$CONFIG_FILES packages/ProbLog/simplecudd/Makefile" ;;
|
||||||
"packages/ProbLog/simplecudd_lfi/Makefile") CONFIG_FILES="$CONFIG_FILES packages/ProbLog/simplecudd_lfi/Makefile" ;;
|
"packages/ProbLog/simplecudd_lfi/Makefile") CONFIG_FILES="$CONFIG_FILES packages/ProbLog/simplecudd_lfi/Makefile" ;;
|
||||||
|
"packages/cplint/Makefile") CONFIG_FILES="$CONFIG_FILES packages/cplint/Makefile" ;;
|
||||||
|
"packages/cplint/approx/simplecuddLPADs/Makefile") CONFIG_FILES="$CONFIG_FILES packages/cplint/approx/simplecuddLPADs/Makefile" ;;
|
||||||
|
"packages/cplint/slipcase/Makefile") CONFIG_FILES="$CONFIG_FILES packages/cplint/slipcase/Makefile" ;;
|
||||||
"exe") CONFIG_COMMANDS="$CONFIG_COMMANDS exe" ;;
|
"exe") CONFIG_COMMANDS="$CONFIG_COMMANDS exe" ;;
|
||||||
"packages/raptor/raptor_config.h") CONFIG_HEADERS="$CONFIG_HEADERS packages/raptor/raptor_config.h" ;;
|
"packages/raptor/raptor_config.h") CONFIG_HEADERS="$CONFIG_HEADERS packages/raptor/raptor_config.h" ;;
|
||||||
"packages/raptor/Makefile") CONFIG_FILES="$CONFIG_FILES packages/raptor/Makefile" ;;
|
"packages/raptor/Makefile") CONFIG_FILES="$CONFIG_FILES packages/raptor/Makefile" ;;
|
||||||
@ -15484,7 +15547,7 @@ fi
|
|||||||
|
|
||||||
if test -d /usr/local/include/gecode; then
|
if test -d /usr/local/include/gecode; then
|
||||||
CFLAGS="$CFLAGS -I/usr/local/include"
|
CFLAGS="$CFLAGS -I/usr/local/include"
|
||||||
SHLIB_CXX_FLAGS="$SHLIB_CXX_FLAGS -I/usr/local/include"
|
SHLIB_CXXFLAGS="$SHLIB_CXXFLAGS -I/usr/local/include"
|
||||||
GECODE_EXTRALIBS="-L/usr/local/lib"
|
GECODE_EXTRALIBS="-L/usr/local/lib"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -16701,6 +16764,9 @@ do
|
|||||||
"packages/bdd/Makefile") CONFIG_FILES="$CONFIG_FILES packages/bdd/Makefile" ;;
|
"packages/bdd/Makefile") CONFIG_FILES="$CONFIG_FILES packages/bdd/Makefile" ;;
|
||||||
"packages/ProbLog/simplecudd/Makefile") CONFIG_FILES="$CONFIG_FILES packages/ProbLog/simplecudd/Makefile" ;;
|
"packages/ProbLog/simplecudd/Makefile") CONFIG_FILES="$CONFIG_FILES packages/ProbLog/simplecudd/Makefile" ;;
|
||||||
"packages/ProbLog/simplecudd_lfi/Makefile") CONFIG_FILES="$CONFIG_FILES packages/ProbLog/simplecudd_lfi/Makefile" ;;
|
"packages/ProbLog/simplecudd_lfi/Makefile") CONFIG_FILES="$CONFIG_FILES packages/ProbLog/simplecudd_lfi/Makefile" ;;
|
||||||
|
"packages/cplint/Makefile") CONFIG_FILES="$CONFIG_FILES packages/cplint/Makefile" ;;
|
||||||
|
"packages/cplint/approx/simplecuddLPADs/Makefile") CONFIG_FILES="$CONFIG_FILES packages/cplint/approx/simplecuddLPADs/Makefile" ;;
|
||||||
|
"packages/cplint/slipcase/Makefile") CONFIG_FILES="$CONFIG_FILES packages/cplint/slipcase/Makefile" ;;
|
||||||
"exe") CONFIG_COMMANDS="$CONFIG_COMMANDS exe" ;;
|
"exe") CONFIG_COMMANDS="$CONFIG_COMMANDS exe" ;;
|
||||||
"packages/raptor/raptor_config.h") CONFIG_HEADERS="$CONFIG_HEADERS packages/raptor/raptor_config.h" ;;
|
"packages/raptor/raptor_config.h") CONFIG_HEADERS="$CONFIG_HEADERS packages/raptor/raptor_config.h" ;;
|
||||||
"packages/raptor/Makefile") CONFIG_FILES="$CONFIG_FILES packages/raptor/Makefile" ;;
|
"packages/raptor/Makefile") CONFIG_FILES="$CONFIG_FILES packages/raptor/Makefile" ;;
|
||||||
|
@ -30,7 +30,7 @@ dnl YAPLIB_LD= construct libYap.DLL
|
|||||||
dnl SHLIB_LD= dll ld (C)
|
dnl SHLIB_LD= dll ld (C)
|
||||||
dnl SHLIB_CXX_LD= dll ld (C++)
|
dnl SHLIB_CXX_LD= dll ld (C++)
|
||||||
dnl SHLIB_CFLAGS= cflags to use when constructing a DLL
|
dnl SHLIB_CFLAGS= cflags to use when constructing a DLL
|
||||||
dnl SHLIB_CXX_CFLAGS= c++flags to use when constructing a DLL
|
dnl SHLIB_CXXCFLAGS= c++flags to use when constructing a DLL
|
||||||
dnl YAPLIB_CFLAGS=flags to construct libYap
|
dnl YAPLIB_CFLAGS=flags to construct libYap
|
||||||
dnl EXTRA_LIBS_FOR_DLLS= libs that are required when lding a so
|
dnl EXTRA_LIBS_FOR_DLLS= libs that are required when lding a so
|
||||||
dnl EXTRA_LIBS_FOR_SWIDLLS= libs that are required when lding a SWI so
|
dnl EXTRA_LIBS_FOR_SWIDLLS= libs that are required when lding a SWI so
|
||||||
@ -1894,6 +1894,8 @@ fi
|
|||||||
|
|
||||||
m4_include([packages/bdd/configure.in])
|
m4_include([packages/bdd/configure.in])
|
||||||
|
|
||||||
|
m4_include([packages/cplint/configure.in])
|
||||||
|
|
||||||
dnl zlib
|
dnl zlib
|
||||||
|
|
||||||
if test "$PKG_ZLIB" != ""
|
if test "$PKG_ZLIB" != ""
|
||||||
|
@ -23,7 +23,7 @@ SHAREDIR=$(ROOTDIR)/share
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
CXX=@CXX@
|
CXX=@CXX@
|
||||||
CXXFLAGS= @SHLIB_CXX_FLAGS@ $(YAP_EXTRAS) $(DEFS) -I. -I$(srcdir) -I../.. -I$(srcdir)/../../include -I$(srcdir)/../../os -I "@GECODE_INCLUDES@"
|
CXXFLAGS= @SHLIB_CXXFLAGS@ $(YAP_EXTRAS) $(DEFS) -I. -I$(srcdir) -I../.. -I$(srcdir)/../../include -I$(srcdir)/../../os -I "@GECODE_INCLUDES@"
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
# You shouldn't need to change what follows.
|
# You shouldn't need to change what follows.
|
||||||
|
@ -7,7 +7,7 @@ AC_ARG_ENABLE(gecode,
|
|||||||
dnl gecode is usually in /usr/local
|
dnl gecode is usually in /usr/local
|
||||||
if test -d /usr/local/include/gecode; then
|
if test -d /usr/local/include/gecode; then
|
||||||
CFLAGS="$CFLAGS -I/usr/local/include"
|
CFLAGS="$CFLAGS -I/usr/local/include"
|
||||||
SHLIB_CXX_FLAGS="$SHLIB_CXX_FLAGS -I/usr/local/include"
|
SHLIB_CXXFLAGS="$SHLIB_CXXFLAGS -I/usr/local/include"
|
||||||
GECODE_EXTRALIBS="-L/usr/local/lib"
|
GECODE_EXTRALIBS="-L/usr/local/lib"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user