From e0570b180ee00c7a7f2290ec02efd2123bddd495 Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Thu, 14 Jun 2007 12:09:34 +0000 Subject: [PATCH] some build tools --- CMakeLists.txt | 5 +++++ src/CMakeLists.txt | 8 ++++++++ src/GeneOrder.h | 8 ++++++-- 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 CMakeLists.txt create mode 100644 src/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 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 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 24f6e8c..e411a37 100644 --- a/src/GeneOrder.h +++ b/src/GeneOrder.h @@ -99,8 +99,12 @@ class GeneOrder{ template 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){ -- 2.39.2