fixes #59 with better output parameter mapping

Author: Sam Hatchett

owa-epanet/EPANET

@@ -6,7 +6,7 @@
 
 setup(
     name = "owa-epanet",
-    version = "2.2.1",
+    version = "2.2.2",
     author = "Sam Hatchett",
     author_email = "samhatchett@gmail.com",
     description = "a thin wrapper for epanet hydraulic toolkit",

owa-epanet/setup.py

@@ -340,3 +340,12 @@ def make_array(values):
     en.setcurve(ph=epanet_proj, index=curve_index, xValues=xvalues, yValues=yvalues, nPoints=5)
     count = en.getcurvelen(ph=epanet_proj, index=curve_index)
     assert count == 5
+
+def test_coords():
+    epanet_proj = en.createproject()
+    en.open(ph=epanet_proj, inpFile=example_1_path, rptFile='report.rpt', outFile='output.out')
+    coords = en.getcoord(epanet_proj,1)
+    en.setcoord(epanet_proj,1,3,4)
+    coords = en.getcoord(epanet_proj,1)
+    assert coords[0] == pytest.approx(3)
+    assert coords[1] == pytest.approx(4)

owa-epanet/test/test_owa_epanet.py

@@ -30,55 +30,56 @@
 }
 
 %apply int *OUTPUT {
-    int *count,
-    int *version,
-    int *units,
-    int *qualType,
-    int *traceNode,
-    int *index,
-    int *nodeType,
-    int *type,
-    int *demandIndex,
-    int *numDemands,
-    int *patIndex,
-    int *linkType,
-    int *node1,
-    int *node2,
-    int *pumpType,
-    int *curveIndex,
-    int *len,
-    int *nPoints,
-    int *nodeIndex,
-    int *linkIndex,
-    int *nPremises,
-    int *nThenActions,
-    int *nElseActions,
-    int *logop,
-    int *object,
-    int *objIndex,
-    int *variable,
-    int *relop,
-    int *status
+    int *out_count,
+    int *out_version,
+    int *out_units,
+    int *out_qualType,
+    int *out_traceNode,
+    int *out_index,
+    int *out_nodeType,
+    int *out_type,
+    int *out_demandIndex,
+    int *out_numDemands,
+    int *out_patIndex,
+    int *out_linkType,
+    int *out_node1,
+    int *out_node2,
+    int *out_pumpType,
+    int *out_curveIndex,
+    int *out_len,
+    int *out_nPoints,
+    int *out_nodeIndex,
+    int *out_linkIndex,
+    int *out_nPremises,
+    int *out_nThenActions,
+    int *out_nElseActions,
+    int *out_logop,
+    int *out_object,
+    int *out_objIndex,
+    int *out_variable,
+    int *out_relop,
+    int *out_status,
+    int *out_value
 };
 
 %apply double *OUTPUT {
-    double *value,
-    double *x,
-    double *y,
-    double *baseDemand,
-    double *pmin,
-    double *preq,
-    double *pexp,
-    double *setting,
-    double *level,
-    double *priority
+    double *out_value,
+    double *out_x,
+    double *out_y,
+    double *out_baseDemand,
+    double *out_pmin,
+    double *out_preq,
+    double *out_pexp,
+    double *out_setting,
+    double *out_level,
+    double *out_priority
 };
 
 %apply long *OUTPUT {
-    long *value,
-    long *currentTime,
-    long *tStep,
-    long *timeLeft
+    long *out_value,
+    long *out_currentTime,
+    long *out_tStep,
+    long *out_timeLeft
 };
 
 %cstring_bounded_output(char *OUTCHAR, EN_MAXMSG);