From d0ab568a5d6a27b454bc0b65e146cfe04ca95783 Mon Sep 17 00:00:00 2001
From: Sam Hatchett <sam.hatchett@xylem.com>
Date: Wed, 13 Sep 2023 09:14:57 -0400
Subject: [PATCH] using int/bool convention instead of new enum type

---
 include/epanet2_enums.h | 3 +++
 src/epanet.c            | 4 ++--
 src/hydraul.c           | 4 ++--
 src/input3.c            | 2 +-
 src/project.c           | 2 +-
 src/rules.c             | 4 ++--
 src/types.h             | 9 ++-------
 7 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/include/epanet2_enums.h b/include/epanet2_enums.h
index dec12f5..557f48f 100644
--- a/include/epanet2_enums.h
+++ b/include/epanet2_enums.h
@@ -505,4 +505,7 @@ typedef enum {
 #define EN_SET_CLOSED -1.E10  //!< Link set closed indicator
 #define EN_SET_OPEN    1.E10  //!< Link set open indicator
 
+#define EN_FALSE 0  // boolean false
+#define EN_TRUE 1   // boolean true
+
 #endif //EPANET2_ENUMS_H
diff --git a/src/epanet.c b/src/epanet.c
index d2c4d11..bbbfb62 100644
--- a/src/epanet.c
+++ b/src/epanet.c
@@ -5283,7 +5283,7 @@ int  DLLEXPORT EN_setcontrolenabled(EN_Project p, int index, int enabled)
     Scontrol *control;
     
     // Check for valid arguments
-    if (enabled != ENABLED && enabled != DISABLED)
+    if (enabled != TRUE && enabled != FALSE)
         return 202; // illegal numeric value
     if (!p->Openflag) 
         return 102;
@@ -5742,7 +5742,7 @@ int  DLLEXPORT EN_setruleenabled(EN_Project p, int index, int enabled)
     Srule *rule;
     
     // Check for valid arguments
-    if (enabled != ENABLED && enabled != DISABLED)
+    if (enabled != TRUE && enabled != FALSE)
         return 202; // illegal numeric value
     if (!p->Openflag) 
         return 102;
diff --git a/src/hydraul.c b/src/hydraul.c
index 9e5aadb..96433f3 100755
--- a/src/hydraul.c
+++ b/src/hydraul.c
@@ -557,7 +557,7 @@ int  controls(Project *pr)
     {
         // Make sure that link is defined
         control = &net->Control[i];
-        if (control->isEnabled == DISABLED)
+        if (!control->isEnabled)
         {
             continue;
         }
@@ -733,7 +733,7 @@ int  controltimestep(Project *pr, long *tstep)
     {
         t = 0;
         control = &net->Control[i];
-        if (control->isEnabled == DISABLED)
+        if (!control->isEnabled)
         {
             continue;
         }
diff --git a/src/input3.c b/src/input3.c
index 304a77d..713c07e 100644
--- a/src/input3.c
+++ b/src/input3.c
@@ -943,7 +943,7 @@ int controldata(Project *pr)
     control->Time = (long)(3600.0 * time);
     if (ctltype == TIMEOFDAY) control->Time %= SECperDAY;
     control->Grade = level;
-    control->isEnabled = ENABLED;
+    control->isEnabled = TRUE;
     return 0;
 }
 
diff --git a/src/project.c b/src/project.c
index 0877427..258b9b0 100644
--- a/src/project.c
+++ b/src/project.c
@@ -1232,7 +1232,7 @@ int setcontrol(EN_Project p, int type, int linkIndex, double setting,
     control->Setting = s;
     control->Time = t;
     control->Grade = lvl;
-    control->isEnabled = ENABLED;
+    control->isEnabled = TRUE;
     return 0;
 }
 
diff --git a/src/rules.c b/src/rules.c
index bb4f269..99d0a02 100644
--- a/src/rules.c
+++ b/src/rules.c
@@ -528,7 +528,7 @@ int checkrules(Project *pr, long dt)
     for (i = 1; i <= net->Nrules; i++)
     {
         // skip if the rule is disabled
-        if (net->Rule[i].isEnabled == DISABLED)
+        if (!net->Rule[i].isEnabled)
         {
             continue;
         }
@@ -689,7 +689,7 @@ void newrule(Project *pr)
     rule->ThenActions = NULL;
     rule->ElseActions = NULL;
     rule->priority = 0.0;
-    rule->isEnabled = ENABLED;
+    rule->isEnabled = TRUE;
     pr->rules.LastPremise = NULL;
     pr->rules.LastThenAction = NULL;
     pr->rules.LastElseAction = NULL;
diff --git a/src/types.h b/src/types.h
index 6b333c4..ff7c359 100755
--- a/src/types.h
+++ b/src/types.h
@@ -196,11 +196,6 @@ typedef enum {
   TIMEOFDAY      // act when time of day occurs
 } ControlType;
 
-typedef enum {
-  DISABLED,
-  ENABLED
-} EnabledType;
-
 typedef enum {
   XHEAD,         // pump cannot deliver head (closed)
   TEMPCLOSED,    // temporarily closed
@@ -479,7 +474,7 @@ typedef struct             // Control Statement
     double      Setting;   // new link setting
     StatusType  Status;    // new link status
     ControlType Type;      // control type
-    EnabledType isEnabled;   // control enabled?
+    int         isEnabled; // control enabled?
 } Scontrol;
 
 typedef struct             // Field Object of Report Table
@@ -531,7 +526,7 @@ typedef struct                 // Control Rule Structure
 {
     char     label[MAXID+1];   // rule label
     double   priority;         // priority level
-    EnabledType isEnabled;     // is the rule enabled?
+    int      isEnabled;        // is the rule enabled?
     Spremise *Premises;        // list of premises
     Saction  *ThenActions;     // list of THEN actions
     Saction  *ElseActions;     // list of ELSE actions