diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..c0ce11b --- /dev/null +++ b/Makefile @@ -0,0 +1,3 @@ +# makefile for main +admre: main.cpp + g++ -Wall -o admre main.cpp world.cpp deme.cpp individual.cpp -std=c++11 diff --git a/deme.cpp b/deme.cpp index 5730052..9dddaf7 100644 --- a/deme.cpp +++ b/deme.cpp @@ -6,8 +6,8 @@ #include #include #include -#include -#include +#include "range_expansion.h" +#include "rng.h" using namespace std; diff --git a/individual.cpp b/individual.cpp index 2c9f195..d502217 100644 --- a/individual.cpp +++ b/individual.cpp @@ -6,14 +6,14 @@ #include #include #include -#include -#include +#include "range_expansion.h" +#include "rng.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include using namespace std; using namespace boost::math; @@ -346,4 +346,4 @@ void Individual::ResetMutationOrigin() fill_n(mb_front[1].begin(),loci,0); -} \ No newline at end of file +} diff --git a/main.cpp b/main.cpp index e61011d..764cf4f 100644 --- a/main.cpp +++ b/main.cpp @@ -7,17 +7,17 @@ #include #include -#include +#include "range_expansion.h" #include #include #include -#include -#include -#include -#include -#include -#include +#include "rng.h" +#include +#include +#include +#include +#include using namespace std; using namespace boost::math; diff --git a/rng.h b/rng.h index 97f93f1..e113253 100644 --- a/rng.h +++ b/rng.h @@ -21,7 +21,7 @@ */ -#include +#include extern boost::mt19937 gen; // Declared externally in main.cpp so that it can be initialized there and called in random.cpp diff --git a/world.cpp b/world.cpp index be02cf3..3f4278f 100644 --- a/world.cpp +++ b/world.cpp @@ -6,8 +6,8 @@ #include #include #include -#include -#include +#include "range_expansion.h" +#include "rng.h" using namespace std; @@ -315,4 +315,4 @@ void World::ResetMutationOrigin() it->ResetMutationOrigin(); } -} \ No newline at end of file +}