removed comment in PyEO.cpp
This commit is contained in:
parent
9512291e3e
commit
380d4eca0b
2 changed files with 1 additions and 23 deletions
|
|
@ -30,7 +30,7 @@ CPPFLAGS = -Wall -O2 #-g #-O2
|
||||||
LDFLAGS =
|
LDFLAGS =
|
||||||
COMPILE = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
|
COMPILE = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
|
||||||
LINK = $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
|
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 \
|
OBJECTS=eoFunctorStore.o PyEO.o abstract1.o algos.o \
|
||||||
random_numbers.o geneticOps.o selectOne.o continuators.o\
|
random_numbers.o geneticOps.o selectOne.o continuators.o\
|
||||||
|
|
|
||||||
|
|
@ -27,25 +27,6 @@
|
||||||
#include <strstream>
|
#include <strstream>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
typedef eoPop<PyEO>::iterator PopIt;
|
|
||||||
typedef eoPop<PyEO>::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 std;
|
||||||
//using namespace boost::python;
|
//using namespace boost::python;
|
||||||
|
|
@ -153,11 +134,8 @@ PyEO& pop_getitem(eoPop<PyEO>& pop, boost::python::object key)
|
||||||
|
|
||||||
if (static_cast<unsigned>(i) >= pop.size())
|
if (static_cast<unsigned>(i) >= pop.size())
|
||||||
{
|
{
|
||||||
cerr << "throwing" << endl;
|
|
||||||
throw index_error("Index out of bounds");
|
throw index_error("Index out of bounds");
|
||||||
}
|
}
|
||||||
cerr << "indexing " << i << endl;
|
|
||||||
|
|
||||||
return pop[i];
|
return pop[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Reference in a new issue