Commit Graph

678 Commits

Author SHA1 Message Date
Michael Tryby
ed777d9d73 Merge branch 'dev' into contributor-lr 2018-06-14 12:34:46 -04:00
Lew Rossman
a73b2d7508 #defined MAXFNAME as 260 instead of L_tmpnam_s 2018-06-09 12:07:44 -04:00
Michael Tryby
5b75bde91d Merge pull request #192 from michaeltryby/dev
Adding cmake variable BUILD_TESTS to Appveyor and Travis
2018-06-08 18:02:05 -04:00
Michael Tryby
21b7a8ab47 Adding cmake variable BUILD_TESTS to Appveyor and Travis 2018-06-08 17:08:37 -04:00
Sam Hatchett
12d3005bd2 Make it more obvious where to ask questions (#191) 2018-06-07 12:03:49 -05:00
Sam Hatchett
9520b6d253 fixes cmake for mac, adds define option for building tests 2018-06-06 18:14:36 -05:00
Lew Rossman
f0c9684871 Changes to pass reg tests
Revised getTmpName() in EPANET.C
2018-06-05 10:31:18 -04:00
Lew Rossman
598f080f52 Merge branch 'contributor-lr' of https://github.com/LRossman/EPANET into contributor-lr 2018-05-24 09:38:34 -04:00
Lew Rossman
4d1cd779ca Changed version # in binary output file
Kept version number at 20012 in binary output file so that the existing EPANET GUI can use this EPANET DLL.
2018-05-24 09:35:49 -04:00
Michael Tryby
9c586bb3f6 Adding quotes around call to generator var 2018-05-23 10:28:23 -04:00
Michael Tryby
5af1ebfdf7 Simplifying env vars in appveyor matrix 2018-05-23 10:18:33 -04:00
Michael Tryby
03fee3a344 Fixing another typo 2018-05-23 10:06:06 -04:00
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