diff --git a/eo/src/pyeo/Makefile b/eo/src/pyeo/Makefile index 7f48a895..11587b13 100644 --- a/eo/src/pyeo/Makefile +++ b/eo/src/pyeo/Makefile @@ -30,7 +30,7 @@ CPPFLAGS = -Wall -O2 #-g #-O2 LDFLAGS = COMPILE = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c LINK = $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -INC=-I/usr/include/python2.2 -I.. -ftemplate-depth-50 #-I/usr/include/stlport +INC=-I/usr/include/python2.2 -I/home/mkeijzer/src/boost -I.. -ftemplate-depth-50 #-I/usr/include/stlport OBJECTS=eoFunctorStore.o PyEO.o abstract1.o algos.o \ random_numbers.o geneticOps.o selectOne.o continuators.o\ diff --git a/eo/src/pyeo/PyEO.cpp b/eo/src/pyeo/PyEO.cpp index 6a0a1394..9ccd0c9a 100644 --- a/eo/src/pyeo/PyEO.cpp +++ b/eo/src/pyeo/PyEO.cpp @@ -27,25 +27,6 @@ #include #endif -typedef eoPop::iterator PopIt; -typedef eoPop::const_iterator cPopIt; - -PopIt operator+(PopIt it, size_t a) -{ - return it + ptrdiff_t(a); -} -cPopIt operator+(cPopIt it, size_t a) -{ - return it + ptrdiff_t(a); -} -PopIt operator-(PopIt it, size_t a) -{ - return it - ptrdiff_t(a); -} -cPopIt operator-(cPopIt it, size_t a) -{ - return it - ptrdiff_t(a); -} using namespace std; //using namespace boost::python; @@ -153,11 +134,8 @@ PyEO& pop_getitem(eoPop& pop, boost::python::object key) if (static_cast(i) >= pop.size()) { - cerr << "throwing" << endl; throw index_error("Index out of bounds"); } - cerr << "indexing " << i << endl; - return pop[i]; }