Working on output.getnetsize and toolkit.proj_getcount

Adding test for output.get_netsize and fixing bug with toolkit.proj_getcount.

Author: michaeltryby

before_build.bat

@@ -7,13 +7,14 @@
 ::          US EPA - ORD/NRMRL
 ::
 :: Requires:
+::     git
 ::     CMake
-::     Visual Studio 2015
+::     Visual Studio Build Tools
 ::     SWIG
 ::
 :: Note:
 ::     This script must be located at the root of the project folder
-:      in order to work correctly.
+::     in order to work correctly.
 ::
 
 

epanet_python/output/setup.py

@@ -13,12 +13,13 @@
 #   Python packages: numpy
 #
 
-try:
-    from setuptools import setup, Extension
-    from setuptools.command.build_ext import build_ext
-except ImportError:
-    from distutils.core import setup, Extension
-    from distutils.command.build_ext import build_ext
+#try:
+from setuptools import setup, Extension
+from setuptools.command.build_ext import build_ext
+
+#except ImportError:
+#    from distutils.core import setup, Extension
+#    from distutils.command.build_ext import build_ext
 
 
 microlib_name = 'epanet.output'

epanet_python/output/tests/test_output.py

@@ -51,6 +51,16 @@ def test_outputmetadata_handle(handle):
         assert temp == ref[attr]
 
 
+def test_getnetsize(handle):
+
+    ref_array = np.array([11, 2, 13, 1, 0])
+
+    netsize_list = oapi.getnetsize(handle)
+    assert len(netsize_list) == 5
+
+    assert np.array_equal(netsize_list, ref_array)
+
+
 def test_getnodeSeries(handle):
 
     ref_array = np.array(

epanet_python/toolkit/epanet/toolkit/toolkit.i

@@ -116,6 +116,9 @@ and return a (possibly) different pointer */
 int proj_run(Handle ph, const char *input_path, const char *report_path, const char *output_path);
 int proj_init(Handle ph, const char *rptFile, const char *outFile, EN_FlowUnits unitsType, EN_HeadLossType headLossType);
 int proj_open(Handle ph, const char *inpFile, const char *rptFile, const char *binOutFile);
+//int proj_gettitle(Handle ph, char *line1, char *line2, char *line3);
+//int proj_settitle(Handle ph, const char *line1, const char *line2, const char *line3);
+int proj_getcount(Handle ph, EN_CountType code, int *OUTPUT);
 int proj_savefile(Handle ph, const char *filename);
 int proj_close(Handle ph);
 
@@ -145,7 +148,6 @@ int rprt_writeresults(Handle ph);
 int rprt_reset(Handle ph);
 int rprt_set(Handle ph, char *reportCommand);
 int rprt_setlevel(Handle ph, EN_StatusReport code);
-int rprt_getcount(Handle ph, EN_CountType code, int *OUTPUT);
 int rprt_anlysstats(Handle ph, EN_AnalysisStatistic code, double *OUTPUT );
 
 

epanet_python/toolkit/tests/test_toolkit.py

@@ -117,7 +117,7 @@ def test_qual_step(handle):
 
 def test_report(handle):
 
-    nlinks = en.rprt_getcount(handle, en.CountType.LINKS)
+    nlinks = en.proj_getcount(handle, en.CountType.LINKS)
     assert nlinks == 13
 
     en.hydr_solve(handle)