diff options
| author | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2018-11-12 10:52:17 -0500 |
|---|---|---|
| committer | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2018-11-12 10:52:17 -0500 |
| commit | 7984b8dbde1d44fc18b6026693c387d2d433872d (patch) | |
| tree | cb7575c35be8a160ebe022aa0fd81c018d12cc6a /src/measurements.hpp | |
| parent | b8772d61229a68cf231286128d079ad9c7310357 (diff) | |
| download | fuse_networks-7984b8dbde1d44fc18b6026693c387d2d433872d.tar.gz fuse_networks-7984b8dbde1d44fc18b6026693c387d2d433872d.tar.bz2 fuse_networks-7984b8dbde1d44fc18b6026693c387d2d433872d.zip | |
changes
Diffstat (limited to 'src/measurements.hpp')
| -rw-r--r-- | src/measurements.hpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/measurements.hpp b/src/measurements.hpp index 4c05d93..621c425 100644 --- a/src/measurements.hpp +++ b/src/measurements.hpp @@ -2,6 +2,7 @@ #include <vector> #include <algorithm> #include <cmath> +#include <cstring> #include <list> #include <fstream> #include <string> @@ -49,8 +50,11 @@ class ma : public hooks { std::vector<uint64_t> sb; // bin size distribution std::vector<uint64_t> Ccc; // cluster-cluster correlations std::vector<uint64_t> Css; // surface-surface correlations + std::vector<uint64_t> Cmm; // surface-surface correlations std::vector<uint64_t> Caa; // avalanche-avalanche correlations std::vector<uint64_t> Cdd; // damage-damage distribution + std::vector<uint64_t> Cll; // damage-damage distribution + std::vector<uint64_t> Cee; // damage-damage distribution uint64_t Nc; uint64_t Na; @@ -61,7 +65,7 @@ class ma : public hooks { double beta; - std::list<unsigned int> avalanche; + std::list<std::list<unsigned int>> avalanches; ma(unsigned int N, unsigned int L, double beta); ~ma(); |