Commit Graph

307 Commits

Author SHA1 Message Date
Lew Rossman
edcd4b69c7 Eliminates use of temporary linked lists to process Patterns & Curves (issue #449) 2019-04-05 13:02:39 -04:00
Lew Rossman
3e733f5a2a Add more analysis options to the API (issue #425) 2019-04-03 21:17:28 -04:00
Michael Tryby
927cf9770e merging upstream dev 2019-04-03 16:40:58 -04:00
Michael Tryby
84bf6f98d0 Cleaning up include statements adding crtdbg.h 2019-04-03 15:55:23 -04:00
Lew Rossman
83ffc1cfc7 Removed the EN_DEFDEMANDPAT option
See issue #429. Also allowed the EN_HEADLOSSFORM option to be changed if the solver is not active.
2019-04-03 10:25:37 -04:00
Lew Rossman
ca0ea0e17c Fixes bug in EN_getcurve 2019-04-03 00:58:40 -04:00
Lew Rossman
6a4b95f4d5 Bug fixes 2019-04-02 22:21:05 -04:00
mariosmsk
08799eb276 updates
replaced MAXMSG with MAXID
added a check if demandName is too long
2019-03-26 17:19:08 +02:00
mariosmsk
abf583d372 try to fix bug in EN_getdemandname 2019-03-25 18:39:57 +02:00
Lew Rossman
18f65eb8b0 Replace fixed-sized comment strings with dynamic strings 2019-03-17 19:54:51 -04:00
Lew Rossman
e5ec4eecab Fixes writing auxiliary data for deleted elements to a saved input file (#411) 2019-03-08 16:41:12 -05:00
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
12c64b69cd Refactored EN_close function to use newly added closeoutfile function 2019-03-06 13:23:55 -05:00
Lew Rossman
6e13d7e3aa Refactoring how the binary output is closed
This change implements the fix suggested by @gonccalo.
2019-03-06 11:14:03 -05:00
Lew Rossman
3ebb1831d7 Another attempt to fix closing/opening of output project 2019-03-06 10:44:03 -05:00
Lew Rossman
8765dfa3ab Initialize all file pointers to NULL in initpointers 2019-03-05 20:50:34 -05:00
Lew Rossman
09d6c7ea5d Reverting some previous changes 2019-03-05 19:07:55 -05:00
Lew Rossman
f2c0718819 Refactored closing/opening of output file 2019-03-05 16:15:33 -05:00
Lew Rossman
8052ed0b6f Walking back closing/opening output file 2019-03-05 15:20:37 -05:00
Lew Rossman
692955e3d2 Give external apps access to binary output file (#407) 2019-03-05 09:23:49 -05:00
Michael Tryby
9f1b46b66a Fixing bug in gettimeparam 2019-03-01 15:16:27 -05:00
Michael Tryby
b3a9701863 Adding test for getoption 2019-03-01 12:12:10 -05:00
Michael Tryby
a4b2e53768 Adding tests for save and use hydraulics file 2019-02-28 11:14:15 -05:00
Michael Tryby
c7d533c6e4 Adding tests for gettitle and saveinpfile 2019-02-28 08:11:59 -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
ab62d3bb61 Add new function to get and set title strings 2019-02-06 11:45:48 +02: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
Lew Rossman
f673aa2f20 Modifications made to EN_getlinkvalue & EN_setlinkvalue in EPANET.C
1. EN__PUMP_ECOST added to EN_getlinkvalue.
2. Order of cases in switch statement of both EN_getlinkvalue and EN_setlinkvalue changed to match the order of EN_LinkProperty enumeration.
2019-01-11 12:52:09 -05: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
Lew Rossman
3ce0361c1d Network validity checks added to openhyd()
Checks on illegal valve connections made whenever API creates a new link, changes its end nodes, or changes its type.
2018-12-20 08:36:05 -05:00
Lew Rossman
a66f5a2c92 Checks addded to prevent changing network structure when solver active (#361) 2018-12-18 15:35:06 -05:00
Lew Rossman
f1175b1f92 Error reporting fixes and re-formatting (issue #358) 2018-12-15 15:13:19 -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
d3a50dc490 Fixed refactoring bug in EN_setlinkid 2018-11-27 19:25:01 -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
Michael Tryby
440230ef6d Rolling back errormanager 2018-11-19 16:33:30 -05:00
Lew Rossman
6397a01363 Merge branch 'dev' into lrossman-dev 2018-11-07 23:19:16 -05: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
Elad Salomons
18fb352527 Merge pull request #327 from eladsal/dev-link-nodes
Add ENsetlinknodes to DEF file and add a function check
2018-10-31 18:23:03 +02: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
Elad Salomons
4394c53f9b Add ENsetlinknodes to DEF file and add a function check 2018-10-29 17:20:45 +02:00
Lew Rossman
c2b16a6466 Deleted previous, commented-out version of EN_setlinktype 2018-10-28 20:07:54 -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
320dec3ff7 Replaced main() for runnable version of the library 2018-10-27 11:00:00 -04:00
Lew Rossman
9d0b738e77 Removed writecon function and all calls to it 2018-10-27 09:36:21 -04:00
Lew Rossman
8286918b94 Removed unused runconcurrent() function 2018-10-27 09:05:30 -04:00