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/correlations.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'src/correlations.c') diff --git a/src/correlations.c b/src/correlations.c index bd05daf..4fc44ac 100644 --- a/src/correlations.c +++ b/src/correlations.c @@ -197,11 +197,11 @@ void fib_decreasekey(fibh *heap, unsigned int value, } } -unsigned int *dijkstra(fnet *network, unsigned int source) { - unsigned int nv = network->num_dual_verts; - unsigned int *vei = network->dual_verts_to_edges_ind; - unsigned int *ve = network->dual_verts_to_edges; - unsigned int *ev = network->dual_edges_to_verts; +unsigned int *dijkstra(graph_t *network, unsigned int source) { + unsigned int nv = network->dnv; + unsigned int *vei = network->dvei; + unsigned int *ve = network->dve; + unsigned int *ev = network->dev; unsigned int *dist = (unsigned int *)calloc(nv, sizeof(unsigned int)); fibh *Q = (fibh *)calloc(1, sizeof(fibh)); @@ -236,8 +236,8 @@ unsigned int *dijkstra(fnet *network, unsigned int source) { return dist; } -unsigned int **get_dists(fnet *network) { - unsigned int nv = network->num_dual_verts; +unsigned int **get_dists(graph_t *network) { + unsigned int nv = network->dnv; unsigned int **dists = (unsigned int **)malloc(nv * sizeof(unsigned int *)); #pragma omp parallel for @@ -248,13 +248,13 @@ unsigned int **get_dists(fnet *network) { return dists; } -double *get_corr(finst *instance, unsigned int **dists, cholmod_common *c) { - unsigned int nv = instance->network->num_dual_verts; - unsigned int ne = instance->network->num_edges; - unsigned int *ev = instance->network->dual_edges_to_verts; +double *get_corr(net_t *instance, unsigned int **dists, cholmod_common *c) { + unsigned int nv = instance->graph->dnv; + unsigned int ne = instance->graph->ne; + unsigned int *ev = instance->graph->dev; bool nulldists = false; if (dists == NULL) { - dists = get_dists(instance->network); + dists = get_dists(instance->graph); nulldists = true; } double *corr = calloc(nv, sizeof(double)); @@ -296,11 +296,11 @@ double *get_corr(finst *instance, unsigned int **dists, cholmod_common *c) { } /* -double *get_space_corr(finst *instance, cholmod_common *c) { - unsigned int nv = instance->network->num_dual_verts; - double *vc = instance->network->dual_vert_coords; - unsigned int ne = instance->network->num_edges; - unsigned int *ev = instance->network->dual_edges_to_verts; +double *get_space_corr(net_t *instance, cholmod_common *c) { + unsigned int nv = instance->graph->dnv; + double *vc = instance->graph->dual_vert_coords; + unsigned int ne = instance->graph->ne; + unsigned int *ev = instance->graph->dev; double *corr = calloc(nv, sizeof(unsigned int)); unsigned int *numat = calloc(nv, sizeof(unsigned int)); -- cgit v1.2.3-70-g09d2