Michael Tryby
bdc05058ca
Resolving merge conflicts
2018-08-27 09:38:46 -04:00
Michael Tryby and GitHub
c4b7c90634
Merge pull request #210 from LRossman/contributor-lr
...
Pressure Dependent Demands added to address issue 163
2018-08-24 17:30:38 -04:00
Michael Tryby
93061191c5
Trigging CI build
2018-08-24 17:24:11 -04:00
Michael Tryby
22d0e036c4
Trigging CI build
2018-08-24 17:09:31 -04:00
Michael Tryby
f847a3ed6e
Merge branch 'contributor-lr' of https://github.com/LRossman/EPANET into contributor-lr
2018-08-24 16:14:54 -04:00
Michael Tryby
66bb150f99
Forgot to add new tests
2018-08-24 16:12:47 -04:00
Michael Tryby and GitHub
f495d2c707
Merge branch 'dev' into contributor-lr
2018-08-24 16:09:21 -04:00
Michael Tryby
364e4987d8
Bumping rolling benchmark version
2018-08-24 16:03:53 -04:00
Michael Tryby
40cd25748c
Fixing bug EN_getcurvetype
2018-08-23 08:00:30 -04:00
Michael Tryby
670440b55c
Fixing function definition for EN_getcurve
2018-08-23 07:56:11 -04:00
Michael Tryby
e8acc1b177
Fixing build
2018-08-23 07:48:01 -04:00
Michael Tryby
888e447ad9
Adding GEN_X to cmake invocation
2018-08-22 16:14:21 -04:00
Michael Tryby
0938f82c32
Adding adding GEN_X macro for cmake export header
2018-08-22 15:46:24 -04:00
Michael Tryby
c6fe1230d0
Fixing merge conflict
2018-08-22 15:20:53 -04:00
Michael Tryby
75e400cf44
Merging changes from upstream dev
2018-08-22 15:09:33 -04:00
Michael Tryby
fafad2a070
Revert "Reorganizing epanet header"
...
This reverts commit c8803a9f1b
2018-08-22 15:05:48 -04:00
Michael Tryby
f66d4c68d9
Revert "Reorganizing / refactoring api functions for swig wrap"
...
This reverts commit 437a7c70e0
2018-08-22 14:48:20 -04:00
Michael Tryby
bd4c369f83
Revert "Reorganizing / refactoring api functions for swig wrap"
...
This reverts commit 8ff88f86b8
2018-08-22 14:46:45 -04:00
Michael Tryby
26ce95673a
Renaming test
2018-08-22 11:35:44 -04:00
Michael Tryby and GitHub
b59ae060a0
Merge pull request #217 from michaeltryby/dev-test
...
Dev test
2018-08-16 11:06:05 -04:00
Michael Tryby
efc44215f3
Implementing metadata support
2018-08-16 10:26:32 -04:00
Michael Tryby
606101af89
Adding support for chem units
2018-08-14 11:10:27 -04:00
Michael Tryby
8ff88f86b8
Reorganizing / refactoring api functions for swig wrap
2018-07-19 11:16:49 -04:00
Michael Tryby
437a7c70e0
Reorganizing / refactoring api functions for swig wrap
2018-07-18 18:33:51 -04:00
Michael Tryby and GitHub
4a0e1a06a9
Merge pull request #200 from LRossman/contributor-lr
...
Improved Node Re-Ordering Method (Issue #162 )
2018-07-16 17:24:28 -04:00
Michael Tryby
e6e7942585
Fixing typo
2018-07-16 17:18:09 -04:00
Michael Tryby
e38d7ece50
Bumping benchmark version
2018-07-16 17:09:02 -04:00
Michael Tryby
711bde01d1
Switching build to VS 2017 and bumping benchmark version
2018-07-16 17:02:35 -04:00
Michael Tryby
10c5608210
Adding command line interface to report_diff
2018-07-16 14:25:53 -04:00
Michael Tryby
4723336726
Adding errormanager to toolkit api
2018-07-13 11:47:47 -04:00
Michael Tryby
db40fa7bbe
Improving diff report format
2018-07-12 10:28:25 -04:00
Michael Tryby
86c55a2373
Fixing typo
2018-07-11 17:22:26 -04:00
Michael Tryby
c482f38639
Initial commit for report_diff
2018-07-11 17:19:18 -04:00
Michael Tryby
e3cd4ae41a
Bumping version
2018-07-11 10:04:10 -04:00
Michael Tryby
f38a637aaf
Adding mincdd comparison and better debug information
2018-07-10 18:50:33 -04:00
Michael Tryby
51f5295e8c
Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev
2018-07-09 11:11:39 -04:00
Michael Tryby
c8803a9f1b
Reorganizing epanet header
2018-07-06 17:42:27 -04:00
Michael Tryby
a93465e1cc
Adding test for simultaneous stepping through hyd and qual simulation
2018-07-06 09:48:33 -04:00
Michael Tryby
74fbcf7768
Adding test for stepping through quality simulation
2018-07-06 09:31:58 -04:00
Michael Tryby
64f72abd78
Adding test for stepping through hydraulic simulation
2018-07-05 19:36:50 -04:00
Michael Tryby
efcf8735f0
Fixing indent
2018-07-05 18:45:13 -04:00
Michael Tryby
245e2c5060
Adding tests and a fixture
2018-07-05 18:35:41 -04:00
Michael Tryby
594b6b9260
Python package epanet-python builds and runs
2018-07-03 18:47:30 -04:00
Michael Tryby
323e041e6b
Fixing typo
2018-07-03 18:16:09 -04:00
Michael Tryby
ff2c851b1c
Merging latest from dev, trying to get import lib generated
2018-07-03 17:38:40 -04:00
Michael Tryby and GitHub
e1456718a4
Merge pull request #195 from LRossman/contributor-lr
...
Feature Update - more rigorous hydraulic convergence criteria (#161 )
2018-06-26 16:51:07 -04:00
Michael Tryby
39dc089b58
Updating benchmark
2018-06-26 16:36:23 -04:00
Michael Tryby
aa81bff09e
Adding build and testing instructions.
2018-06-19 17:09:18 -04:00
Michael Tryby and GitHub
7e73de860a
Merge pull request #177 from LRossman/contributor-lr
...
Changes to get Net1.inp to run
2018-06-15 11:53:20 -04:00
Michael Tryby
f11308fc72
Switching Visual Studio 2017 build to 32 bit
2018-06-15 10:50:37 -04:00
Michael Tryby
d374e7bf1a
Changing MAXFNAME from 260 back to 259
2018-06-15 10:41:52 -04:00
Michael Tryby
9ad5c2ce9b
Fixing bug in appyeyor config
2018-06-15 10:27:52 -04:00
Michael Tryby and GitHub
ed777d9d73
Merge branch 'dev' into contributor-lr
2018-06-14 12:34:46 -04:00
Michael Tryby and GitHub
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
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
Michael Tryby and GitHub
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
Michael Tryby and Sam Hatchett
d57b20e44d
Cleaning up tests folder ( #167 )
2018-04-05 10:52:49 -04:00
Michael Tryby and GitHub
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 and GitHub
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 and GitHub
801bc1bb9c
Merge branch 'dev' into dev-decouple
2018-03-21 15:53:08 -04:00
Michael Tryby and Sam Hatchett
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