From 6a084cc764c95e2d371b60a7ddc60bc932633b92 Mon Sep 17 00:00:00 2001 From: Michael Tryby Date: Fri, 19 Apr 2019 22:35:15 -0400 Subject: [PATCH] Update inpfile.c Trying to isolate bug --- src/inpfile.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/inpfile.c b/src/inpfile.c index 89915a1..a36bc67 100644 --- a/src/inpfile.c +++ b/src/inpfile.c @@ -121,8 +121,8 @@ void saveauxdata(Project *pr, FILE *f) InFile = NULL; } -void write_demands(Project *pr, FILE *f) { - + +void write_demands(Project *pr, FILE *f) { int i, j; Snode *node = NULL; @@ -142,24 +142,27 @@ void write_demands(Project *pr, FILE *f) { node = &net->Node[i]; if (node->D) { for (lnode = first_list(node->D); done_list(lnode); lnode = next_list(lnode)) { - sprintf(s, " %-31s %14.6f", node->ID, ucf * get_base_demand(lnode)); + if (lnode) { + sprintf(s, " %-31s %14.6f", node->ID, ucf * get_base_demand(lnode)); - if - ((j = get_pattern_index(lnode)) > 0) sprintf(s1, " %-31s", net->Pattern[j].ID); - else - strcpy(s1, " "); + if + ((j = get_pattern_index(lnode)) > 0) sprintf(s1, " %-31s", net->Pattern[j].ID); + else + strcpy(s1, " "); - fprintf(f, "\n%s %-31s", s, s1); + fprintf(f, "\n%s %-31s", s, s1); - if (temp = get_category_name(lnode)) { - fprintf(f, " ;%s", temp); - free(temp); + if (temp = get_category_name(lnode)) { + fprintf(f, " ;%s", temp); + free(temp); + } } } } } } + int saveinpfile(Project *pr, const char *fname) /* -------------------------------------------------