jiang/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
929 Commits 1 Branch 0 Tags
8b4727eac58e7283edf59e365d880a9154437005
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael TrybyandGitHub 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 TrybyandGitHub 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
Michael Tryby 3828ebb1cd updating cstr_helper to use secure string functions 2019-04-02 13:48:38 -04:00
Michael Tryby a89f3c9005 Making sure filename is null terminated string 
Added file_handle validation
 2019-04-02 12:31:05 -04:00
Michael Tryby c98d13de80 Updated filemanager to use dynamically allocated strings 
converted filename to dynamically allocated string
created cstr_helper
 2019-04-02 11:05:56 -04:00
Michael Tryby 2c6d4ca74d Work in progress 
Added test for temp files, getter for filename, and wrappers for fwrite, fprintf, and fgets
 2019-04-01 18:05:02 -04:00
Michael Tryby a0b08921fc Tweaking header doc 2019-04-01 15:24:52 -04:00
Michael Tryby 36a12cd4b6 Adding test_filemanager to ctest 2019-04-01 15:23:13 -04:00
Michael Tryby b9f00421dd Adding header info 2019-04-01 15:16:58 -04:00
Michael Tryby 23ac179ec1 Implementing filemanager 
Implementing and testing filemanager and upgrading epanet_output library to use it.
 2019-04-01 15:03:02 -04:00
Michael Tryby 69da9a4997 Work in progress 2019-03-29 17:04:55 -04:00
Michael Tryby d1df792c77 Adding remove_file() 2019-03-28 17:39:05 -04:00
Michael Tryby 727ede3aba Initial commit 
filemanager
 2019-03-28 17:28:02 -04:00
Michael Tryby 1b167b5caf Cleaning up include statements 
Removing inclusion of malloc.h. Adding crtdbg.h
 2019-03-28 09:26:26 -04:00
Michael Tryby 8574f52256 Fixing indentation 2019-03-26 16:48:08 -04:00
Michael Tryby d4d876da71 Update appveyor.yml 
Adding conditions to post test tasks
 2019-03-26 15:51:09 -04:00
Michael Tryby 44bea587c0 Fixing bug in appveyor.yml 2019-03-26 15:18:54 -04:00
Michael Tryby 1a01b46187 Adding build configuration 
Setting up debug build so we can better monitor memory leaks
 2019-03-26 14:57:41 -04:00
Michael TrybyandGitHub 8ca4f473dc Merge pull request #433 from michaeltryby/dev 
Updating py API with changes to error manager
 2019-03-26 13:31:39 -04:00
Michael Tryby 27bf153941 Updating py API with changes to errormanager 2019-03-26 13:09:09 -04:00
Michael TrybyandGitHub c90157a212 Merge pull request #428 from michaeltryby/dev 
new unit test organization and build strategy
 2019-03-22 15:50:48 -04:00
Michael Tryby 1e7cba167c Delete test_comments.cpp 2019-03-22 15:35:35 -04:00
Michael Tryby df4e62b550 Adding comment test 2019-03-22 15:34:34 -04:00
Michael Tryby b02f1ef346 Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev 2019-03-22 14:10:41 -04:00
Michael Tryby 44938918bf Rolling back option to BUILD_TESTS 
BUILD_TESTING is defined within cmake when ctest module is included. Rolled back include(CTest) so we are going to define our own test option instead.
 2019-03-22 11:59:59 -04:00
Michael Tryby 2bf3be4c64 Adding tests at test root 
Couldn't get tests in subdirectores to work so adding them at test root instead.
 2019-03-22 11:51:08 -04:00
Michael Tryby ec72db5d82 pulling up call to find_packages 
eliminates multiple calls to find_packages
 2019-03-22 11:08:54 -04:00
Michael Tryby c9903620cb Fine tuning linking strategy 
static linking on Windows (MSVC and mingw) dyn linking everywhere else.
 2019-03-22 09:55:34 -04:00
Michael Tryby 84341c3237 Switching MSVC to static link 2019-03-22 09:20:33 -04:00
Michael Tryby 66c274c343 Adding BOOST_TEST_MAIN for gcc build 2019-03-22 09:14:26 -04:00
Michael Tryby 82055f24a9 Updating CI scripts 2019-03-21 18:34:01 -04:00
Michael Tryby eb4ae7f670 Adding boost system for gcc build 2019-03-21 18:19:17 -04:00
Michael Tryby 48facd89d0 Fixing test build on gcc 2019-03-21 18:08:05 -04:00
Michael Tryby 0c56df4041 Reorganizing tests 
Adding test_net_builder and test_reent to cmake build script.
 2019-03-21 13:44:31 -04:00
Michael Tryby 5687c63548 Reorganizing unit tests 
Unit tests for the toolkit are consolidated into one test module with a separate test suite for related API functions.
 2019-03-21 13:11:10 -04:00
