diff options
| author | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2018-11-14 14:25:21 -0500 |
|---|---|---|
| committer | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2018-11-14 14:25:21 -0500 |
| commit | 386856afbb6ca347221c13cd606e25b204317929 (patch) | |
| tree | 601f24b5537330781fba01941488378fcae614e9 /src/measurements.hpp | |
| parent | 7984b8dbde1d44fc18b6026693c387d2d433872d (diff) | |
| download | fuse_networks-386856afbb6ca347221c13cd606e25b204317929.tar.gz fuse_networks-386856afbb6ca347221c13cd606e25b204317929.tar.bz2 fuse_networks-386856afbb6ca347221c13cd606e25b204317929.zip | |
a lot of cleaning and simplification
Diffstat (limited to 'src/measurements.hpp')
| -rw-r--r-- | src/measurements.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/measurements.hpp b/src/measurements.hpp index 621c425..ab31ccd 100644 --- a/src/measurements.hpp +++ b/src/measurements.hpp @@ -41,6 +41,9 @@ class ma : public hooks { double *fftw_reverse_out; fftw_plan forward_plan; fftw_plan reverse_plan; + unsigned int N; + unsigned int L; + double beta; Graph G; // measurement storage @@ -59,19 +62,16 @@ class ma : public hooks { uint64_t Na; public: - unsigned int N; - unsigned int L; double lv; - double beta; std::list<std::list<unsigned int>> avalanches; - ma(unsigned int N, unsigned int L, double beta); + ma(unsigned int L, double beta); ~ma(); void pre_fracture(const network &) override; - void bond_broken(const network& net, const std::pair<double, std::vector<double>>& cur, unsigned int i) override; + void bond_broken(const network& net, const current_info& cur, unsigned int i) override; void post_fracture(network &n) override; }; |