automated a field class

1 files changed, 19 insertions, 2 deletions

diff --git a/src/measurements.hpp b/src/measurements.hpp
index 7bc8137..18b2e8e 100644
--- a/src/measurements.hpp
+++ b/src/measurements.hpp
@@ -12,6 +12,24 @@
 
 #include "analysis_tools.hpp"
 
+class RealField {
+  public:
+    coordinate L;
+    std::array<unsigned, 2> M;
+    std::vector<long unsigned> N;
+    std::vector<double> F;
+
+    RealField(coordinate L, std::array<unsigned, 2> M) : L(L), M(M), N(M[0] * M[1], 0), F(M[0] * M[1], 0.0) {}
+
+    void add(coordinate r, double x) {
+      unsigned ind = (unsigned)floor(M[1] * (r.y / L.y)) + M[1] *
+        (unsigned)floor(M[0] * (r.x / L.x));
+      N[ind]++;
+      F[ind] += x;
+    }
+
+};
+
 class ma : public hooks {
   // need:
   //  - interface for turning on and off specific measurements
@@ -55,8 +73,7 @@ class ma : public hooks {
     std::vector<uint64_t> cq;
 
     std::list<std::array<double, 2>> aG;
-    std::vector<double> cS;
-    std::vector<uint64_t> NS;
+    RealField fS;
     std::vector<uint64_t> sp;
 
     ClusterTree last_clusters;