Changes to makefiles and other things
This commit is contained in:
parent
5318810e81
commit
a5d27679da
3 changed files with 5 additions and 6 deletions
|
|
@ -4,8 +4,8 @@
|
|||
##
|
||||
###############################################################################
|
||||
|
||||
lib_LTLIBRARIES = libeo.la
|
||||
libeo_la_SOURCES = eoPrintable.cpp eoPersistent.cpp
|
||||
lib_LIBRARIES = libeo.a
|
||||
libeo_a_SOURCES = eoPrintable.cpp eoPersistent.cpp
|
||||
|
||||
libeoincdir = $(includedir)/eo
|
||||
libeoinc_HEADERS = eo EO.h eoDup.h eoMultiMonOp.h eoPop.h eoUniform.h eoESChrom.h eoNegExp.h eoProblem.h eoVector.h eoFitness.h eoNormal.h eoRnd.h eoXOver2.h eo1d.h eoID.h eoObject.h eoString.h eoAged.h eoKill.h eoOp.h eoTranspose.h eoBin.h eoPrintable.h eoPersistent.h eoLottery.h eoMutation.h eoPopOps.h eoUniform.h eoInsertion.h eoBitOp.h
|
||||
|
|
|
|||
|
|
@ -10,13 +10,12 @@
|
|||
#include <eoBin.h> // eoBin
|
||||
#include <eoOp.h> // eoMonOp
|
||||
|
||||
#ifndef min
|
||||
#ifdef _MSC_VER
|
||||
#define min _MIN
|
||||
#endif
|
||||
#ifndef max
|
||||
#define max _MAX
|
||||
#endif
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// eoBinRandom --> mofify a chromosome in a random way
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ public:
|
|||
eoOp<EOT> * opPtr = NULL;
|
||||
try {
|
||||
opPtr = eoOpFactory<EOT>::make( _is );
|
||||
} catch ( string& objectTypeStr ) {
|
||||
} catch ( const string& objectTypeStr ) {
|
||||
if ( objectTypeStr == "eoBinRandom") {
|
||||
opPtr = new eoBinRandom<EOT>();
|
||||
}
|
||||
|
|
|
|||
Reference in a new issue