diff options
| author | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2019-02-08 12:20:56 -0500 |
|---|---|---|
| committer | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2019-02-08 12:20:56 -0500 |
| commit | c80bee0ea904d06c0ecfedb407bc018ba506cbe8 (patch) | |
| tree | a32b3b4e79d08fd1632d26d55e43d6200dd9a1fb /src/measurements.hpp | |
| parent | e500d46fa8276d8a93eb3f21da7c02879ee8094e (diff) | |
| download | fuse_networks-c80bee0ea904d06c0ecfedb407bc018ba506cbe8.tar.gz fuse_networks-c80bee0ea904d06c0ecfedb407bc018ba506cbe8.tar.bz2 fuse_networks-c80bee0ea904d06c0ecfedb407bc018ba506cbe8.zip | |
revised measurements to bin correctly, renamed some. not compatible with earlier measurements!
Diffstat (limited to 'src/measurements.hpp')
| -rw-r--r-- | src/measurements.hpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/measurements.hpp b/src/measurements.hpp index aca6dce..1d263c3 100644 --- a/src/measurements.hpp +++ b/src/measurements.hpp @@ -35,26 +35,23 @@ class ma : public hooks { // std::ofstream stress_file; // measurement storage - std::vector<uint64_t> sc; // cluster size distribution - std::vector<uint64_t> sa; // avalanche size distribution - std::vector<uint64_t> ss; // avalanche size distribution - std::vector<uint64_t> sC; // cluster size distribution - std::vector<uint64_t> sA; // avalanche size distribution - std::vector<uint64_t> sd; // avalanche size distribution - std::vector<uint64_t> sD; // avalanche size distribution + std::vector<uint64_t> sc; // non-spanning cluster size distribution + std::vector<uint64_t> ss; // minimal spanning cluster size distribution + std::vector<uint64_t> sm; // spanning cluster size distribution + std::vector<uint64_t> sa; // non-final avalanche size distribution + std::vector<uint64_t> sl; // final avalanche size distribution + std::vector<uint64_t> sd; // pre-fracture damage distribution + std::vector<uint64_t> sD; // post-fracture damage distribution std::vector<std::vector<uint64_t>> Ccc; // cluster-cluster correlations std::vector<std::vector<uint64_t>> Css; // surface-surface correlations std::vector<std::vector<uint64_t>> Cmm; // surface-surface correlations std::vector<std::vector<uint64_t>> Caa; // avalanche-avalanche correlations - std::vector<std::vector<uint64_t>> Cdd; // damage-damage distribution std::vector<std::vector<uint64_t>> Cll; // damage-damage distribution - std::vector<std::vector<uint64_t>> Cee; // damage-damage distribution + std::vector<std::vector<uint64_t>> Cdd; // damage-damage distribution std::vector<std::vector<uint64_t>> CDD; // damage-damage distribution std::vector<std::vector<uint64_t>> CsD; // damage-damage distribution uint64_t Nc; - uint64_t NC; uint64_t Na; - uint64_t NA; public: long double lv; |