nojhan/eodev
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Changes to makefiles and other things

Browse source
This commit is contained in:
jmerelo 1999-02-09 18:40:00 +00:00
commit a5d27679da
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
eo/src/Makefile.am
View file

@ -4,8 +4,8 @@
## ##
############################################################################### ###############################################################################
lib_LTLIBRARIES = libeo.la lib_LIBRARIES = libeo.a
libeo_la_SOURCES = eoPrintable.cpp eoPersistent.cpp libeo_a_SOURCES = eoPrintable.cpp eoPersistent.cpp
libeoincdir = $(includedir)/eo 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 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

5
eo/src/eoBitOp.h
View file

@ -10,13 +10,12 @@
#include <eoBin.h> // eoBin #include <eoBin.h> // eoBin
#include <eoOp.h> // eoMonOp #include <eoOp.h> // eoMonOp
#ifndef min #ifdef _MSC_VER
#define min _MIN #define min _MIN
#endif
#ifndef max
#define max _MAX #define max _MAX
#endif #endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// eoBinRandom --> mofify a chromosome in a random way // eoBinRandom --> mofify a chromosome in a random way
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

2
eo/src/eoBitOpFactory.h
View file

@ -45,7 +45,7 @@ public:
eoOp<EOT> * opPtr = NULL; eoOp<EOT> * opPtr = NULL;
try { try {
opPtr = eoOpFactory<EOT>::make( _is ); opPtr = eoOpFactory<EOT>::make( _is );
} catch ( string& objectTypeStr ) { } catch ( const string& objectTypeStr ) {
if ( objectTypeStr == "eoBinRandom") { if ( objectTypeStr == "eoBinRandom") {
opPtr = new eoBinRandom<EOT>(); opPtr = new eoBinRandom<EOT>();
} }