Merge pull request #50 from OpenWaterAnalytics/dev_ver

Modify solver version func and add an unit test

Author: michaeltryby

swmm-toolkit/setup.py

@@ -76,7 +76,7 @@ def exclude_files(cmake_manifest):
 
 setup(
     name = "swmm-toolkit",
-    version = "0.5.0",
+    version = "0.6.0",
 
     cmake_args = cmake_args,
 

swmm-toolkit/src/swmm/toolkit/solver.i

@@ -60,7 +60,10 @@
 
 %apply char **OUTCHAR {
     char **errorMsg,
-    char **id
+    char **id,
+    char **major, 
+    char **minor, 
+    char **patch
 };
 
 /* TYPEMAPS FOR MEMORY MANAGEMNET OF DOUBLE ARRAYS */
@@ -81,7 +84,6 @@
     }
 }
 
-
 %typemap(in, numinputs=0) SM_NodeStats **in_out_dict (SM_NodeStats *temp){
     $1 = &temp;
 }
@@ -322,7 +324,7 @@ int  swmm_end(void);
 int  swmm_report(void);
 int  swmm_getMassBalErr(float *OUTPUT, float *OUTPUT, float *OUTPUT);
 int  swmm_close(void);
-int  swmm_getVersion(void);
+int  swmm_getVersionInfo(char** major, char** minor, char** patch);
 
 
 // TOOLKIT API

swmm-toolkit/src/swmm/toolkit/solver_rename.i

@@ -20,7 +20,7 @@
 %rename(report)                                     swmm_report;
 %rename(get_mass_bal_err)                           swmm_getMassBalErr;
 %rename(close)                                      swmm_close;
-%rename(version)                                    swmm_getVersion;
+%rename(version)                                    swmm_getVersionInfo;
 
 //%rename(error_get_message)                          swmm_getAPIError;
 %rename(system_get_routing_stats)                   swmm_getSystemRoutingStats;

swmm-toolkit/swmm-solver

@@ -97,6 +97,12 @@ def test_step(handle):
     solver.report()
 
 
+def test_version(handle):
+    major, minor, patch = solver.version()
+    print(major, minor, patch)
+    assert major == '5'
+    
+
 def test_simulation_unit(handle):
     simulation_system_unit_option = solver.simulation_get_unit(toolkit_enum.UnitProperty.SYSTEM_UNIT)
     simulation_flow_unit_option = solver.simulation_get_unit(toolkit_enum.UnitProperty.FLOW_UNIT)