From f8321b4b89e114dffc02b4741785fdca60f1b31e Mon Sep 17 00:00:00 2001
From: Jaron Kent-Dobias <jaron@kent-dobias.com>
Date: Tue, 11 Jun 2019 00:11:51 -0400
Subject: fixed manny of the research tools

---
 src/perc_meas.hpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'src/perc_meas.hpp')

diff --git a/src/perc_meas.hpp b/src/perc_meas.hpp
index e310189..e2357db 100644
--- a/src/perc_meas.hpp
+++ b/src/perc_meas.hpp
@@ -23,26 +23,22 @@ typedef boost::graph_traits<Graph>::vertices_size_type VertexIndex;
 
 class pm : public hooks {
   private:
-    unsigned p;
     unsigned r;
-    long double last_thres;
+    current_info last_cur;
     Graph G;
     std::vector<VertexIndex> rank;
     std::vector<Vertex> parent;
     boost::disjoint_sets<VertexIndex*, Vertex*> ds;
 
     // measurement storage
-    std::vector<uint64_t> sc; // non-spanning cluster size distribution
     std::vector<std::vector<uint64_t>> sn; // non-spanning cluster size distribution
-    std::vector<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<std::vector<uint64_t>> sb; // final avalanche size distribution
-    std::vector<std::vector<uint64_t>> sB; // final avalanche size distribution
-    std::vector<uint64_t> sp;
+    std::vector<uint64_t> sd;
     std::vector<uint64_t> sr;
-    std::vector<std::vector<uint64_t>> sf; // final avalanche size distribution
+    std::vector<unsigned> sb_tmp;
 
   public:
     std::string model_string;
-- 
cgit v1.2.3-70-g09d2