Commit Graph

930 Commits

Author SHA1 Message Date
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
8b4727eac5 Merge pull request #431 from Mariosmsk/fix_bug_getdemandname
try to fix bug in EN_getdemandname
2019-04-08 16:26:33 -04:00
Marios S. Kyriakou
700110ccfd Merge pull request #1 from michaeltryby/Mariosmsk-fix_bug_getdemandname
Mariosmsk fix bug getdemandname
2019-04-08 23:17:01 +03:00
Michael Tryby
a6e033767f Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into Mariosmsk-fix_bug_getdemandname 2019-04-08 15:38:37 -04:00
Michael Tryby
a72e2dc46c Merge pull request #451 from OpenWaterAnalytics/lrossman-dev
Bug fix for 2Comp and LIFO tank mixing models (issue #448)
2019-04-08 15:36:56 -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
Michael Tryby
04a6ece769 Added new reg tests
Updating reference build id
2019-04-08 14:07:00 -04:00
Michael Tryby
d436b232b5 Triggering build to update benchmarks 2019-04-08 13:40:17 -04:00
Lew Rossman
b8443230c6 Bug fix for 2Comp and LIFO tank mixing models (issue #448) 2019-04-08 11:16:23 -04:00
Lew Rossman
1f67c8c5c9 Merge pull request #450 from OpenWaterAnalytics/lrossman-dev
Eliminates use of temporary linked lists to process Patterns & Curves…
2019-04-08 11:08:34 -04:00
Lew Rossman
b2a8b55bc6 Update input2.c 2019-04-05 16:28:55 -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
b87c102de5 Merge pull request #447 from OpenWaterAnalytics/lrossman-dev
Add more analysis options to the API (issue #425)
2019-04-04 10:23:01 -04:00
Lew Rossman
1632508545 Fixed epanet2_enums.h 2019-04-03 21:23:46 -04:00
Lew Rossman
3e733f5a2a Add more analysis options to the API (issue #425) 2019-04-03 21:17:28 -04:00
Michael Tryby
f63df92e52 Merge pull request #445 from michaeltryby/dev-unittesting
Fix leaky test code
2019-04-03 16:58:12 -04:00
Michael Tryby
927cf9770e merging upstream dev 2019-04-03 16:40:58 -04:00
Michael Tryby
9f867b10ca Merge pull request #443 from OpenWaterAnalytics/lrossman-dev17
Removed the EN_DEFDEMANDPAT option
2019-04-03 16:35:47 -04:00
Michael Tryby
502e5f16a0 Fixing index error in test 2019-04-03 16:25:51 -04:00
Michael Tryby
84bf6f98d0 Cleaning up include statements adding crtdbg.h 2019-04-03 15:55:23 -04:00
Michael Tryby
be2b0a3ac8 Update CMakeLists.txt
Restoring test_net_builder to test_toolkit.exe
2019-04-03 14:56:01 -04:00
Michael Tryby
b578380675 Update test_toolkit.hpp
removing crtdbg.h from header
2019-04-03 14:13:40 -04:00
Michael Tryby
efd86c3ddd Fixing memory problems with test_toolkit
Fixes memory leaks and some minor refactoring.
2019-04-03 14:05:41 -04:00
Michael Tryby
f99d417301 Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev-unittesting 2019-04-03 11:10:52 -04:00
Michael Tryby
568f89ff9e removing reference to strncpy 2019-04-03 11:10:36 -04:00
Michael Tryby
0f7c07555b Merge pull request #444 from michaeltryby/dev
Cleaning up build on gcc
2019-04-03 10:58:46 -04:00
Lew Rossman
fa4952a265 Fixed failure to update test_analysis.cpp 2019-04-03 10:56:24 -04:00
Lew Rossman
af825005d4 Fixed failure to update test_net_builder.cpp 2019-04-03 10:43:19 -04:00
Michael Tryby
9da7e9a81b Cleaning up build on gcc 2019-04-03 10:29:10 -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
513b545ff6 Merge pull request #442 from OpenWaterAnalytics/lrossman-dev17
Fixes bug in EN_getcurve
2019-04-03 09:34:32 -04:00
Michael Tryby
207cc53b04 Cleaning up build on gcc 2019-04-03 09:27:51 -04:00
Lew Rossman
23b11ab672 Add test of EN_setcurve & EN_getcurve to test_curve.cpp 2019-04-03 01:15:57 -04:00
Lew Rossman
ca0ea0e17c Fixes bug in EN_getcurve 2019-04-03 00:58:40 -04:00
Lew Rossman
8b35866b69 Merge pull request #441 from OpenWaterAnalytics/lrossman-dev17
Bug fixes
2019-04-02 22:36:08 -04:00
Lew Rossman
6a4b95f4d5 Bug fixes 2019-04-02 22:21:05 -04:00
Michael Tryby
77851dcc5b Merge pull request #440 from michaeltryby/dev
Fixing header comments
2019-04-02 17:31:39 -04:00
Michael Tryby
db85975151 Fixing header comments 2019-04-02 17:28:48 -04:00
Michael Tryby
2f6d130abc Merge pull request #439 from michaeltryby/dev-filemanager
Dev filemanager
2019-04-02 17:11:38 -04:00
Michael Tryby
0e30d57d4e Update errormanager
Make error_handle_t "private".  Update headers.
2019-04-02 17:01:35 -04:00
Michael Tryby
ea5d2894b1 Bumping version, updating headers 2019-04-02 16:51:55 -04:00
Michael Tryby
525c861d4b Update appveyor.yml
Fixing bug
2019-04-02 16:16:53 -04:00
Michael Tryby
90325d7a65 Update appveyor.yml
Rolling back changes to match dev HEAD
2019-04-02 16:14:28 -04:00
Michael Tryby
611afbafd2 Update .travis.yml
No apt-get update
2019-04-02 15:58:16 -04:00
Michael Tryby
ddf0a088db revert 1a01b46 2019-04-02 15:47:06 -04:00
Michael Tryby
3ba40015b2 revert 8574f52 2019-04-02 15:41:24 -04:00
Michael Tryby
907760540e Reorganizing public functions 2019-04-02 15:34:21 -04:00
Michael Tryby
ecf0e5173c revert 1a01b46 to 1b167b5 2019-04-02 15:27:05 -04:00
Michael Tryby
44fc73cf41 Fixing bug 2019-04-02 14:37:32 -04:00