Commit Graph

235 Commits

Author SHA1 Message Date
Lew Rossman
628fffc718 Added additional network building features (#367) 2019-01-02 10:33:58 -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
333e87b026 Fixing tests 2018-11-29 12:20:13 -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
b7a7cdc5ee Another update to test_setid.cpp 2018-11-27 16:45:13 -05:00
Lew Rossman
7c21b9c740 Update test_setid.cpp 2018-11-27 16:10:39 -05:00
Lew Rossman
24d90a530d Replaced EN_ProjectHandle with EN_Project in unit tests 2018-11-27 15:16:12 -05:00
Michael Tryby
b34c2ede81 Fixing build error on Travis 2018-11-16 14:06:29 -05:00
Michael Tryby
a4c9973d47 Adding test_save_reopen, minor refactoring. 2018-11-16 13:49:45 -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
Michael Tryby
bfec6d608b Merging upstream dev 2018-11-05 10:12:24 -05:00
Michael Tryby
5f0ca809d7 Fixing bug in check_cdd 2018-11-05 10:05:30 -05: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
f7346cef5f Modified re-factored version of hash.c 2018-10-19 10:36:39 -04:00
Lew Rossman
0041772aa0 Corrected test_setid unit test code 2018-10-18 10:16:47 -04:00
Lew Rossman
60a79de4a9 Fixed bug in hash.c
A bug in the delete function in hash.c was preventing the unit test of the new set ID API functions from running properly. In fixing this bug the entire hash table code was refactored to make it look more like the mempool service routines. Also the need to copy the string passed into the table's insert function was eliminated.
2018-10-18 10:03:09 -04:00
Lew Rossman
b3e84e0c42 Added unit test for ENsetnodeid and ENsetlinkid functions 2018-10-17 10:17:00 -04:00
Elad Salomons
0b5c5a3b7e Test for set\get demand categories 2018-09-26 12:13:49 +03:00
Elad Salomons
054c48c48a Merge pull request #287 from eladsal/dev-default-pattern
Add option to get\set default demand pattern
2018-09-21 17:22:28 +03:00
Michael Tryby
b1bb94fa74 Fixing memory leak 2018-09-18 16:02:56 -04: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
735811dd60 Revert "Fixing char casting in test file"
This reverts commit 8d5d20f542.
2018-09-13 16:17:06 +03:00
Elad Salomons
8d5d20f542 Fixing char casting in test file 2018-09-13 15:33:12 +03:00
Elad Salomons
7cf8d53356 Explicitly set demant patterns for junctions
This is since there is currently no way to set the default demand pattern. Should be fixed in #280 and then the test can be changed.
2018-09-06 12:07:14 +03:00
Elad Salomons
102ac90a98 Adding last test 2018-09-05 13:56:59 +03:00
Elad Salomons
d46dd1a182 Added documentation 2018-09-05 13:56:18 +03:00
Elad Salomons
ad3b26d727 Fail the test... 2018-09-05 09:37:21 +03:00
Elad Salomons
8687af337f Initial net builder test 2018-09-05 09:33:21 +03: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
a056bbf2c8 Fixing build error on Travis 2018-09-04 10:05:27 -04:00
Michael Tryby
b7e9988b15 Adding unit test for reentrancy 2018-09-04 09:38:44 -04:00
Elad Salomons
7957864d62 Another fix for unit test 2018-09-03 14:10:09 +03:00
Elad Salomons
c78aa9df99 Fix for unit test 2018-09-03 13:52:37 +03:00
Elad Salomons
1b23f91f72 Unit test for EN_addcontrol 2018-09-03 13:48:18 +03:00
Michael Tryby
d33167161a Revert "Make memorypool threadsafe " 2018-08-31 11:14:16 -04:00
Elad Salomons
25db9cfe8f Merge pull request #242 from Mariosmsk/pr86
add ENsetdemandpattern. Closes #241
2018-08-31 06:51:39 +03:00
michaeltryby
5a007bc1f6 Adding header 2018-08-30 19:12:27 -04:00
Michael Tryby
6527819d00 Forgot to add test 2018-08-30 15:53:01 -04:00
Michael Tryby
21f40f0daf Making memorypool.c reentrant and adding test 2018-08-30 15:30:34 -04:00
Elad Salomons
74d68a884c Fix typo 2018-08-30 18:05:39 +03:00
Elad Salomons
7d8d780a8b Merge branch 'dev' into pr86 2018-08-30 17:55:35 +03:00
Marios Kyriakou
8991d6baf9 add test for the function EN_setdemandpattern 2018-08-30 17:21:02 +03:00
Elad Salomons
f3d680dc54 Fix test_addpattern test
Thanks @mariosmsk

Co-Authored-By: Marios S. Kyriakou <mariosmsk@gmail.com>
2018-08-29 18:12:25 +03:00
Elad Salomons
edf4a09ebe Fix EN_addpattern
Closes #231. Also adds unit test for the function.
2018-08-29 15:14:49 +03:00
Michael Tryby
bdc05058ca Resolving merge conflicts 2018-08-27 09:38:46 -04:00
Michael Tryby
fafad2a070 Revert "Reorganizing epanet header"
This reverts commit c8803a9f1b.
2018-08-22 15:05:48 -04:00
Michael Tryby
26ce95673a Renaming test 2018-08-22 11:35:44 -04:00