From 4c4ebb87ead363d6d6e11a8b95b07a0f93af5c88 Mon Sep 17 00:00:00 2001 From: pants Date: Tue, 6 Sep 2016 15:05:27 -0400 Subject: finished implementing embedded systems, refactored a bunch --- src/fracture_network.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/fracture_network.c') diff --git a/src/fracture_network.c b/src/fracture_network.c index 3f06104..428b092 100644 --- a/src/fracture_network.c +++ b/src/fracture_network.c @@ -1,9 +1,9 @@ #include "fracture.h" -int inc_break_fuses(finst *instance, double *thres, double *field, +int inc_break_fuses(net_t *instance, double *thres, double *field, double cutoff) { - unsigned int size = (instance->network)->num_edges; + unsigned int size = (instance->graph)->ne; int min_pos = -1; long double min_val = -1; @@ -20,12 +20,12 @@ int inc_break_fuses(finst *instance, double *thres, double *field, return min_pos; } -break_data *fracture_network(finst *instance, double *fuse_thres, +data_t *fracture_network(net_t *instance, double *fuse_thres, cholmod_common *c, double cutoff) { - unsigned int num_edges = instance->network->num_edges; - unsigned int num_verts = instance->network->num_verts; + unsigned int num_edges = instance->graph->ne; + unsigned int num_verts = instance->graph->nv; - break_data *breaking_data = alloc_break_data(num_edges); + data_t *breaking_data = alloc_break_data(num_edges); while (true) { double *voltages = get_voltage(instance, c); @@ -53,11 +53,11 @@ break_data *fracture_network(finst *instance, double *fuse_thres, break_edge(instance, last_broke, c); - if (instance->num_components > 1 && instance->network->boundary == TORUS_BOUND) { + if (instance->num_components > 1 && instance->graph->boundary == TORUS_BOUND) { break; } - if (instance->marks[num_verts] != instance->marks[num_verts + 1] && instance->network->boundary != TORUS_BOUND) { + if (instance->marks[num_verts] != instance->marks[num_verts + 1] && instance->graph->boundary != TORUS_BOUND) { break; } } -- cgit v1.2.3-70-g09d2