diff options
Diffstat (limited to 'lib/wolff.h')
| -rw-r--r-- | lib/wolff.h | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/lib/wolff.h b/lib/wolff.h index eb357c7..21e88d9 100644 --- a/lib/wolff.h +++ b/lib/wolff.h @@ -3,33 +3,26 @@ #include "state.h" template <class R_t, class X_t> -void wolff(count_t N, D_t D, L_t L, double T, std::function <double(X_t, X_t)> J, std::function <double(X_t)> H, std::function <R_t(gsl_rng *, const state_t <R_t, X_t> *)> gen_R, unsigned int n_measurements, std::function <void(const state_t <R_t, X_t> *)> *measurements, bool silent) { - - state_t <R_t, X_t> s(D, L, T, J, H); - - // initialize random number generator - gsl_rng *r = gsl_rng_alloc(gsl_rng_mt19937); - gsl_rng_set(r, rand_seed()); +void wolff(count_t N, state_t <R_t, X_t> *s, std::function <R_t(gsl_rng *, const state_t <R_t, X_t> *)> gen_R, unsigned int n_measurements, std::function <void(const state_t <R_t, X_t> *)> *measurements, gsl_rng *r, bool silent) { if (!silent) printf("\n"); for (count_t steps = 0; steps < N; steps++) { - if (!silent) printf("\033[F\033[JWOLFF: sweep %" PRIu64 " / %" PRIu64 ": E = %.2f, S = %" PRIv "\n", steps, N, s.E, s.last_cluster_size); + if (!silent) printf("\033[F\033[JWOLFF: step %" PRIu64 " / %" PRIu64 ": E = %.2f, S = %" PRIv "\n", steps, N, s->E, s->last_cluster_size); - v_t v0 = gsl_rng_uniform_int(r, s.nv); - R_t step = gen_R(r, &s); - flip_cluster <R_t, X_t> (&s, v0, step, r); + v_t v0 = gsl_rng_uniform_int(r, s->nv); + R_t step = gen_R(r, s); + flip_cluster <R_t, X_t> (s, v0, step, r); free_spin(step); for (unsigned int i = 0; i < n_measurements; i++) { - measurements[i](&s); + measurements[i](s); } } if (!silent) { printf("\033[F\033[J"); } - printf("WOLFF: sweep %" PRIu64 " / %" PRIu64 ": E = %.2f, S = %" PRIv "\n", N, N, s.E, s.last_cluster_size); + printf("WOLFF: step %" PRIu64 " / %" PRIu64 ": E = %.2f, S = %" PRIv "\n", N, N, s->E, s->last_cluster_size); - gsl_rng_free(r); } |