jiang/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,016 Commits 1 Branch 0 Tags
59bd09cc53f5529ed6d605b84237fffb65147f68
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael TrybyandGitHub 59bd09cc53 Merge pull request #465 from michaeltryby/dev-list 
Dev list
 2019-04-24 18:57:46 -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 a0048b7b09 Update test_demand_data.cpp 
Adding index to addnode calls. Fixing indent
 2019-04-22 13:37:41 -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 ca097a948b Update test_project.cpp 
Isolating bug on gcc
 2019-04-22 12:22:15 -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
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 17b82bd31f Fixing bug 2019-04-19 21:59:09 -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
Michael Tryby 55a28de9e0 Work in progress 2019-04-18 17:34:02 -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
Michael Tryby 584233e5e8 Create test_demand_data.cpp 2019-04-18 09:54:56 -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 TrybyandGitHub 4494db8f56 Merge pull request #459 from michaeltryby/dev 
Adds element ID validity check to add element and set id functions
 2019-04-17 09:58:22 -04:00
Michael Tryby d1979e7ed0 Update errror code from 250 to 252 2019-04-17 09:39:24 -04:00
Michael Tryby f161ecaa72 Fixing build warnings on gcc 2019-04-16 17:40:40 -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 ea8e0439e3 Update test_cstrhelper.cpp 
Fixed mem leak
 2019-04-16 16:06:44 -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
Michael Tryby 880bdfffba Work in progress 
compiles with warnings, definitely not working
 2019-04-12 18:00:36 -04:00
Michael TrybyandGitHub 8989be193a Merge pull request #457 from michaeltryby/dev 
Minor update to unit tests
 2019-04-12 16:17:53 -04:00
Michael Tryby 3fb5ba5bb1 Fixing compilation bug on gcc 2019-04-12 15:29:50 -04:00
Michael Tryby ce12b2297e Updating unit tests 2019-04-12 15:22:38 -04:00
Michael TrybyandGitHub 2404493f81 Merge pull request #454 from michaeltryby/dev-list 
Dev generic list
 2019-04-12 14:21:00 -04:00
Michael TrybyandGitHub 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 60fd6fa020 Update CMakeLists.txt 
Adding test_list to ctest
 2019-04-11 14:48:35 -04:00
Michael Tryby 7e83d2c4e1 Fixing bug on gcc 2019-04-11 14:37:13 -04:00
Michael Tryby a81a8f4b96 Fixing bug 2019-04-11 14:31:21 -04:00
Michael Tryby 57a5f6f1b0 Update test_list.cpp 
Fixing bug on gcc
 2019-04-11 14:28:43 -04:00
Michael Tryby d79c766b71 Update test_list.cpp 2019-04-11 14:10:57 -04:00
Michael Tryby 3f37fdbff4 Refactoring head_list and tail_list 
Simplifying head and tail list. Adding delete_node() to list API.
 2019-04-11 10:45:22 -04:00
Michael Tryby af87edbafe Update list.c 2019-04-11 09:48:43 -04:00
Michael Tryby a7f8fc868e Reorganized to contain list abstraction 2019-04-11 09:44:08 -04:00
Michael Tryby f10e36336f Work in progress 2019-04-10 17:59:55 -04:00
Michael Tryby 6187bc112e Fixing indent 2019-04-10 16:17:36 -04:00
Michael Tryby 669bdde122 Expanding test 
Added test where data is a struct
 2019-04-10 16:12:13 -04:00
Michael Tryby 06a90fd063 Update test_list.cpp 
Updating file header to reflect proper attribution
 2019-04-10 11:34:37 -04:00
Michael Tryby 7d3c16a400 Update list.c 
Fixing indent
 2019-04-10 11:26:36 -04:00
Michael Tryby fbecf1b915 Fixing indent 
Spaces not tabs
 2019-04-10 11:25:01 -04:00
Michael Tryby dba0d1cf52 Update test_list.cpp 2019-04-10 11:15:35 -04:00
Michael Tryby 3d62254eb8 Update list.c 
Updating in line comments.
 2019-04-10 11:11:13 -04:00
Michael Tryby 6537b4fca0 Updating file headers 2019-04-10 11:03:23 -04:00
Michael Tryby f9dd9bc766 Clean up and inline comments 2019-04-10 10:57:55 -04:00
Michael Tryby ea02e1736e Fixed memory leak 
Fixed memory leak in test_head_list
 2019-04-10 10:44:34 -04:00
Michael Tryby 39038bc17e Fixing indentation 2019-04-09 18:17:15 -04:00
Michael Tryby 07995beda1 Fixing bug in head_list 2019-04-09 18:09:41 -04:00
Michael Tryby 1fdee6ac7e Fix typo 2019-04-09 16:16:54 -04:00
Michael Tryby dcfa51f938 Update list.h 
Adding documentation
 2019-04-09 16:09:37 -04:00
Michael Tryby 6f236f00ef Update test_list.cpp 
Tests are passing
 2019-04-09 15:16:54 -04:00
Michael Tryby 30f0def02a Initial commit list 
generic linked list
 2019-04-09 14:26:33 -04:00
Michael TrybyandGitHub 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
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 TrybyandGitHub 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
Michael TrybyandGitHub 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 TrybyandGitHub 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 TrybyandGitHub 0f7c07555b Merge pull request #444 from michaeltryby/dev 
Cleaning up build on gcc
 2019-04-03 10:58:46 -04:00
Michael Tryby 9da7e9a81b Cleaning up build on gcc 2019-04-03 10:29:10 -04:00
Michael Tryby 207cc53b04 Cleaning up build on gcc 2019-04-03 09:27:51 -04:00