summaryrefslogtreecommitdiff
path: root/src/measurements.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/measurements.cpp')
-rw-r--r--src/measurements.cpp13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/measurements.cpp b/src/measurements.cpp
index 984b80c..3004d7e 100644
--- a/src/measurements.cpp
+++ b/src/measurements.cpp
@@ -144,7 +144,6 @@ unsigned edge_r_to_ind(graph::coordinate r, double Lx, double Ly, unsigned Mx, u
}
ma::ma(unsigned n, double a, double beta, double weight, bool one) :
- G(2 * n),
sn(2 * n),
ss(2 * n),
sm(2 * n),
@@ -179,7 +178,6 @@ ma::ma(unsigned n, double a, double beta, double weight, bool one) :
}
ma::ma(unsigned Lx, unsigned Ly, double beta, double weight, bool one) :
- G(Lx * Ly / 2),
sn(Lx * Ly / 2),
ss(Lx * Ly / 2),
sm(Lx * Ly / 2),
@@ -228,7 +226,6 @@ ma::~ma() {
void ma::pre_fracture(const network&) {
lv = std::numeric_limits<long double>::lowest();
- boost::remove_edge_if(trivial, G);
avalanches = {};
num = 0;
}
@@ -250,14 +247,11 @@ void ma::bond_broken(const network& net, const current_info& cur, unsigned i) {
}
}
- boost::add_edge(net.G.dual_edges[i].v[0], net.G.dual_edges[i].v[1], {i}, G);
num++;
}
void ma::post_fracture(network &n) {
- auto post_cracks = find_minimal_crack(G, n);
- std::vector<unsigned> component(boost::num_vertices(G));
- unsigned num = boost::connected_components(G, &component[0]);
+/* auto post_cracks = find_minimal_crack(G, n);
if (post_cracks.size() > 2 || post_cracks.size() == 0) {
throw badcycleex;
}
@@ -271,10 +265,6 @@ void ma::post_fracture(network &n) {
autocorrelation2(n.G.L.x, n.G.L.y, 2 * sqrt(cl.size()), 2 * sqrt(cl.size()), cl, cl_cs, c.first);
}
- unsigned crack_component = component[n.G.dual_edges[post_cracks.front().second.front()].v[0]];
-
- std::vector<std::list<graph::coordinate>> components(num);
-
for (unsigned i = 0; i < n.G.dual_vertices.size(); i++) {
components[component[i]].push_back(n.G.dual_vertices[i].r);
}
@@ -336,6 +326,7 @@ void ma::post_fracture(network &n) {
}
autocorrelation2(n.G.L.x, n.G.L.y, 2 * sqrt(cA.size()), 2 * sqrt(cA.size()), cA, cA_co, post_cracks.front().first);
+*/
sd[num - 1]++;
}