summaryrefslogtreecommitdiff
path: root/src/measurements.hpp
diff options
context:
space:
mode:
authorJaron Kent-Dobias <jaron@kent-dobias.com>2019-03-13 18:08:19 -0400
committerJaron Kent-Dobias <jaron@kent-dobias.com>2019-03-13 18:08:19 -0400
commitaad91479b4e32ca090d7cf36e5b3b30d5458a7f4 (patch)
treead3f1620c217065162bb30406607e656e846360b /src/measurements.hpp
parent67a11a04b1a16767e6ed30ed022ed9a0d3b07f76 (diff)
downloadfuse_networks-aad91479b4e32ca090d7cf36e5b3b30d5458a7f4.tar.gz
fuse_networks-aad91479b4e32ca090d7cf36e5b3b30d5458a7f4.tar.bz2
fuse_networks-aad91479b4e32ca090d7cf36e5b3b30d5458a7f4.zip
now measuring clusters before last avalanche
Diffstat (limited to 'src/measurements.hpp')
-rw-r--r--src/measurements.hpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/measurements.hpp b/src/measurements.hpp
index 600c6ac..610c266 100644
--- a/src/measurements.hpp
+++ b/src/measurements.hpp
@@ -39,21 +39,25 @@ class ma : public hooks {
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> sb; // final avalanche size distribution
std::vector<uint64_t> sD; // post-fracture damage 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> cll; // damage-damage distribution
+ std::vector<uint64_t> cbb; // damage-damage distribution
std::vector<uint64_t> cDD; // damage-damage distribution
std::vector<uint64_t> csD; // damage-damage distribution
uint64_t Nc;
uint64_t Na;
+ uint64_t Nb;
public:
long double lv;
std::list<std::list<graph::coordinate>> avalanches;
+ std::list<unsigned> last_avalanche;
std::string model_string;
ma(double Lx, double Ly, unsigned Mx, unsigned My, double beta);