diff options
Diffstat (limited to 'src/measurements.hpp')
-rw-r--r-- | src/measurements.hpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/measurements.hpp b/src/measurements.hpp index ebf79e5..14e6580 100644 --- a/src/measurements.hpp +++ b/src/measurements.hpp @@ -21,46 +21,61 @@ class ma : public hooks { unsigned My; unsigned num; uint64_t Nc; + uint64_t NC; uint64_t Nl; uint64_t Nm; uint64_t Ns; uint64_t Nn; uint64_t Nb; uint64_t Na; + uint64_t Ne; uint64_t NA; + uint64_t NE; uint64_t Nq; // measurement storage std::vector<uint64_t> sc; + std::vector<uint64_t> sC; std::vector<uint64_t> sn; // 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> sl; // final avalanche size distribution std::vector<uint64_t> sb; // final avalanche size distribution std::vector<uint64_t> sd; // final avalanche size distribution + std::vector<uint64_t> sD; // final avalanche size distribution + std::vector<uint64_t> sf; // final avalanche size distribution std::vector<uint64_t> sa; // non-final avalanche size distribution std::vector<uint64_t> sA; // non-final avalanche size distribution + std::vector<uint64_t> se; // non-final avalanche size distribution + std::vector<uint64_t> sE; // non-final avalanche size distribution std::vector<uint64_t> si; std::vector<uint64_t> sI; std::vector<uint64_t> cc; + std::vector<uint64_t> cC; std::vector<uint64_t> cn; std::vector<uint64_t> cs; std::vector<uint64_t> cm; std::vector<uint64_t> cl; std::vector<uint64_t> cb; std::vector<uint64_t> ca; + std::vector<uint64_t> ce; std::vector<uint64_t> cA; + std::vector<uint64_t> cE; std::vector<uint64_t> cq; ClusterTree last_clusters; + ClusterTree last_clusters_v; public: + long double lc; long double lv; std::list<std::list<unsigned>> avalanches; + std::list<std::list<unsigned>> evalanches; std::list<unsigned> last_avalanche; + std::list<unsigned> last_evalanche; std::string model_string; ma(unsigned Lx, unsigned Ly, double beta, double w); |