Commit Graph

343 Commits

Author SHA1 Message Date
Michael Tryby
a10a38853a Fixing another typo 2018-05-23 09:59:51 -04:00
Michael Tryby
bb5fe49f37 Fixing typo 2018-05-23 09:56:22 -04:00
Michael Tryby
6358db92cd Fixing typo 2018-05-23 09:49:25 -04:00
Michael Tryby
52602ed8ac Adding VS 2017 64 bit to Appveyor build matrix 2018-05-23 09:42:27 -04:00
Lew Rossman
24d6b91607 Changes to get Net1.inp to run 2018-05-22 11:12:14 -04:00
Elad Salomons
80a0acc26b Set default pattern for new junctions
Also fix an `ENgetqualtype` function call to include the project pointer
2018-04-18 08:29:22 +03:00
Elad Salomons
a46652f47c Fix bug when adding a junction 2018-04-17 21:46:09 +03:00
Michael Tryby
67de368d1e Merge pull request #171 from michaeltryby/dev
Migrating to benchmark 2012vs10
2018-04-13 15:58:55 -04:00
Michael Tryby
cfcba154a7 Migrating Travis to 2012vs10 benchmark 2018-04-13 15:52:52 -04:00
Michael Tryby
0b70d87818 Migrating Appveyor to benchmark 2012vs10 2018-04-13 15:40:44 -04:00
Sam Hatchett
3de23845f5 fixes license and attribution issues 2018-04-09 12:10:19 -04:00
Sam Hatchett
612dd380a4 Revert "Revert "Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev""
This reverts commit 4415d8c4a1.
2018-04-09 11:41:50 -04:00
Elad Salomons
4415d8c4a1 Revert "Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev"
This reverts commit 8fca63294d, reversing
changes made to b85aff9fc9.
2018-04-09 15:03:03 +03:00
Elad Salomons
8fca63294d Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev 2018-04-09 15:02:19 +03:00
Elad Salomons
b85aff9fc9 Change how demand categories linked-list is constructed (appending instead of prepending)
Fix #150
This wasn't changed but one should note that the default pattern is used and saved if none assigned to a demand
2018-04-09 15:01:27 +03:00
Michael Tryby
d57b20e44d Cleaning up tests folder (#167) 2018-04-05 10:52:49 -04:00
Michael Tryby
7bc041e77e Merge pull request #166 from michaeltryby/add-test-cases
Add test cases
2018-04-04 17:39:39 -04:00
Michael Tryby
0eb1433340 Updating travis config with before-test.sh 2018-04-04 16:42:22 -04:00
Michael Tryby
8d1e05b807 Replacing epanet-nrtestsuite with before-test.sh 2018-04-04 16:38:36 -04:00
Michael Tryby
a892e8fcb0 Fix typo 2018-04-04 15:02:55 -04:00
Michael Tryby
c99e5d1f66 Adding before-test.cmd to appveyor configuration 2018-04-04 14:58:18 -04:00
Michael Tryby
6308ae708d Removing epanet-nrtestsuite and replacing the before-test.cmd 2018-04-04 14:47:01 -04:00
Michael Tryby
c9d4fd587c Fixing input file name. 2018-04-02 14:12:42 -04:00
Michael Tryby
cf2857b202 Making app-config.sh executable 2018-04-02 13:32:09 -04:00
Michael Tryby
c75f42909e Fixing regression testing on Appveyor 2018-04-02 13:27:22 -04:00
Michael Tryby
3283797847 Merge branch 'add-test-cases' into dev 2018-04-02 11:48:07 -04:00
Michael Tryby
0b5e3ea95f Adding benchmarks for new tests 2018-04-02 11:33:11 -04:00
Michael Tryby
3c4c5e5073 Fixing header/footer size in epanet report test 2018-03-23 15:10:03 -04:00
Michael Tryby
d599acd869 Adding new tests 2018-03-23 15:04:24 -04:00
Michael Tryby
230668a34d Updating benchmark with new tests 2018-03-22 17:27:53 -04:00
Michael Tryby
7c2d92f3f1 Adding new tests to run-nrtest scripts 2018-03-22 16:46:03 -04:00
Michael Tryby
1cf806206c Adding tests to regression test library 2018-03-22 16:34:24 -04:00
Michael Tryby
780698ccf9 Merge pull request #156 from michaeltryby/dev-decouple
Updating Appveyor to use epanet-output binary wheel
2018-03-21 15:53:43 -04:00
Michael Tryby
801bc1bb9c Merge branch 'dev' into dev-decouple 2018-03-21 15:53:08 -04:00
Michael Tryby
bbe40c5ba4 Feature unittest (#157)
* Adding support for unit testing using boost unit test and ctest

* Adding libboost-test to Travis config.

* Adding libboost-test to Travis config.

* Modifying per element comparison

* Modifying per element comparison

* Fixing typo

* Fixing typo

* Adding custom comparison for strings

* Updating Travis to run unit tests

* Updating Travis to run unit tests

* Fixing typo

* Preparing unit testing to run on Appveyor

* Preparing unit testing to run on Appveyor

* Preparing unit testing to run on Appveyor

* Preparing unit testing to run on Appveyor and Travis

* Preparing unit testing to run on Appveyor and Travis

* Preparing unit testing to run on Appveyor and Travis

* Preparing unit testing to run on Appveyor

* Preparing unit testing to run on Appveyor

* Fixing unit testing path issue in CMake

* Fixing unit testing path issue in CMake

* Fixing bugs in cmake and appveyor scripts

* Rolling back generate_export_header in cmake
2018-03-21 14:10:10 -04:00
Michael Tryby
73463770e5 Fixing typo 2018-03-16 16:37:29 -04:00
Michael Tryby
daf4b67e08 Updating Appveyor to use epanet-output binary wheel 2018-03-16 16:34:33 -04:00
Michael Tryby
c9192907a8 Updating Appveyor to use epanet-output binary wheel 2018-03-16 16:21:21 -04:00
Michael Tryby
63b4438765 Merge pull request #143 from OpenWaterAnalytics/dev-cmake-shared
modifies cmake to link shared lib to the CLI
2018-01-24 16:17:25 -05:00
Elad Salomons
dcd1c6dd10 Fix VB header file and win build script 2018-01-18 13:58:26 +02:00
Elad Salomons
831583a349 Revert "Fix VB header file and win build script"
This reverts commit 2b60bec5b5.
2018-01-18 13:55:48 +02:00
Elad Salomons
2b60bec5b5 Fix VB header file and win build script 2018-01-18 13:55:22 +02:00
Michael Tryby
d940904728 Merge pull request #145 from bemcdonnell/dev
Updated Appveyor Badges [default dev branch]
2018-01-17 17:01:43 -05:00
Bryant E. McDonnell
47551d42b9 Updated Readme Appveyor Badge [default dev branch] 2018-01-17 14:21:48 -05:00
Bryant E. McDonnell
a0ed2cf60c Test 2 - 2018-01-17 13:12:01 -05:00
Bryant E. McDonnell
a30d92b9c6 Testing Appveyor 2018-01-17 13:00:59 -05:00
Sam Hatchett
84abab346c modifies cmake to link shared lib to the CLI
also much improved IDE file grouping, for people who use IDEs
2018-01-12 11:38:05 -05:00
Michael Tryby
47733feb74 Configure appveyor (#142)
with much appreciation to @michaeltryby 🎉 

* Initial commit getting Appveyor running
* Modifying branch built
* Modifying generator
* Modifying path to test scripts
* Modifying path to test scripts
* Configuring appveyor cache to store cmake generated build files
* suppressing insecure string warnings
* Fixing typo
* Fixing problem with cmake build invocation
* Changing CMake to Linux build on Travis
* Adding compiler flags for MSVC
* Adding Appveyor build status badge
* Adding Appveyor build status badge
* Adding include directory so it is available to project files
* cleaning cache
* rebuilding cache
2018-01-12 11:35:43 -05:00
Sam Hatchett
d2503bc035 allows changing model units on-the-fly
replaces PR #140
and with special thanks to @eladsal
2018-01-11 15:22:26 -05:00
Sam Hatchett
3892b65759 re-adds EN_PRICEPATTERN getter
this was broken because of #136
2018-01-11 14:17:09 -05:00