diff options
author | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2019-09-24 20:34:55 -0400 |
---|---|---|
committer | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2019-09-24 20:34:55 -0400 |
commit | 16f4e128ae1f1c5759c643f51c1f7e7bfa892dc4 (patch) | |
tree | d365183f1bdc56b6a88665391975005b957619e3 /src/fracture.cpp | |
parent | d9d3b0518ce5e0a52b9a0bae55fa5d8ca5b3c515 (diff) | |
download | fuse_networks-16f4e128ae1f1c5759c643f51c1f7e7bfa892dc4.tar.gz fuse_networks-16f4e128ae1f1c5759c643f51c1f7e7bfa892dc4.tar.bz2 fuse_networks-16f4e128ae1f1c5759c643f51c1f7e7bfa892dc4.zip |
fixed measurements for new paradigm
Diffstat (limited to 'src/fracture.cpp')
-rw-r--r-- | src/fracture.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/fracture.cpp b/src/fracture.cpp index 5ba60e2..b82abca 100644 --- a/src/fracture.cpp +++ b/src/fracture.cpp @@ -38,10 +38,9 @@ int main(int argc, char* argv[]) { unsigned n = 128; double a = 1.0; bool use_aN = false; - bool one_side = false; double w = 0.5; - while ((opt = getopt(argc, argv, "N:X:Y:b:n:a:w:o")) != -1) { + while ((opt = getopt(argc, argv, "N:X:Y:b:n:a:w:")) != -1) { switch (opt) { case 'N': N = (unsigned)atof(optarg); @@ -66,9 +65,6 @@ int main(int argc, char* argv[]) { case 'w': w = atof(optarg); break; - case 'o': - one_side = true; - break; default: exit(1); } @@ -81,7 +77,7 @@ int main(int argc, char* argv[]) { std::mt19937 rng{seeds}; if (use_aN) { - ma meas(n, a, beta, w, one_side); + ma meas(n, a, beta, w); for (unsigned trial = 0; trial < N; trial++) { while (true) { @@ -89,7 +85,7 @@ int main(int argc, char* argv[]) { graph G(n, a, rng); elastic_network fuse_network(G, &c, w); fuse_network.set_thresholds(beta, rng); - fuse_network.fracture(meas, one_side); + fuse_network.fracture(meas); break; } catch (std::exception &e) { std::cout << e.what() << '\n'; @@ -100,7 +96,7 @@ int main(int argc, char* argv[]) { break; } } else { - ma meas(Lx, Ly, beta, w, one_side); + ma meas(Lx, Ly, beta, w); for (unsigned trial = 0; trial < N; trial++) { while (true) { @@ -108,7 +104,7 @@ int main(int argc, char* argv[]) { graph G(Lx, Ly); elastic_network fuse_network(G, &c, w); fuse_network.set_thresholds(beta, rng); - fuse_network.fracture(meas, one_side); + fuse_network.fracture(meas); break; } catch (std::exception &e) { std::cout << e.what() << '\n'; |