added animation example, and did many fixes to the voronoi system

1 files changed, 4 insertions, 20 deletions

diff --git a/src/measurements.hpp b/src/measurements.hpp
index 2bc5bae..685806b 100644
--- a/src/measurements.hpp
+++ b/src/measurements.hpp
@@ -1,34 +1,18 @@
 
-#include <vector>
-#include <algorithm>
-#include <cmath>
 #include <cstring>
-#include <list>
 #include <fstream>
 #include <string>
 #include <cinttypes>
 #include <sstream>
 #include <functional>
 #include <iostream>
-#include <valarray>
 #include <array>
 
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/connected_components.hpp>
-#include <boost/graph/depth_first_search.hpp>
-#include <boost/range/combine.hpp>
-#include <boost/foreach.hpp>
-
 #include <fftw3.h>
 
-#include <network.hpp>
 #include <hooks.hpp>
 
-struct EdgeProperties {
-  unsigned int index;
-};
-
-typedef boost::adjacency_list<boost::listS, boost::vecS, boost::undirectedS, boost::no_property, EdgeProperties> Graph;
+#include "analysis_tools.hpp"
 
 class ma : public hooks {
   // need:
@@ -44,6 +28,8 @@ class ma : public hooks {
     unsigned int N;
     unsigned int Lx;
     unsigned int Ly;
+    unsigned int Mx;
+    unsigned int My;
     double beta;
     Graph G;
     
@@ -62,15 +48,13 @@ class ma : public hooks {
     uint64_t Nc;
     uint64_t Na;
 
-    std::ofstream bondfile;
-
   public:
     long double lv;
 
 
     std::list<std::list<unsigned int>> avalanches;
 
-    ma(unsigned int Lx, unsigned int Ly, double beta);
+    ma(unsigned int Lx, unsigned int Ly, unsigned int Mx, unsigned int My, double beta);
     ~ma();
 
     void pre_fracture(const network &) override;