From 386856afbb6ca347221c13cd606e25b204317929 Mon Sep 17 00:00:00 2001
From: Jaron Kent-Dobias <jaron@kent-dobias.com>
Date: Wed, 14 Nov 2018 14:25:21 -0500
Subject: a lot of cleaning and simplification

---
 src/measurements.hpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/measurements.hpp')

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;
 };
 
-- 
cgit v1.2.3-54-g00ecf