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

Updated makefiles, updated the moo stuff and cleaned up some stuff that refused to compile

Browse source
This commit is contained in:
maartenkeijzer 2007-11-12 16:23:57 +00:00
commit 18adaef056
19 changed files with 66 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

6
eo/src/pyeo/Makefile
View file

@ -16,7 +16,9 @@ OBJECTS=eoFunctorStore.o PyEO.o abstract1.o algos.o \
random_numbers.o geneticOps.o selectOne.o continuators.o\
reduce.o replacement.o selectors.o breeders.o\
mergers.o valueParam.o perf2worth.o monitors.o\
statistics.o
statistics.o
LIB=../libeo.a ../utils/libeoutils.a
all: PyEO/PyEO.so
@ -24,7 +26,7 @@ clean:
rm PyEO/*.so *.o test/*.pyc
PyEO/PyEO.so: $(OBJECTS)
$(LINK) -o PyEO/PyEO.so $(OBJECTS) -lboost_python -lpython2.4 -shared #-lstlport
$(LINK) -o PyEO/PyEO.so $(OBJECTS) -lboost_python -lpython2.4 ${LIB} -shared #-lstlport
eoFunctorStore.o: ../eoFunctorStore.h ../eoFunctorStore.cpp
$(COMPILE) -o eoFunctorStore.o ../eoFunctorStore.cpp $(INC)

2
eo/src/pyeo/PyEO.cpp
View file

@ -180,7 +180,7 @@ BOOST_PYTHON_MODULE(PyEO)
boost::python::class_<eoPop<PyEO> >("eoPop", init<>() )
.def( init< unsigned, eoInit<PyEO>& >()[with_custodian_and_ward<1,3>()] )
.def("append", &eoPop<PyEO>::append)
.def("append", &eoPop<PyEO>::append, "docstring?")
.def("__str__", to_string<eoPop<PyEO> >)
.def("__len__", pop_size)
.def("sort", pop_sort )