summaryrefslogtreecommitdiff
path: root/src/measurements.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/measurements.hpp')
-rw-r--r--src/measurements.hpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/measurements.hpp b/src/measurements.hpp
index 610c266..7c9d49c 100644
--- a/src/measurements.hpp
+++ b/src/measurements.hpp
@@ -35,6 +35,7 @@ class ma : public hooks {
// measurement storage
std::vector<uint64_t> sc; // non-spanning cluster size distribution
+ 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> sa; // non-final avalanche size distribution
@@ -56,11 +57,11 @@ class ma : public hooks {
public:
long double lv;
- std::list<std::list<graph::coordinate>> avalanches;
+ std::list<std::list<unsigned>> avalanches;
std::list<unsigned> last_avalanche;
std::string model_string;
- ma(double Lx, double Ly, unsigned Mx, unsigned My, double beta);
+ ma(unsigned Lx, unsigned Ly, double beta);
ma(unsigned n, double a, unsigned Mx, unsigned My, double beta);
~ma();