From f60102105aa8fc2aa82be549e60c20216873fba9 Mon Sep 17 00:00:00 2001
From: Lew Rossman <LRossman@outlook.com>
Date: Thu, 26 Jan 2023 12:50:26 -0500
Subject: [PATCH] Ignore errors in coords. read from file

Ignores errors when reading node & link vertex coordinates from an input file. Also when saving a project to an input file, the [DEMANDS] section only includes non-zero demands.
See issues #603 and #174 .
---
 src/inpfile.c |  1 +
 src/input3.c  | 28 +++++++++++++++++-----------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/inpfile.c b/src/inpfile.c
index c1fcc48..f8b2005 100644
--- a/src/inpfile.c
+++ b/src/inpfile.c
@@ -332,6 +332,7 @@ int saveinpfile(Project *pr, const char *fname)
         node = &net->Node[i];
         for (demand = node->D; demand != NULL; demand = demand->next)
         {
+            if (demand->Base == 0.0) continue;
             sprintf(s, " %-31s %14.6f", node->ID, ucf * demand->Base);
             if ((j = demand->Pat) > 0) sprintf(s1, " %-31s", net->Pattern[j].ID);
             else strcpy(s1, " ");
diff --git a/src/input3.c b/src/input3.c
index 9534b35..9c2c795 100644
--- a/src/input3.c
+++ b/src/input3.c
@@ -700,11 +700,14 @@ int coordata(Project *pr)
 /*
  **--------------------------------------------------------------
  **  Input:   none
- **  Output:  returns error code
- **  Purpose: processes coordinate data
+ **  Output:  returns 0
+ **  Purpose: processes node coordinate data
  **  Format:
  **    [COORD]
  **      id  x  y
+ **
+ **  Note: since node coords. are not used in any computations,
+ **        invalid data are simply ignored.
  **--------------------------------------------------------------
  */
 {
@@ -716,12 +719,12 @@ int coordata(Project *pr)
     Snode *node;
 
     // Check for valid node ID
-    if (parser->Ntokens < 3) return 201;
-    if ((j = findnode(net, parser->Tok[0])) == 0) return setError(parser, 0, 203);
+    if (parser->Ntokens < 3) return 0;
+    if ((j = findnode(net, parser->Tok[0])) == 0) return 0;
 
     // Check for valid data
-    if (!getfloat(parser->Tok[1], &x)) return setError(parser, 1, 202);
-    if (!getfloat(parser->Tok[2], &y)) return setError(parser, 2, 202);
+    if (!getfloat(parser->Tok[1], &x)) return 0;
+    if (!getfloat(parser->Tok[2], &y)) return 0;
 
     // Save coord data
     node = &net->Node[j];
@@ -734,11 +737,14 @@ int vertexdata(Project *pr)
 /*
  **--------------------------------------------------------------
  **  Input:   none
- **  Output:  returns error code
+ **  Output:  returns 0
  **  Purpose: processes link vertex data
  **  Format:
  **    [VERTICES]
  **      id  x  y
+ **
+ **  Note: since vertex coords. are not used in any computations,
+ **        invalid data are simply ignored.
  **--------------------------------------------------------------
  */
 {
@@ -749,12 +755,12 @@ int vertexdata(Project *pr)
     double x, y;
     
     // Check for valid link ID
-    if (parser->Ntokens < 3) return 201;
-    if ((j = findlink(net, parser->Tok[0])) == 0) return setError(parser, 0, 204);
+    if (parser->Ntokens < 3) return 0;
+    if ((j = findlink(net, parser->Tok[0])) == 0) return 0;
 
     // Check for valid coordinate data
-    if (!getfloat(parser->Tok[1], &x)) return setError(parser, 1, 202);
-    if (!getfloat(parser->Tok[2], &y)) return setError(parser, 2, 202);
+    if (!getfloat(parser->Tok[1], &x)) return 0;
+    if (!getfloat(parser->Tok[2], &y)) return 0;
 
     // Add to link's list of vertex points
     return addlinkvertex(&net->Link[j], x, y);