Skip to content

fixed #1 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KamilSJaron wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed #1 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions deme.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
16 changes: 8 additions & 8 deletions individual.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -346,4 +346,4 @@ void Individual::ResetMutationOrigin()
fill_n(mb_front[1].begin(),loci,0);


}
}
14 changes: 7 additions & 7 deletions main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion rng.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions world.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -315,4 +315,4 @@ void World::ResetMutationOrigin()
it->ResetMutationOrigin();
}

}
}