From 77584d5ab2182f5e9d9b8614b600b2e1ef08bb7f Mon Sep 17 00:00:00 2001 From: Jaron Kent-Dobias Date: Thu, 12 Oct 2017 16:18:11 -0400 Subject: made collection of data more standard and efficient --- lib/wolff_tools.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'lib/wolff_tools.c') diff --git a/lib/wolff_tools.c b/lib/wolff_tools.c index 7886bab..59d04fc 100644 --- a/lib/wolff_tools.c +++ b/lib/wolff_tools.c @@ -152,3 +152,26 @@ uint32_t wolff_step(double T, double H, ising_state_t *s, gsl_rng *r, return n_flips; } + +double add_to_avg(double mx, double x, uint64_t n) { + return mx * (n / (n + 1.)) + x * 1. / (n + 1.); +} + +void update_meas(meas_t *m, double x) { + uint64_t n = m->n; + + m->x = add_to_avg(m->x, x, n); + m->x2 = add_to_avg(m->x2, pow(x, 2), n); + + m->m2 = add_to_avg(m->m2, pow(x - m->x, 2), n); + m->m4 = add_to_avg(m->m4, pow(x - m->x, 4), n); + + if (n > 1) { + double s2 = n / (n - 1.) * (m->x2 - pow(m->x, 2)); + m->dx = sqrt(s2 / n); + m->c = s2; + m->dc = sqrt((m->m4 - (n - 3.)/(n - 1.) * pow(m->m2, 2)) / n); + } + + (m->n)++; +} -- cgit v1.2.3-70-g09d2