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

412 Commits

Author SHA1 Message Date
Elad Salomons
178ad5736e Update rules.c 
Fix broken win build script
 2019-05-09 20:01:14 +03:00
Lew Rossman
365ab00dcb Refactors the API's demand editing functions 2019-05-09 10:26:40 -04:00
Elad Salomons
52bda22833 Merge pull request #478 from eladsal/473 
For "conditional" do not delete a node connected to a link
 2019-05-08 16:56:23 +03:00
Elad Salomons
eefc7f7d05 For "conditional" do delete a node connected to a link 
For "conditional" deletion the node is deleted only if all of its links have been explicitly deleted beforehand #473

Co-Authored-By: Lew Rossman <lrossman@outlook.com>
 2019-05-06 11:36:41 +03:00
Markus Sunela
1aef998b81 Fixed NULL pointer error, if no label is provided after the rule keyword. 
Add NULL guard in freerules function. Use strncat and strncpy to ensure
the buffer lengths are adhered to.
 2019-05-03 10:36:59 +03:00
Lew Rossman
97be7944f4 Fix problems with setting tank parameters (issue #464 ) 2019-04-25 08:22:44 -04:00
Michael Tryby
35cf9bd422 Fix bug and test remove demand 2019-04-24 18:40:47 -04:00
Michael Tryby
dc3c2ffe1a Adding remove demand method to toolkit 2019-04-24 16:30:27 -04:00
Michael Tryby
d927851d20 Adding remove node method to generic list 2019-04-24 16:29:57 -04:00
Michael Tryby
9b3173f9be Adding key and search to list 2019-04-24 13:15:43 -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
900813367e Update demand.c 2019-04-23 14:44: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
Michael Tryby
5d3eeb91d9 Reverted handling of default pattern 
When creating demands, no pattern is marked with a zero. Then when data is adjusted it gets updated to default.
 2019-04-23 11:44:02 -04:00
Michael Tryby
73bc53ad54 Update demand.c 2019-04-23 08:51:22 -04:00
Michael Tryby
4f9c901e6e Merge branch 'dev-list' of https://github.com/michaeltryby/EPANET into dev-list 2019-04-23 08:44:53 -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
ce70d144ce Restoring write_demands section in saveinpfile 2019-04-22 13:13:38 -04:00
michaeltryby
60853ecb15 Update demand.c 
Fixing bug in get_category_name when category_name is NULL
 2019-04-22 13:08:43 -04:00
michaeltryby
c98a43e72c Isolating bug 
Not writing demand section of input file should eliminate it
 2019-04-22 12:47:52 -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
michaeltryby
b80b4ed09c Update inpfile.c 
Testing linux build
 2019-04-22 10:52:04 -04:00
Lew Rossman
d985a69248 Refactored xstrcpy function 2019-04-20 11:54:33 -04:00
Michael Tryby
f05746cea2 GCC Bug 2019-04-19 22:56:08 -04:00
Michael Tryby
6a084cc764 Update inpfile.c 
Trying to isolate bug
 2019-04-19 22:35:15 -04:00
Michael Tryby
8761543395 Working on gcc bug 
Tests are passing on Appveyor
 2019-04-19 22:24:31 -04:00
Michael Tryby
e2e12fab22 Cleaning up gcc build 2019-04-19 21:51:55 -04:00
Michael Tryby
405822cdf6 Cleaning up build on gcc 2019-04-19 21:34:25 -04:00
Michael Tryby
e9650d2d6d Work in progress 
Fixing memory leaks
Unit tests passing
 2019-04-19 21:21:58 -04:00
Michael Tryby
7537be1ec9 Work in progress 
Working on demand lists
 2019-04-19 18:01:06 -04:00
Lew Rossman
a4ac34d5d6 Updated criteria for valid object ID name 2019-04-18 17:12:56 -04:00
Michael Tryby
76b6254f33 get/set demand name are passing 2019-04-18 17:07:50 -04:00
Michael Tryby
901a802f21 Passing open and close test 2019-04-18 16:16:02 -04:00
Michael Tryby
bf519fdd94 Work in progress 
Fixing problems when demand lists are null
 2019-04-18 14:24:30 -04:00
Michael Tryby
4581266654 test demand data passing 2019-04-18 13:46:18 -04:00
Lew Rossman
cc22eefeae Fixed compilation errors 2019-04-18 07:11:17 -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
3cc9c95d3f Update demand.c 
Work in progress
 2019-04-17 17:25:09 -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
ff21a33821 Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev-list 2019-04-17 10:53:08 -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
9224ac4f09 Update cstr_helper.c 
Fixing indentation
 2019-04-16 15:54:50 -04:00
Michael Tryby
2d74851635 Update cstr_helper.c 
fixing indentation
 2019-04-16 15:54:12 -04:00
Michael Tryby
02ec735c58 Work in progress 
Refactoring cstr_copy and adding test
 2019-04-16 15:51:19 -04:00
Michael Tryby
ac56971ef2 Work in progress 
Creating function for validateing element ID strings
 2019-04-16 14:44:06 -04:00
Michael Tryby
c659c70817 Work in progress 
Implementing demand_list
 2019-04-15 13:35:37 -04:00
Michael Tryby
f80e74bc5c Update demand.h 2019-04-12 18:07:32 -04:00