summaryrefslogtreecommitdiff
path: root/src/measurements.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/measurements.hpp')
-rw-r--r--src/measurements.hpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/measurements.hpp b/src/measurements.hpp
index 621c425..ab31ccd 100644
--- a/src/measurements.hpp
+++ b/src/measurements.hpp
@@ -41,6 +41,9 @@ class ma : public hooks {
double *fftw_reverse_out;
fftw_plan forward_plan;
fftw_plan reverse_plan;
+ unsigned int N;
+ unsigned int L;
+ double beta;
Graph G;
// measurement storage
@@ -59,19 +62,16 @@ class ma : public hooks {
uint64_t Na;
public:
- unsigned int N;
- unsigned int L;
double lv;
- double beta;
std::list<std::list<unsigned int>> avalanches;
- ma(unsigned int N, unsigned int L, double beta);
+ ma(unsigned int L, double beta);
~ma();
void pre_fracture(const network &) override;
- void bond_broken(const network& net, const std::pair<double, std::vector<double>>& cur, unsigned int i) override;
+ void bond_broken(const network& net, const current_info& cur, unsigned int i) override;
void post_fracture(network &n) override;
};