summaryrefslogtreecommitdiff
path: root/src/fracture.h
diff options
context:
space:
mode:
authorJaron <jaron@kent-dobias.com>2016-11-08 08:17:26 -0500
committerJaron <jaron@kent-dobias.com>2016-11-08 08:17:26 -0500
commit0ad947f800bcbe2c488d2d5cbcdb16c46e6d3857 (patch)
tree225b77daf1eefbf38457696172b5b8cd6095b155 /src/fracture.h
parentbaae7b05b59917df132fde049a56357a09d45caa (diff)
downloadfuse_networks-0ad947f800bcbe2c488d2d5cbcdb16c46e6d3857.tar.gz
fuse_networks-0ad947f800bcbe2c488d2d5cbcdb16c46e6d3857.tar.bz2
fuse_networks-0ad947f800bcbe2c488d2d5cbcdb16c46e6d3857.zip
various changes, including adding central moments and changing the fuse thresholds to long doubles
Diffstat (limited to 'src/fracture.h')
-rw-r--r--src/fracture.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fracture.h b/src/fracture.h
index 0b078ff..f122869 100644
--- a/src/fracture.h
+++ b/src/fracture.h
@@ -72,7 +72,7 @@ typedef struct {
typedef struct {
const graph_t *graph;
bool *fuses;
- double *thres;
+ long double *thres;
double inf;
cholmod_dense *boundary_cond;
cholmod_factor *factor;
@@ -117,7 +117,7 @@ double dual_vert_to_coord(uint_t width, bool periodic, uint_t vert,
void factor_update(cholmod_factor *factor, uint_t v1, uint_t v2, cholmod_common *c);
void net_notch(net_t *net, double notch_len, cholmod_common *c);
-data_t *net_fracture(net_t *net, cholmod_common *c, double cutoff);
+data_t *net_fracture(net_t *net, cholmod_common *c, double cutoff, uint_t refactor_every);
double *net_voltages(const net_t *net, cholmod_common *c);
double *net_currents(const net_t *net, const double *voltages, cholmod_common *c);
double net_conductivity(const net_t *net, const double *voltages);
@@ -148,7 +148,7 @@ graph_t *ini_voro_graph(uint_t L, bound_t boundary, bool use_dual,
double *(*genfunc)(uint_t, bound_t, gsl_rng *, uint_t *),
cholmod_common *c);
-bool break_edge(net_t *instance, uint_t edge, cholmod_common *c);
+bool break_edge(net_t *instance, uint_t edge, cholmod_common *c, bool refactor);
void finish_instance(net_t *instance, cholmod_common *c);
@@ -183,4 +183,4 @@ bool set_connected(const cholmod_sparse *laplacian, uint_t *marks, int vertex, i
unsigned long int rand_seed();
-double rand_dist_pow(const gsl_rng *r, double beta);
+long double rand_dist_pow(const gsl_rng *r, double beta);