FYS3150/Project-4
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix mistake

Browse Source
This commit is contained in:
Cory Balaton
2023-12-05 19:02:44 +01:00
parent 5c32b363f2
commit e4baf0bbca
13 changed files with 2079921 additions and 1089921 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main.cpp
View File

@@ -22,25 +22,25 @@ void create_burn_in_time_data()
{
// Test burn-in time
montecarlo::progression(1.0, 20, 20000,
"../output/burn_in_time/unordered_1_0.txt");
"./data/hp/burn_in_time/unordered_1_0.txt");
montecarlo::progression(1.0, 20, 20000, 1,
"../output/burn_in_time/ordered_1_0.txt");
"./data/hp/burn_in_time/ordered_1_0.txt");
montecarlo::progression(2.4, 20, 20000,
"../output/burn_in_time/unordered_2_4.txt");
"./data/hp/burn_in_time/unordered_2_4.txt");
montecarlo::progression(2.4, 20, 20000, 1,
"../output/burn_in_time/ordered_2_4.txt");
"./data/hp/burn_in_time/ordered_2_4.txt");
}
/** @brief Create the data used to estimate the probability distribution
* for tempratures 1.0 anbd 2.4.
* for tempratures 1.0 and 2.4.
* */
void create_pd_estimate_data()
{
// Estimate pd
montecarlo::pd_estimate(1.0, 20, 1000000,
"../output/pd_estimate/estimate_1_0.txt");
"./data/hp/pd_estimate/estimate_1_0.txt");
montecarlo::pd_estimate(2.4, 20, 1000000,
"../output/pd_estimate/estimate_2_4.txt");
"./data/hp/pd_estimate/estimate_2_4.txt");
}
/** @brief Create data using the same parameters except one uses burn-in time,
@@ -50,10 +50,10 @@ void test_burn_in_time()
{
montecarlo::phase_transition(
100, 2.1, 2.4, 40, 1e5, montecarlo::mcmc_serial,
"../output/test_burn_in_time/burn_in.txt", 5000);
"./data/hp/test_burn_in_time/burn_in.txt", 5000);
montecarlo::phase_transition(
100, 2.1, 2.4, 40, 1e5, montecarlo::mcmc_serial,
"../output/test_burn_in_time/no_burn_in.txt", 0);
"./data/hp/test_burn_in_time/no_burn_in.txt", 0);
}
/** @brief Test how much Openmp speeds up.*/
@@ -88,19 +88,19 @@ void create_phase_transition_data()
// Phase transition
montecarlo::phase_transition(20, 2.1, 2.4, 40, 1e4,
montecarlo::mcmc_parallel,
"../output/phase_transition/size_20.txt");
"./data/hp/phase_transition/size_20.txt");
montecarlo::phase_transition(40, 2.1, 2.4, 40, 1e4,
montecarlo::mcmc_parallel,
"../output/phase_transition/size_40.txt");
"./data/hp/phase_transition/size_40.txt");
montecarlo::phase_transition(60, 2.1, 2.4, 40, 1e4,
montecarlo::mcmc_parallel,
"../output/phase_transition/size_60.txt");
"./data/hp/phase_transition/size_60.txt");
montecarlo::phase_transition(80, 2.1, 2.4, 40, 1e4,
montecarlo::mcmc_parallel,
"../output/phase_transition/size_80.txt");
"./data/hp/phase_transition/size_80.txt");
montecarlo::phase_transition(100, 2.1, 2.4, 40, 1e4,
montecarlo::mcmc_parallel,
"../output/phase_transition/size_100.txt");
"./data/hp/phase_transition/size_100.txt");
t1 = omp_get_wtime();
std::cout << "Time: " << t1 - t0 << std::endl;