diff --git a/eo/src/pyeo/Makefile b/eo/src/pyeo/Makefile index 3bf2977c2..5b1f208c3 100644 --- a/eo/src/pyeo/Makefile +++ b/eo/src/pyeo/Makefile @@ -5,13 +5,13 @@ # Boost.Python v2 # -CXX = g++ #-3.2 -CXXFLAGS = -DHAVE_SSTREAM#-g #-DNDEBUG +CXX = g++ +CXXFLAGS = -DHAVE_SSTREAM CPPFLAGS = -Wall -O2 #-g #-O2 LDFLAGS = COMPILE = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c LINK = $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -INC=-I/usr/include/python2.2 -I/home/mkeijzer/src/boost -I.. -ftemplate-depth-50 #-I/usr/include/stlport +INC=-I/usr/include/python2.4 -I.. -I../.. -ftemplate-depth-50 OBJECTS=eoFunctorStore.o PyEO.o abstract1.o algos.o \ random_numbers.o geneticOps.o selectOne.o continuators.o\ @@ -25,7 +25,7 @@ clean: rm PyEO/*.so *.o test/*.pyc PyEO/PyEO.so: $(OBJECTS) - $(LINK) -o PyEO/PyEO.so $(OBJECTS) -lboost_python -lpython2.2 -shared #-lstlport + $(LINK) -o PyEO/PyEO.so $(OBJECTS) -lboost_python -lpython2.4 -shared #-lstlport eoFunctorStore.o: ../eoFunctorStore.h ../eoFunctorStore.cpp $(COMPILE) -o eoFunctorStore.o ../eoFunctorStore.cpp $(INC) diff --git a/eo/src/pyeo/random_numbers.cpp b/eo/src/pyeo/random_numbers.cpp index bd0b29198..100ac38e0 100644 --- a/eo/src/pyeo/random_numbers.cpp +++ b/eo/src/pyeo/random_numbers.cpp @@ -88,7 +88,7 @@ int spin(eoRng& _rng, numeric::array values, double total) void random_numbers() { - class_("eoRng", init()) + class_("eoRng", init()) .def("flip", &eoRng::flip) .def("random", &eoRng::random) .def("rand", &eoRng::rand) diff --git a/eo/src/pyeo/valueParam.cpp b/eo/src/pyeo/valueParam.cpp index c648df5f2..606251802 100644 --- a/eo/src/pyeo/valueParam.cpp +++ b/eo/src/pyeo/valueParam.cpp @@ -45,7 +45,7 @@ public: return call_method(self, "getValueAsString"); } - void setValue(std::string s) + void setValue(const std::string& s) { call_method(self, "setValueAsString", s); } diff --git a/eo/src/pyeo/valueParam.h b/eo/src/pyeo/valueParam.h index 4ca7f61bc..783f2fc13 100644 --- a/eo/src/pyeo/valueParam.h +++ b/eo/src/pyeo/valueParam.h @@ -30,7 +30,7 @@ class ValueParam : public eoParam // ValueParam containing python object return std::string(boost::python::extract(s)); } - void setValue(std::string v) + void setValue(const std::string& v) { std::cerr << "not implemented yet" << std::endl; }