Michael Tryby 80ce382a38 Removing epanet-output from tools folder 
epanet-output has been moved to epanet/src/outfile
 2019-03-20 18:01:11 -04:00
Michael Tryby ccbb422259 Reorganizing src and test folders 
Moving epanet_output library from tools to src folder. Setting up parallel folder hierarchy in tests folder.
 2019-03-20 17:58:24 -04:00
Michael Tryby 7eadbc25ce Adding unit test and refactoring 
Added unit test for errormanager and refactored to simplify use of error_check() method.
 2019-03-20 15:43:27 -04:00
Michael TrybyandGitHub 01eb164fdc Merge pull request #424 from michaeltryby/dev 
Reorganizing tests to improve build performance
 2019-03-19 15:46:59 -04:00
Michael Tryby 260bdef2cf Update test_net_builder.cpp 
Removing strings and adding test fixture
 2019-03-19 14:10:29 -04:00
Michael Tryby a566f914d4 Eliminating build warnings on gcc 2019-03-19 13:50:39 -04:00
Michael Tryby 29cfe43e5a Cleaning up tests 
Fixing memory leak associated with using string objects to pass filepath arguments to toolkit
 2019-03-19 13:27:07 -04:00
Michael Tryby ed9a89763b Reorganizing tests to improve build performance 2019-03-18 16:06:21 -04:00
Michael TrybyandGitHub c26775314c Merge pull request #420 from michaeltryby/dev 
Cleaning up test build
 2019-03-15 19:18:50 -04:00
Michael Tryby 592e4c6ada Merge remote-tracking branch 'upstream/dev' into dev 2019-03-15 17:27:02 -04:00
Michael Tryby e70ce35e60 Cleaning up tests 2019-03-15 17:25:59 -04:00
Michael Tryby d61a1aa786 Minor cleanup 2019-03-12 15:07:52 -04:00
Michael Tryby 32091830c6 Adding test for EN_getnodevalue 2019-03-12 13:35:24 -04:00
Michael TrybyandGitHub 3f91ab110b Merge pull request #417 from michaeltryby/dev 
Improving error handling in before_test.cmd
 2019-03-12 09:52:30 -04:00
Michael Tryby b86b1508cf Improving error handling in before_test.cmd 2019-03-12 08:41:06 -04:00
Michael TrybyandGitHub 3ba8d93da3 Merge pull request #416 from michaeltryby/dev 
Add access test to test_output.cpp
 2019-03-11 17:50:59 -04:00
Michael Tryby 516ae498c3 Changing DLLEXPORT to EXPORT_OUT_API and creating epanet_output_enums.h 2019-03-11 17:11:47 -04:00
Michael Tryby 724bac732b Merge remote-tracking branch 'upstream/dev' into dev 2019-03-08 18:16:28 -05:00
Michael Tryby 0b76cfb2df Adding test for EN_getnodevalue 2019-03-08 18:15:47 -05:00
Michael Tryby 9cff84582f Adding test for output file access prior to project close 2019-03-08 14:09:53 -05:00
Michael TrybyandGitHub 7521fe2810 Merge pull request #413 from michaeltryby/dev 
Fixing bug in API for python wrapper
 2019-03-08 10:10:00 -05:00
Michael Tryby fbbffb36ce Renaming rprt_getcount to proj_getcount 2019-03-08 09:51:38 -05:00
Michael TrybyandGitHub da60bc4225 Merge pull request #412 from michaeltryby/dev 
Restores coverage
 2019-03-07 19:26:17 -05:00
Michael Tryby a8bcc8947b Merge remote-tracking branch 'upstream/dev' into dev 2019-03-07 15:52:43 -05:00
Michael Tryby fafa223d91 Fixing call to gen-config 2019-03-07 15:41:54 -05:00
Michael Tryby 4f23a03829 Fancy grep regex 2019-03-07 12:42:29 -05:00
Michael Tryby 2ef4241c02 Adding exit conditions 2019-03-07 11:35:48 -05:00
Michael Tryby 8d1b490458 Shellchecked script and eliminated redirect 2019-03-07 11:03:41 -05:00
Michael Tryby 93363dccfc Quoting the URLs 2019-03-07 10:29:27 -05:00
Michael Tryby 13160e1366 Quoting the command 2019-03-07 10:17:09 -05:00
Michael Tryby 9f78cd1041 Updating method for getting latest tag 2019-03-07 09:40:17 -05:00
Michael Tryby d0633515cc Testing curl call 2019-03-07 08:40:37 -05:00
Michael Tryby fbaf2d7d02 Testing jq install 2019-03-07 08:31:30 -05:00
Michael Tryby 5d10728fd2 Fixing call to determine latest git tag 2019-03-07 08:21:17 -05:00