diff options
| author | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2018-07-10 12:37:02 -0400 |
|---|---|---|
| committer | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2018-07-10 12:37:02 -0400 |
| commit | e53a4c09eb78e4c5a8365f1328a69ba7f9ff8992 (patch) | |
| tree | 3c252af9ffafacab8392bf864270dcd034ed07ed /lib/measurement.h | |
| parent | 609fb52b670d8ed74584a988b8c63da82d8d523b (diff) | |
| parent | 1810103bc9ac4c9a8d432d113f5ca6eae6560fb4 (diff) | |
| download | c++-e53a4c09eb78e4c5a8365f1328a69ba7f9ff8992.tar.gz c++-e53a4c09eb78e4c5a8365f1328a69ba7f9ff8992.tar.bz2 c++-e53a4c09eb78e4c5a8365f1328a69ba7f9ff8992.zip | |
Merge branch 'master' of m5:/srv/git/wolff
Diffstat (limited to 'lib/measurement.h')
| -rw-r--r-- | lib/measurement.h | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/lib/measurement.h b/lib/measurement.h index 46c034f..d9bd52e 100644 --- a/lib/measurement.h +++ b/lib/measurement.h @@ -3,16 +3,21 @@ #include <math.h> #include <stdlib.h> +#include <stdio.h> #include "types.h" #include "stack.h" typedef struct { - uint64_t n; + count_t n; double x; double x2; + double x4; double m2; double m4; + count_t W; + double *xx; + dll_t *x_window; } meas_t; typedef struct { @@ -24,11 +29,6 @@ typedef struct { double O2; } autocorr_t; -typedef struct { - void (*f)(state_finite_t *, void *); - void *data; -} measurement_t; - void meas_update(meas_t *m, double x); double meas_dx(const meas_t *m); @@ -41,3 +41,14 @@ void update_autocorr(autocorr_t *OO, double O); double rho(const autocorr_t *o, uint64_t i); +void print_meas(const meas_t *m, const char *sym, FILE *outfile); +void print_vec_meas(q_t q, const meas_t **m, const char *sym, FILE *outfile); + +void free_meas(meas_t *m); + +meas_t *meas_initialize(count_t W); + +double get_tau(const meas_t *m); + +double Cxx(const meas_t *m, count_t t); + |