some build tools

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644 (file)
index 0000000..c2141e5
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,5 @@
+PROJECT(GeneSort)
+
+SET(CMAKE_VERBOSE_MAKEFILE OFF)
+
+SUBDIRS(src)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644 (file)
index 0000000..469344f
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,8 @@
+PROJECT(GeneSort)
+
+SET(CMAKE_VERBOSE_MAKEFILE OFF)
+
+ADD_DEFINITIONS(-Wall -O2)
+
+INCLUDE_DIRECTORIES(.)
+ADD_EXECUTABLE(../bin/genesort main.cpp GeneOrder.cpp)

diff --git a/src/GeneOrder.h b/src/GeneOrder.h
index 24f6e8c57880701b3808e119ec165376d10d448d..e411a37253f932ec9788a3f5533bff19c695f2fe 100644 (file)
--- a/src/GeneOrder.h
+++ b/src/GeneOrder.h
@@ -99,8 +99,12 @@ class GeneOrder{
 template<typename T>
 GeneOrder::GeneOrder(T begin, T end): _geneorder(begin,end){
 
-       if (_geneorder[0] != 0 || _geneorder[_geneorder.size()-1] != _geneorder.size() - 1)
-               throw std::invalid_argument("Permutations doesn't start with 0 and end with n");
+       /*TODO: Pad code, just not sure if I need it all the time.
+       if (_geneorder[0] != 0)
+               _geneorder.insert(_geneorder.begin(),0);
+       if(_geneorder[_geneorder.size()-1] != _geneorder.size() - 1)
+               _geneorder.push_back(_geneorder.size());
+       */
 
        GeneList genes(_geneorder.size());
        for (GeneList::iterator gene = _geneorder.begin(); gene != _geneorder.end(); ++gene){