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

224 Commits

Author SHA1 Message Date
Michael Tryby
dc3c2ffe1a Adding remove demand method to toolkit 2019-04-24 16:30:27 -04:00
Michael Tryby
cf97cf8c9c Work in progress 
code cleanup, addressed issue raised in review, and implemented EN_adddemand()
 2019-04-23 17:52:11 -04:00
Michael Tryby
feee7f2c80 Update epanet.c 
Updating EN_getnodevalue() and EN_setnodevalue() to process the primary demand located at the head of the demand list
 2019-04-23 14:42:37 -04:00
michaeltryby
f19d43d3a4 Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev-list 2019-04-22 13:36:44 -04:00
michaeltryby
d34ac67172 updating get demand name and write demands 
Everything passing locally
 2019-04-22 12:14:33 -04:00
michaeltryby
97f70e445d Update epanet.c 
Trying to isolate bug
 2019-04-22 11:07:01 -04:00
Michael Tryby
7537be1ec9 Work in progress 
Working on demand lists
 2019-04-19 18:01:06 -04:00
Michael Tryby
76b6254f33 get/set demand name are passing 2019-04-18 17:07:50 -04:00
Michael Tryby
bf519fdd94 Work in progress 
Fixing problems when demand lists are null
 2019-04-18 14:24:30 -04:00
Lew Rossman
1583bea154 Return object index from EN_addnode and EN_addlink (issue #432) 
Adds an output argument to EN_addnode and EN_addlink that returns the index of the newly added object.
Also refactors the validity check on object ID names.
 2019-04-18 07:00:07 -04:00
Michael Tryby
109276e379 Work in progress 
Implementing generic demand pattern lists. Compiles but does not run.
 2019-04-17 17:24:34 -04:00
Michael Tryby
d1979e7ed0 Update errror code from 250 to 252 2019-04-17 09:39:24 -04:00
Michael Tryby
3186ec326c Adding element id validity check 
Adding checks for element set id functions
 2019-04-16 17:29:32 -04:00
Michael Tryby
22a7993c8c Adding element id validity checks 2019-04-16 16:57:38 -04:00
Michael Tryby
9c4665a661 Fixes memory leak in EN_addnode() (#455) 
* Fixing memory leak in EN_addnode()

* Separating test_net_builder from test_toolkit

Making test_net_builder a standalone test

* Removing BOOST_TEST_MAIN

* Work in progress
 2019-04-11 18:04:20 -04:00
Michael Tryby
cf1fc43a4d Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into Mariosmsk-fix_bug_getdemandname 2019-04-08 15:22:16 -04:00
Michael Tryby
14af368876 Merge branch 'fix_bug_getdemandname' of https://github.com/Mariosmsk/EPANET into Mariosmsk-fix_bug_getdemandname 2019-04-08 14:44:05 -04:00
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