diff options
| author | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2017-01-16 01:31:10 -0500 |
|---|---|---|
| committer | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2017-01-16 01:31:10 -0500 |
| commit | 1e1fdfc2e3892667bccaf317a01defd8832041c7 (patch) | |
| tree | cc5ef9adbfe4a8f11744f4b7afd23a37cfdd74d4 /src/net_fracture.c | |
| parent | 57857b9ebfb2c0a78c2eb1128d3fb4ed8d597ec4 (diff) | |
| download | fuse_networks-1e1fdfc2e3892667bccaf317a01defd8832041c7.tar.gz fuse_networks-1e1fdfc2e3892667bccaf317a01defd8832041c7.tar.bz2 fuse_networks-1e1fdfc2e3892667bccaf317a01defd8832041c7.zip | |
fixed voltage and torus conditions, current and free boundaries and broken right now
Diffstat (limited to 'src/net_fracture.c')
| -rw-r--r-- | src/net_fracture.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/net_fracture.c b/src/net_fracture.c index 71e8c4b..e7f18fc 100644 --- a/src/net_fracture.c +++ b/src/net_fracture.c @@ -38,7 +38,7 @@ data_t *net_fracture(net_t *net, cholmod_common *c, double cutoff) { double conductivity = net_conductivity(net, voltages); - if (conductivity < 1e-12 && net->graph->boundary == TORUS_BOUND) { + if (conductivity < cutoff) { free(voltages); free(currents); break; @@ -60,14 +60,6 @@ data_t *net_fracture(net_t *net, cholmod_common *c, double cutoff) { free(currents); break_edge(net, last_broke, c); - - if (net->num_components > 1 && net->graph->boundary == TORUS_BOUND) { - break; - } - - if (net->marks[net->graph->nv] != net->marks[net->graph->nv + 1] && net->graph->boundary != TORUS_BOUND) { - break; - } } return data; |