Commit Graph

38 Commits

Author SHA1 Message Date
Michael Tryby
2bf3be4c64 Adding tests at test root
Couldn't get tests in subdirectores to work so adding them at test root instead.
2019-03-22 11:51:08 -04:00
Michael Tryby
82055f24a9 Updating CI scripts 2019-03-21 18:34:01 -04:00
Michael Tryby
9f78cd1041 Updating method for getting latest tag 2019-03-07 09:40:17 -05:00
Michael Tryby
fbaf2d7d02 Testing jq install 2019-03-07 08:31:30 -05:00
Michael Tryby
12bbeb4921 Adding jq to install and adding error handling on curl call 2019-03-05 17:24:14 -05:00
Michael Tryby
e1067bd0c9 Adding platform and sut_build_id to travis 2019-03-05 15:56:50 -05:00
Michael Tryby
2f82deef7c Adding SUT_BUILD_ID to Travis 2019-03-05 15:03:03 -05:00
Michael Tryby
8110948148 Updating Travis CI 2019-03-05 14:50:27 -05:00
Michael Tryby
3c00e8e236 Updating Travis CI to use new build scripts 2019-03-05 14:49:42 -05:00
Michael Tryby
3c25d7df38 Upgrading to boost1.67 2019-02-28 16:45:01 -05:00
Michael Tryby
37be05f881 setting cmake compiler 2019-02-28 16:03:55 -05:00
Michael Tryby
dbc127b47e Upgrading to gcc 7 on Travis build worker 2019-02-28 15:52:04 -05:00
Michael Tryby
f4ea0a671e Running all tests 2019-02-11 15:51:40 -05:00
Michael Tryby
3e8e1c6009 Updating Travis to run coverage for reg tests 2019-02-11 15:44:26 -05:00
Michael Tryby
60f1e5eda8 Rolling back coveralls going with codecov 2019-02-08 16:52:07 -05:00
Michael Tryby
f8a397b536 Trying codecov 2019-02-08 16:30:40 -05:00
Michael Tryby
847da683a1 Messing with excludes 2019-02-08 15:29:01 -05:00
Michael Tryby
09cbe57518 Messing with excludes 2019-02-08 15:19:04 -05:00
Michael Tryby
26266c342c excluding project dirs from coverage 2019-02-08 15:00:19 -05:00
Michael Tryby
1531b29ec5 Configuring coveralls 2019-02-08 14:37:41 -05:00
Michael Tryby
eae80cb624 Configuring Travis for coverage 2019-02-08 14:31:16 -05:00
Michael Tryby
4af84f5ce7 Adding encrypted coveralls repo token 2019-02-08 14:14:59 -05:00
Michael Tryby
cc7f9f13f5 Setting up Travis working for coverage 2019-02-08 13:18:06 -05:00
Michael Tryby
6a0151b9c7 Adding support for custom epanet_py build target 2019-02-04 14:28:32 -05:00
Michael Tryby
7188642e39 Installing boost thread library 2018-09-04 09:50:08 -04:00
Michael Tryby
7326ca4b26 Fixing merge conflicts 2018-08-31 13:10:34 -04:00
Michael Tryby
d33167161a Revert "Make memorypool threadsafe " 2018-08-31 11:14:16 -04:00
Michael Tryby
84eb306681 Shutting of regression testing. 2018-08-31 10:54:37 -04:00
Michael Tryby
3433b9d5eb Add boost threads lib to Travis config 2018-08-30 15:47:44 -04:00
Michael Tryby
21b7a8ab47 Adding cmake variable BUILD_TESTS to Appveyor and Travis 2018-06-08 17:08:37 -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
0eb1433340 Updating travis config with before-test.sh 2018-04-04 16:42:22 -04:00
Michael Tryby
c75f42909e Fixing regression testing on Appveyor 2018-04-02 13:27:22 -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
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
92ea5a84a7 testing scripts and travis invocation 2015-12-15 20:38:53 -05:00
Sam Hatchett
655f5021b5 experiment with travis ci 2015-12-04 16:04:19 -05:00