Commit Graph

506 Commits

Author SHA1 Message Date
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 18cec6e7fb Fixing typo 2018-02-16 17:02:16 -05:00
Michael Tryby 65aafc06b7 Updating Travis to run unit tests 2018-02-16 16:47:11 -05:00
Michael Tryby 60db2a4435 Updating Travis to run unit tests 2018-02-16 16:42:46 -05:00
Michael Tryby 100421f509 Adding custom comparison for strings 2018-02-16 16:29:00 -05:00
Michael Tryby b1e8694cbf Fixing typo 2018-02-16 16:01:07 -05:00
Michael Tryby fe8d81d382 Fixing typo 2018-02-16 15:58:30 -05:00
Michael Tryby 2f90f401ef Modifying per element comparison 2018-02-16 15:54:24 -05:00
Michael Tryby 6199052744 Modifying per element comparison 2018-02-16 15:43:50 -05:00
Michael Tryby 07fa9f4758 Adding flag to compile for c++11 2018-02-16 15:25:57 -05:00
Michael Tryby 7c525318b5 Adding flag to compile for c++11 2018-02-16 15:20:42 -05:00
Michael Tryby 8875722082 Changing cmake to no longer glob output library files. 2018-02-16 15:13:07 -05:00
Michael Tryby 89f17d61c3 Adding libboost-test to Travis config. 2018-02-16 14:41:33 -05:00
Michael Tryby 9d2d131ce5 Adding libboost-test to Travis config. 2018-02-16 14:35:53 -05:00
Michael Tryby 508bfb1cd4 Adding support for unit testing using boost unit test and ctest 2018-02-16 14:17:12 -05:00
Michael Tryby ddd08e3d5f Conforming to pointer declaration style. 2018-02-02 10:52:32 -05:00
Michael Tryby 38292ad849 Fixed bug that was causing hard crash 2018-02-02 08:16:17 -05:00
Michael Tryby 17cd1c60f8 Switching EN_Project to void* for SWIG wrap. Cleaning up build. 2018-02-01 17:10:36 -05:00
Michael Tryby 62d6c9fade Converting EN_Project to void* EN_ProjectHandle to facilitate wrapping Toolkit API using SWIG. 2018-01-30 18:12:27 -05:00
Michael Tryby 060db17018 Adding epanet-output lib target to CMake 2018-01-26 13:16:53 -05:00
Michael Tryby c4332e6f32 Merge remote-tracking branch 'upstream/dev' into dev-swig 2018-01-26 12:39:44 -05:00
Michael Tryby 859a2ab9aa Moving epanet-toolkit to epanet-python repo 2018-01-25 10:59:40 -05: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