From 54e4d9243d196def7d1038ced2b10925e8b0ad1f Mon Sep 17 00:00:00 2001 From: Cory Date: Mon, 4 Dec 2023 13:28:14 +0100 Subject: [PATCH] Fix burn-in time bug --- src/monte_carlo.cpp | 4 ++-- src/phase_transition.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/monte_carlo.cpp b/src/monte_carlo.cpp index 1cbcc8a..542ffb5 100644 --- a/src/monte_carlo.cpp +++ b/src/monte_carlo.cpp @@ -124,7 +124,7 @@ data_t mcmc_serial(int L, double T, int cycles, int burn_in_time) data_t data; IsingModel model(L, T); - for (size_t i = 0; i < BURN_IN_TIME; i++) { + for (size_t i = 0; i < burn_in_time; i++) { model.Metropolis(); } @@ -148,7 +148,7 @@ data_t mcmc_parallel(int L, double T, int cycles, int burn_in_time) // Each thread runs the Metropolis algorithm before starting to collect // samples - for (size_t i = 0; i < BURN_IN_TIME; i++) { + for (size_t i = 0; i < burn_in_time; i++) { model.Metropolis(); } diff --git a/src/phase_transition.cpp b/src/phase_transition.cpp index 8df0e55..f829405 100644 --- a/src/phase_transition.cpp +++ b/src/phase_transition.cpp @@ -24,8 +24,8 @@ void usage(std::string filename) { std::cout << "Usage: " << filename - << " " - " \n\n" + << " " + " \n\n" << "\t[ -h | --help ]\n"; exit(-1); } @@ -76,7 +76,7 @@ int main(int argc, char **argv) std::string outfile = argv[7]; montecarlo::phase_transition(L, start, end, points, cycles, - montecarlo::mcmc_parallel, outfile); + montecarlo::mcmc_parallel, outfile, burn_in_time); t1 = omp_get_wtime();