From 4d504d330fa74485064569bc7f6b49529c5cc54f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20S=20Jaro=C5=88?= <376090@mail.muni.cz>
Date: Fri, 14 Oct 2016 16:03:34 +0200
Subject: [PATCH] slashes in path to boost corrected, include <rng.h> corrected
 to \"rng.h\", basic makefile created

---
 Makefile       |  3 +++
 deme.cpp       |  4 ++--
 individual.cpp | 16 ++++++++--------
 main.cpp       | 14 +++++++-------
 rng.h          |  2 +-
 world.cpp      |  6 +++---
 6 files changed, 24 insertions(+), 21 deletions(-)
 create mode 100644 Makefile

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 <math.h>
 #include <vector>
 #include <list>
-#include <range_expansion.h>
-#include <rng.h>
+#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 <math.h>
 #include <vector>
 #include <list>
-#include <range_expansion.h>
-#include <rng.h>
+#include "range_expansion.h"
+#include "rng.h"
 
-#include <boost\math\special_functions\binomial.hpp>
-#include <boost\random\linear_congruential.hpp>
-#include <boost\random\uniform_real.hpp>
-#include <boost\random\variate_generator.hpp>
-#include <boost\random\mersenne_twister.hpp>
+#include <boost/math/special_functions/binomial.hpp>
+#include <boost/random/linear_congruential.hpp>
+#include <boost/random/uniform_real.hpp>
+#include <boost/random/variate_generator.hpp>
+#include <boost/random/mersenne_twister.hpp>
 
 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 <cstdlib>
 #include <iostream> 
-#include <range_expansion.h>
+#include "range_expansion.h"
 #include <fstream>
 #include <string>
 
 #include <time.h>
-#include <rng.h>
-#include <boost\math\special_functions\binomial.hpp>
-#include <boost\random\linear_congruential.hpp>
-#include <boost\random\uniform_real.hpp>
-#include <boost\random\variate_generator.hpp>
-#include <boost\random\mersenne_twister.hpp>
+#include "rng.h"
+#include <boost/math/special_functions/binomial.hpp>
+#include <boost/random/linear_congruential.hpp>
+#include <boost/random/uniform_real.hpp>
+#include <boost/random/variate_generator.hpp>
+#include <boost/random/mersenne_twister.hpp>
 
 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 <boost\random.hpp>
+#include <boost/random.hpp>
 
 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 <math.h>
 #include <vector>
 #include <list>
-#include <range_expansion.h>
-#include <rng.h>
+#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
+}