From 5877cd7ed84f359615e42a511229c9c35387d0c9 Mon Sep 17 00:00:00 2001 From: pants Date: Tue, 22 Nov 2016 00:09:06 -0500 Subject: changed analysis functions to include additional character --- src/anal_process.c | 2 +- src/big_anal_process.c | 2 +- src/cen_anal_process.c | 2 +- src/fracture.c | 17 +++++++++-------- src/long_anal_process.c | 2 +- 5 files changed, 13 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/anal_process.c b/src/anal_process.c index 0ebec84..c434297 100644 --- a/src/anal_process.c +++ b/src/anal_process.c @@ -47,7 +47,7 @@ int main(int argc, char *argv[]) { char *fn = argv[1 + i]; char *buff = (char *)malloc(20 * sizeof(char)); uint_t pos = 0; uint_t c = 0; - while (c < 5) { + while (c < 6) { if (fn[pos] == '_') { c++; } diff --git a/src/big_anal_process.c b/src/big_anal_process.c index 0f7106f..f255f20 100644 --- a/src/big_anal_process.c +++ b/src/big_anal_process.c @@ -63,7 +63,7 @@ int main(int argc, char *argv[]) { char *fn = argv[1 + i]; char *buff = (char *)malloc(20 * sizeof(char)); uint_t pos = 0; uint_t c = 0; - while (c < 5) { + while (c < 6) { if (fn[pos] == '_') { c++; } diff --git a/src/cen_anal_process.c b/src/cen_anal_process.c index 98f68ac..7aad0e2 100644 --- a/src/cen_anal_process.c +++ b/src/cen_anal_process.c @@ -67,7 +67,7 @@ int main(int argc, char *argv[]) { char *fn = argv[1 + i]; char *buff = (char *)malloc(20 * sizeof(char)); uint_t pos = 0; uint_t c = 0; - while (c < 5) { + while (c < 6) { if (fn[pos] == '_') { c++; } diff --git a/src/fracture.c b/src/fracture.c index 6050182..5256eac 100644 --- a/src/fracture.c +++ b/src/fracture.c @@ -417,14 +417,6 @@ int main(int argc, char *argv[]) { thresholds[i] = net->thres[data->break_list[max_pos]]; } - if (save_cluster_dist) { - uint_t *tmp_cluster_dist = get_cluster_dist(net, &c); - for (uint_t j = 0; j < g->dnv; j++) { - cluster_size_dist[j] += tmp_cluster_dist[j]; - } - free(tmp_cluster_dist); - } - if (save_data) { for (uint_t j = 0; j < data->num_broken; j++) { @@ -462,6 +454,15 @@ int main(int argc, char *argv[]) { fclose(net_out); } + if (save_cluster_dist) { + uint_t *tmp_cluster_dist = get_cluster_dist(net, &c); + for (uint_t j = 0; j < g->dnv; j++) { + cluster_size_dist[j] += tmp_cluster_dist[j]; + } + free(tmp_cluster_dist); + } + + net_free(net, &c); graph_free(g, &c); } diff --git a/src/long_anal_process.c b/src/long_anal_process.c index ba29152..df2dc63 100644 --- a/src/long_anal_process.c +++ b/src/long_anal_process.c @@ -63,7 +63,7 @@ int main(int argc, char *argv[]) { char *fn = argv[1 + i]; char *buff = (char *)malloc(20 * sizeof(char)); uint_t pos = 0; uint_t c = 0; - while (c < 5) { + while (c < 6) { if (fn[pos] == '_') { c++; } -- cgit v1.2.3-70-g09d2