Commit Graph

52 Commits

Author SHA1 Message Date
Michael Tryby
fed58fdcbd Updating benchmark version 2018-12-17 12:14:08 -05:00
Michael Tryby
93760176bf Updateing benchmark 2018-10-12 08:58:17 -04:00
Michael Tryby
2a86252a10 Updating benchmark 2018-09-13 16:20:52 -04:00
Michael Tryby
bdc05058ca Resolving merge conflicts 2018-08-27 09:38:46 -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
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
75e400cf44 Merging changes from upstream dev 2018-08-22 15:09:33 -04:00
Michael Tryby
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
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
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
39dc089b58 Updating benchmark 2018-06-26 16:36:23 -04: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
Michael Tryby
8d1e05b807 Replacing epanet-nrtestsuite with before-test.sh 2018-04-04 16:38:36 -04:00
Michael Tryby
6308ae708d Removing epanet-nrtestsuite and replacing the before-test.cmd 2018-04-04 14:47:01 -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
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
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
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
c9192907a8 Updating Appveyor to use epanet-output binary wheel 2018-03-16 16:21:21 -04: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
f97d837231 Feature wrapper (#136)
this quite sizable commit does several things, but is primarily
focussed on building a toolkit that can run simultaneous
simulations/analyses within a shared memory space. Versions <=2.1 use a
long list of global variables that prevent multiple instantiations on
linux systems without resorting to compilation tricks (like duplicate
binaries or similar via static linkage). This version uses a single "Project" pointer to encapsulate
the network and analysis data. There are no changes to existing algo
implementations other than to accomodate dereferencing of the passed-in
pointers. A more detailed list of major changes below:

- mirrors all “ENxxxx” function calls with “EN_xxxx” versions (note the
underscore) that take an extra first parameter: a pointer to an
EN_Project struct, which contains all network, hydraulic, quality, and
associated data.
- tweaks some code formatting to make it more readable
- removes some deprecated/commented code that was sufficiently old
- fixes implicit type-cast warnings

* Added ENaddnode and ENaddlink functions

* More memory reallocations

* Added ENInit, ENsetheadcurveindex

* Added ENdeletelink and ENdeletenode

* restored default behavior for float types

* fixed type

* Added docstrings for ENinit

* cleanup change

* moves global rule variables to vars.h

* migrates rule structs to typedefs

for better readability

* char types to proper enums

fixes #93

* Change some variable declarations for compatibility

Changes to keep compatibility with C89 compilers: variables must be
declared at the top of the functions. Remove the use of EN_LinkType in
function call as it is not compatible with ENgetnodetype.

* Moved declaration of idstodelete to top of function

* Updated ENinit function and headers

Updated header files with new functions
Updated def file with new functions
For ENinit changes names of parameters #98
Added enum for headloss formula

* Missed these files in 1a033fc

* migrates char types to enums fixes #93,

supports unified link/node type enums, rather than public/private
redefinitions

* removing links in reverse-index order maintains proper indexing fixes #96

* style

* clarifies curve getter units issue (dox)

closes #95

* fixes link/node confusion in ENsetlinktype

partially reverts a3bce95dc330a5a297634a303d438e2e1bc41cc9

* partial compilation fix

* fixes dox issue

* fixes allocation issues with enums

- updates style in various places
- introduces FlowDirection enum
- use snprintf to prevent overflow

* fixes enum type cast

* updated mac project settings

* Use of _snprintf on Windows and remove DLLEXPORT from mempool.h

snprintf it not compatible on Windows so we use _snprintf
mempool gave starnge compilation errors while removing DLLEXPORT worked.
Not sure why these functions needed to be exposed in the DLL?

* Revert "Use of _snprintf on Windows and remove DLLEXPORT from mempool.h"

This reverts commit 6238f77d47fa0feaabe5836043c006937de433a2.

* use of _snprintf instead of snprintf on Windows and removed DLLEXPORT from mempool.h

Had compilation errors on mempool.h. Removed DLLEXPORT so solve it. Not
sure why there was a need to expose these functions?

* Shift indices for Links in ENaddnode

Need to shift indices for Links not just Pipes since a pump could be
connected directly to a reservoir. Also set the defult base demand to
zero (was 5).

* Set defualts for madatory link properties in ENaddlink and small fix for ENsetheadcurveindex

Relates to #102 and closes #103

* wraps globals into structs, duplicates api functions with objective versions



* parse and serialize Comment field for network elements

related to #47

* adds getter for head/efficiency curve

in EN_getlinkvalue

* adds getter for event node index

… to return the index of the junction (tank) that triggered the event.

* fixes edge case in parsing

… where inp files without demands in [JUNCTIONS] and without any
[DEMAND] categories will fail.

* adds freeing function for project pointer

* removes redundant string literals, fixes overrun issue in error message getter function

* check for hydraulics already closed

* moving error definitions to data file

* deprecates ENR err message getter (unused)

* updates location of errors data file

also begins to expose blind structs to curves and patterns,
anticipating buildout of APIs for those.

* updates CLI output to reflect executable name as invoked

relates to #109

* Feature nrtest (#131)

* Initial commit EPANET testing tools.

* Initial commit for epanet-nrtestsuite

* SWIG wrapper for EPANET outputapi (#118)

* Removed pervious version of outputapi and wrapper

* SWIG wrapper for EPANET outputapi

* Patching cmake build script fixed target for outputapi

* Build failing on deprecated test script

* Minor changes. Responding to review comments.

* Feature nrtest (#121)

* Configured python setup to automatically build nrtest tools.

* Working on build / testing automation

* Adding EPANET 2.0.12 benchmark

* Updated Travis yml to run nrtest

* Fixing InsecurePlatformWarning

* Fixing InsecurePlatformWarning again

* Fixing InsecurePlatformWarning

* Fixing InsecurePlatformWarning

* Fixing InsecurePlatformWarning

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Working on configuring python environment and building test tools under Travis CI.

* Making gen-config.sh and run-nrtest.sh executable

* Debugging .travis.yml

* Debugging .travis.yml

* Debugging .travis.yml again

* Debugging .travis.yml again

* debugging travis setup

* debugging Travis setup

* debugging Travis setup

* debugging Travis setup

* debugging Travis setup

* debugging Travis setup

* debugging Travis setup

* debugging Travis setup

* debugging Travis setup

* debugging Travis setup

* debugging Travis setup

* Fixing bug with __strncpy_chk destlen < len

* nrtesting clean up

* re-implements fixes from:

5eead5ae40
3c788567a4

* removes extraneous build files, moves cmake and updates travis

* mirror of 9b37035560f9683f1514b439f7586a5c17bca5bf

* Move some variable declarations

* More variable declarations

* Fix TmpDir

* Allocate _defaultModel

* Fix EN_addcurve funcrion

* Fix for inpfile

* Fix writeRuleinInp call

* Set MAXMSG to 79 chars

* Fix for flow direction

* Refactoring testing related python packages and SWIG wrapper bug fix (#139)

* Eliminated epanet-reader package. Removed numpy dependency from epanet-output. Fixed reference counting bug in SWIG wrapper. Added error checking to run_nrtest.sh. Added nrtest package to requirements file.

* changing buildhome directory

* Fixing bug related to preprocessor definition of PI
2018-01-09 16:56:42 -05:00
sam hatchett
ff6225372a there are two hard problems.
naming things and counting things
2015-12-17 13:49:23 -05:00
sam hatchett
8fe3bbef23 fixes diff script 2015-12-17 13:46:32 -05:00
sam hatchett
81fa79745a fixing python printing 2015-12-17 13:36:53 -05:00
sam hatchett
eb629b8392 better debug output 2015-12-17 13:33:33 -05:00
sam hatchett
1d8d2fb882 combining testing framework with python diff script 2015-12-17 13:22:28 -05:00
Bryant McDonnell
b2309e257a Minor updates to ENOutputWrapper.py; Adding OutDiff.py 2015-12-16 22:09:38 -05:00
Bryant McDonnell
44ad6e841a Adding Python wrapper for outputapi 2015-12-10 20:54:57 -05:00
Michael Tryby
2f00a822c5 Initial commit for EPANET binary output API 2015-12-04 15:46:32 -05:00