JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity
1,324 Commits 1 Branch 0 Tags
f709c199bca3df710fc6cbb84d69197ecf672a52
Commit Graph

198 Commits

Author SHA1 Message Date
Michael Tryby
9b95dc4d16 Merge pull request #401 from michaeltryby/dev 
Reorganizing unit tests and improving CI helper scripts on Travis
 2019-03-06 17:43:44 -05:00
Lew Rossman
65a6c846b6 Change ENgetcoords & ENsetcoords args. to doubles 2019-03-02 12:26:49 -05:00
Michael Tryby
a4b2e53768 Adding tests for save and use hydraulics file 2019-02-28 11:14:15 -05:00
Michael Tryby
97ae763d1a Moving getcount in epanet.py and adding test 2019-02-28 09:17:16 -05:00
Lew Rossman
fcbbbf9b2e Adds new pattern, curve and reporting functions to API 2019-02-20 12:43:32 -05:00
Lew Rossman
3eb9a68783 Fixes win_build and VS/cmake build problems 2019-02-11 14:30:15 -05:00
Lew Rossman
36b78f28d3 New function clearreport added (see issue #383) 
The newly added `gettitle` and `settitle` functions were moved from the Reporting Functions section to the Project (formerly System) Functions section of epanet2.c and epanet.c.
 2019-02-08 12:07:56 -05:00
Elad Salomons
140c95214e Merge pull request #385 from eladsal/dev-title 
Add new function to get and set title strings
 2019-02-07 22:13:40 +02:00
Elad Salomons
ab62d3bb61 Add new function to get and set title strings 2019-02-06 11:45:48 +02:00
Michael Tryby
6a0151b9c7 Adding support for custom epanet_py build target 2019-02-04 14:28:32 -05:00
Michael Tryby
cba9dda5cf Fixing build error gcc / Travis 2019-01-30 14:30:44 -05:00
Michael Tryby
d62d606b30 Removing *.orig file 2019-01-30 13:36:04 -05:00
Michael Tryby
8d12664061 Removing EN_API_FLOAT_TYPE 2019-01-28 11:31:31 -05:00
Michael Tryby
b339ff22ca Merging dev into dev-swig-redux 2019-01-28 11:23:25 -05:00
Michael Tryby
30c9843965 Merge remote-tracking branch 'upstream/dev' into dev-swig-redux 2019-01-28 10:41:23 -05:00
Lew Rossman
0cfa45e52e New updates to address compiler warnings (issue #370) 
In addition to addressing compiler warnings, argument names in the API function prototypes were made more consistent and descriptive. Also additional Doxygen comments were added in preparation for producing a more thorough documentation of the API.
 2019-01-19 16:56:19 -05:00
Elad Salomons
23e542a492 Mark VB reserved words in variable names 
I have marked the VB reserved words with an ending "_". Sorry the IDE messed the nice spacing...
 2019-01-10 08:39:49 +02:00
Lew Rossman
dd376692ad Floating pt. args in thread-safe API changed to doubles (Issue #365) 2019-01-09 15:14:10 -05:00
Lew Rossman
628fffc718 Added additional network building features (#367) 2019-01-02 10:33:58 -05:00
Michael Tryby
186c17bb15 Adding file headers 2018-12-10 17:30:47 -05:00
Michael Tryby
51795d86e9 Adding API for simple and rule based controls 2018-12-10 15:53:38 -05:00
Michael Tryby
fca9c42411 Fixing arg as return with enum type 2018-12-07 16:23:12 -05:00
Michael Tryby
d5de19caa0 Ongoing dev 2018-12-06 17:48:32 -05:00
Michael Tryby
c1adfd514d Fleshing out api for swig wrap 2018-12-04 17:54:39 -05:00
Michael Tryby
b63f232884 Initial commit interface for python wrap 2018-11-30 15:49:28 -05:00
Michael Tryby
b0c7714d72 Keeping legacy api in epanet2.h epanet2.c and moving new api to epanet2_2.h epanet.c 2018-11-29 12:51:47 -05:00
Michael Tryby
be2ca0a9f6 Implmenting Toolkit API versioning 2018-11-29 11:57:51 -05:00
Lew Rossman
9a540cc0f4 Code cleanup 
1. Added a standard header to each code module and removed obsolete comments.
2. Re-named several of the sub-structs in the project struct and re-arranged some of their contents.
3. Re-named _defaultModel to _defaultProject.
4. Removed the need to call EN_createproject and EN_deleteproject when working with the default project.
5. Made X & Y coords. part of Snode properties instead of a separate struct.
6. Moved the non-API functions in epanet.c into a new module named project.c.
7. Re-factored the quality module so that it uses the same nodal adjacency lists as the hydraulics solver.
8. Re-factored the sparse matrix module (smatrix.c) to be more memory efficient.
9. Restricted line lengths to < 90 columns.
10. Grouped the placement of functions in EPANET2.H and EPANET.C by category.
 2018-11-27 14:22:06 -05:00
Elad Salomons
36972c2a60 Fix for VB header file 2018-11-08 10:09:35 +02:00
Lew Rossman
7443cea9d4 Fixes #172 (adjust controls when node/link is deleted) & EN_addrule added 
- Deleting controls with node/link deletion made conditional.
- New EN_addrule function added along with a test file.
- Rule structures re-named & rules.c heavily modified.
- Issue with exceeding limit on number of temporary file names fixed.
- VB declaration and DEF files updated.
 2018-11-07 23:09:47 -05:00
Lew Rossman
ee335ab077 Fixes bug #172 (adjust controls & rules when node/link added or deleted) 
- Also adds new API function EN_deletecontrol
- Updates and re-arranges entries in the VBA and VB.Net headers
 2018-10-31 11:32:01 -04:00
Lew Rossman
5ddb54ab90 Deleted include\epanet_export.h 
It gets generated through the cmake build process.
 2018-10-29 11:44:25 -04:00
Lew Rossman
a86ba29cb6 Restored epanet_export.h to \include folder 2018-10-29 09:06:08 -04:00
Lew Rossman
8514929622 Rewrite of EN_setlinktype function (#305) 
- Complete rewrite of EN_setlinktype with link index argument passed by reference
- New unit test of EN_setlinktype added
- New function EN_setlinknodes added
 2018-10-28 16:58:43 -04:00
Lew Rossman
e9161adbe6 Defined EN_MAXID & EN_MAXMSG limits in API header 2018-10-27 08:48:41 -04:00
Lew Rossman
76419e0b4c Added EN_setnodeid and EN_setlinkid (Issue #306) 2018-10-17 09:05:16 -04:00
Lew Rossman
7c021cf533 Fixed water quality mass balance issue (#160) 2018-10-09 12:53:20 -04:00
Elad Salomons
4848f692f6 Merge pull request #296 from eladsal/dev-dem-cat 
Add demand names get\set APIs
Close #294
 2018-10-01 10:47:40 +03:00
Elad Salomons
c1c80da667 Add APIs to get\set demand categories names 2018-09-26 11:15:37 +03:00
Marios Kyriakou
982ff903e3 add option EN_HEADLOSSFORM in function ENgetoption 2018-09-23 19:41:27 +03:00
Elad Salomons
dad11cce8d Add option to get\set default demand pattern 
also updates the net builder test
 2018-09-15 14:22:20 +03:00
Michael Tryby
bec729a669 Fixing compiler warnings 2018-09-13 10:48:55 -04:00
Elad Salomons
756e8be735 Merge pull request #265 from eladsal/dev-control 
Add EN_addcontrol function
 2018-09-05 07:42:02 +03:00
Michael Tryby
8059a90192 Add ENsetdemandpattern 2018-09-04 15:16:40 -04:00
Michael Tryby
5f2de4ab5d Merging upstream dev 2018-09-04 11:56:06 -04:00
Michael Tryby
b9a1934879 Making epanet exports opt in 2018-09-04 11:53:53 -04:00
Michael Tryby
b7e9988b15 Adding unit test for reentrancy 2018-09-04 09:38:44 -04:00
Elad Salomons
5d241e2fbd Create headers for EN_addcontrol 2018-09-03 08:18:42 +03:00
Elad Salomons
0b9dd8d29a Minor fix for VB header file 
type is a reserved keyword in VB
 2018-09-03 07:44:37 +03:00
Michael Tryby
b2aa8de927 Fixing build error on Travis 2018-08-31 13:15:00 -04:00