fix installation, dist-preparation
This commit is contained in:
kuepper
parent
495057c341
commit
51471804cd
18 changed files with 110 additions and 80 deletions
|
|
@ -94,6 +94,7 @@ fi
|
|||
])
|
||||
|
||||
|
||||
|
||||
dnl Available from the GNU Autoconf Macro Archive at:
|
||||
dnl http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_namespaces.html
|
||||
dnl
|
||||
|
|
@ -111,3 +112,26 @@ if test "$ac_cv_cxx_namespaces" = yes; then
|
|||
AC_DEFINE(HAVE_NAMESPACES,,[define if the compiler implements namespaces])
|
||||
fi
|
||||
])
|
||||
|
||||
|
||||
|
||||
dnl Available from the GNU Autoconf Macro Archive at:
|
||||
dnl http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_numeric_limits.html
|
||||
dnl
|
||||
AC_DEFUN([AC_CXX_HAVE_NUMERIC_LIMITS],
|
||||
[AC_CACHE_CHECK(whether the compiler has numeric_limits<T>,
|
||||
ac_cv_cxx_have_numeric_limits,
|
||||
[AC_REQUIRE([AC_CXX_NAMESPACES])
|
||||
AC_LANG_SAVE
|
||||
AC_LANG_CPLUSPLUS
|
||||
AC_TRY_COMPILE([#include <limits>
|
||||
#ifdef HAVE_NAMESPACES
|
||||
using namespace std;
|
||||
#endif],[double e = numeric_limits<double>::epsilon(); return 0;],
|
||||
ac_cv_cxx_have_numeric_limits=yes, ac_cv_cxx_have_numeric_limits=no)
|
||||
AC_LANG_RESTORE
|
||||
])
|
||||
if test "$ac_cv_cxx_have_numeric_limits" = yes; then
|
||||
AC_DEFINE(HAVE_NUMERIC_LIMITS,,[define if the compiler has numeric_limits<T>])
|
||||
fi
|
||||
])
|
||||
|
|
|
|||
|
|
@ -1,7 +1,3 @@
|
|||
###############################################################################
|
||||
##
|
||||
## Makefile.am for app dir in eo
|
||||
##
|
||||
###############################################################################
|
||||
|
||||
SUBDIRS = mastermind gpsymreg
|
||||
SUBDIRS = mastermind gprop gpsymreg
|
||||
|
|
|
|||
|
|
@ -1,24 +1,22 @@
|
|||
###############################################################################
|
||||
#
|
||||
# Makefile.am for app/gprop
|
||||
#
|
||||
###############################################################################
|
||||
|
||||
DEPS = $(top_builddir)/src/libeo.a $(top_builddir)/src/utils/libeoutils.a
|
||||
noinst_PROGRAMS = gprop
|
||||
|
||||
###############################################################################
|
||||
|
||||
INCLUDES = -I$(top_builddir)/src
|
||||
LDADDS = $(top_builddir)/src/libeo.a $(top_builddir)/src/utils/libeoutils.a
|
||||
CXXFLAGS = -g
|
||||
###############################################################################
|
||||
gprop_SOURCES = gprop.cpp
|
||||
|
||||
bin_PROGRAMS = gprop
|
||||
###############################################################################
|
||||
noinst_HEADERS = gprop.h \
|
||||
l2.h \
|
||||
mlp.h \
|
||||
mse.h \
|
||||
qp.h \
|
||||
vecop.h
|
||||
|
||||
gprop_SOURCES = gprop.cpp
|
||||
gprop_DEPENDENCIES = $(DEPS)
|
||||
gprop_LDFLAGS = -lm
|
||||
gprop_LDADD = $(LDADDS)
|
||||
|
||||
###############################################################################
|
||||
AM_CXXFLAGS = -I$(top_srcdir)/src
|
||||
|
||||
LIBEO = $(top_builddir)/src/libeo.a
|
||||
LIBEOUTILS = $(top_builddir)/src/utils/libeoutils.a
|
||||
|
||||
DEPS = $(LIBEO) $(LIBEOUTILS)
|
||||
LIBS = $(LIBEO) $(LIBEOUTILS)
|
||||
|
|
|
|||
|
|
@ -5,10 +5,21 @@
|
|||
#ifndef mlp_h
|
||||
#define mlp_h
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
using namespace std;
|
||||
#include <values.h> // MAXFLOAT MINFLOAT
|
||||
#ifdef HAVE_NUMERIC_LIMITS
|
||||
#include <numeric>
|
||||
#define MLP_MAXFLOAT std::numeric_limits<double>::max()
|
||||
#define MLP_MINFLOAT std::numeric_limits<double>::min()
|
||||
#elif defined HAVE_VALUES_H
|
||||
#include <values.h>
|
||||
#define MLP_MAXFLOAT MAXFLOAT
|
||||
#define MLP_MINFLOAT MINFLOAT
|
||||
#else
|
||||
#error numerical limits not available
|
||||
#endif
|
||||
#include <math.h> // exp
|
||||
#include <stdexcept> // invalid_argument
|
||||
#include <iostream> // istream ostream
|
||||
|
|
@ -20,7 +31,9 @@ using namespace std;
|
|||
#include <utility>
|
||||
#include <iterator>
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
using namespace std;
|
||||
|
||||
|
||||
namespace mlp
|
||||
{
|
||||
|
|
@ -52,8 +65,8 @@ namespace mlp
|
|||
//---------------------------------------------------------------------------
|
||||
|
||||
|
||||
const real max_real = MAXFLOAT;
|
||||
const real min_real = MINFLOAT;
|
||||
const real max_real = MLP_MAXFLOAT;
|
||||
const real min_real = MLP_MINFLOAT;
|
||||
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
|
|
@ -441,7 +454,11 @@ namespace mlp {
|
|||
|
||||
} // namespace mlp
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
|
||||
#undef MLP_MAXFLOAT
|
||||
#undef MLP_MINFLOAT
|
||||
|
||||
|
||||
#endif // mlp_h
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,6 @@
|
|||
###############################################################################
|
||||
#
|
||||
# Makefile.am for app/gpsymreg
|
||||
#
|
||||
###############################################################################
|
||||
|
||||
bin_PROGRAMS = gpsymreg
|
||||
noinst_PROGRAMS = gpsymreg
|
||||
|
||||
gpsymreg_SOURCES = main.cpp
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,6 @@
|
|||
###############################################################################
|
||||
#
|
||||
# Makefile.am for app/mastermind
|
||||
#
|
||||
###############################################################################
|
||||
|
||||
bin_PROGRAMS = mastermind
|
||||
noinst_PROGRAMS = mastermind
|
||||
|
||||
mastermind_SOURCES = mastermind.cpp
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,10 @@ AC_CHECK_PROG(DOXYGEN, doxygen, doxygen, true)
|
|||
dnl Checks for header files.
|
||||
AC_HEADER_STDC
|
||||
AC_CHECK_HEADERS(limits.h)
|
||||
AC_CHECK_HEADERS(values.h)
|
||||
AC_CXX_HAVE_NUMERIC_LIMITS
|
||||
AC_CXX_HAVE_SSTREAM
|
||||
AC_CXX_NAMESPACES
|
||||
|
||||
dnl Checks for typedefs, structures, and compiler characteristics.
|
||||
AC_C_CONST
|
||||
|
|
@ -50,6 +53,7 @@ dnl create makefiles
|
|||
AC_OUTPUT(Makefile \
|
||||
app/Makefile \
|
||||
app/mastermind/Makefile \
|
||||
app/gprop/Makefile \
|
||||
app/gpsymreg/Makefile \
|
||||
contrib/Makefile \
|
||||
doc/Makefile \
|
||||
|
|
|
|||
|
|
@ -119,16 +119,4 @@ pkginclude_HEADERS = eo \
|
|||
eoVector.h \
|
||||
es.h \
|
||||
ga.h \
|
||||
do/make_algo_easea.h \
|
||||
do/make_algo_pareto.h \
|
||||
do/make_algo_scalar.h \
|
||||
do/make_checkpoint.h \
|
||||
do/make_checkpoint_FDC.h \
|
||||
do/make_checkpoint_assembled.h \
|
||||
do/make_checkpoint_pareto.h \
|
||||
do/make_continue.h \
|
||||
do/make_continue_pareto.h \
|
||||
do/make_general_replacement.h \
|
||||
do/make_pop.h \
|
||||
do/make_run.h \
|
||||
$(PARADISEO_H)
|
||||
|
|
|
|||
|
|
@ -1 +1,15 @@
|
|||
pkginclude_HEADERS = make_algo_easea.h \
|
||||
make_algo_pareto.h \
|
||||
make_algo_scalar.h \
|
||||
make_checkpoint.h \
|
||||
make_checkpoint_FDC.h \
|
||||
make_checkpoint_assembled.h \
|
||||
make_checkpoint_pareto.h \
|
||||
make_continue.h \
|
||||
make_continue_pareto.h \
|
||||
make_general_replacement.h \
|
||||
make_pop.h \
|
||||
make_run.h
|
||||
|
||||
|
||||
EXTRA_DIST = Readme
|
||||
|
|
|
|||
|
|
@ -17,7 +17,9 @@ libes_a_SOURCES = make_algo_scalar_es.cpp \
|
|||
make_run_es.cpp \
|
||||
make_run_real.cpp
|
||||
|
||||
pkginclude_HEADERS = eoEsChromInit.h \
|
||||
esincludedir = $(pkgincludedir)/es
|
||||
|
||||
esinclude_HEADERS = eoEsChromInit.h \
|
||||
eoEsFull.h \
|
||||
eoEsGlobalXover.h \
|
||||
eoEsMutate.h \
|
||||
|
|
|
|||
|
|
@ -16,9 +16,9 @@ libga_a_SOURCES = make_algo_scalar_ga.cpp \
|
|||
make_pop_ga.cpp \
|
||||
make_run_ga.cpp
|
||||
|
||||
libeoincdir = $(includedir)/eo/ga
|
||||
gaincludedir = $(pkgincludedir)/ga
|
||||
|
||||
libeoinc_HEADERS = eoBit.h \
|
||||
gainclude_HEADERS = eoBit.h \
|
||||
eoBitOpFactory.h \
|
||||
eoBitOp.h \
|
||||
eoBoolFlip.h \
|
||||
|
|
|
|||
|
|
@ -1,14 +1,11 @@
|
|||
###############################################################################
|
||||
##
|
||||
## Makefile.am for eo/src/gp
|
||||
##
|
||||
###############################################################################
|
||||
|
||||
libeoincdir = $(includedir)/eo/gp
|
||||
libeoinc_HEADERS = eoParseTreeDepthInit.h \
|
||||
eoParseTree.h \
|
||||
eoParseTreeOp.h \
|
||||
eoStParseTreeDepthInit.h \
|
||||
eoStParseTreeOp.h \
|
||||
node_pool.h \
|
||||
parse_tree.h
|
||||
gpincludedir = $(pkgincludedir)/gp
|
||||
|
||||
gpinclude_HEADERS = eoParseTreeDepthInit.h \
|
||||
eoParseTree.h \
|
||||
eoParseTreeOp.h \
|
||||
eoStParseTreeDepthInit.h \
|
||||
eoStParseTreeOp.h \
|
||||
node_pool.h \
|
||||
parse_tree.h
|
||||
|
|
|
|||
|
|
@ -1,13 +1,11 @@
|
|||
###############################################################################
|
||||
##
|
||||
## Makefile.am for eo/src/other
|
||||
##
|
||||
###############################################################################
|
||||
|
||||
INCLUDES = -I$(top_builddir)/src
|
||||
|
||||
#lib_LIBRARIES = libeoother.a
|
||||
#libeoother_a_SOURCES =
|
||||
AM_CXXFLAGS = -I$(top_builddir)/src
|
||||
|
||||
libeootherincdir = $(includedir)/eo/other
|
||||
libeootherinc_HEADERS = eoExternalEO.h eoString.h external_eo eoExternalOpFunctions.h
|
||||
otherincludedir = $(pkgincludedir)/other
|
||||
|
||||
otherinclude_HEADERS = eoExternalEO.h \
|
||||
eoString.h \
|
||||
external_eo \
|
||||
eoExternalOpFunctions.h
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
bin_PROGRAMS = FirstBitGA FirstRealGA exercise1.3
|
||||
noinst_PROGRAMS = FirstBitGA FirstRealGA exercise1.3
|
||||
|
||||
FirstBitGA_SOURCES = FirstBitGA.cpp
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
bin_PROGRAMS = FirstBitEA FirstRealEA exercise2.3
|
||||
noinst_PROGRAMS = FirstBitEA FirstRealEA exercise2.3
|
||||
|
||||
|
||||
FirstBitEA_SOURCES = FirstBitEA.cpp
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
bin_PROGRAMS = SecondBitEA SecondRealEA exercise3.1
|
||||
noinst_PROGRAMS = SecondBitEA SecondRealEA exercise3.1
|
||||
|
||||
|
||||
SecondBitEA_SOURCES = SecondBitEA.cpp
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
bin_PROGRAMS = BitEA RealEA ESEA
|
||||
noinst_PROGRAMS = BitEA RealEA ESEA
|
||||
|
||||
|
||||
BitEA_SOURCES = BitEA.cpp
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
bin_PROGRAMS = OneMaxEA OneMaxLibEA
|
||||
noinst_PROGRAMS = OneMaxEA OneMaxLibEA
|
||||
|
||||
OneMaxEA_SOURCES = OneMaxEA.cpp
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue