Commit Graph

678 Commits

Author SHA1 Message Date
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
Michael Tryby
5e3ab5428d Merge remote-tracking branch 'refs/remotes/upstream/dev' into dev-swig 2018-01-24 14:34:49 -05:00
Elad Salomons
dcd1c6dd10 Fix VB header file and win build script 2018-01-18 13:58:26 +02:00
Elad Salomons
831583a349 Revert "Fix VB header file and win build script"
This reverts commit 2b60bec5b5.
2018-01-18 13:55:48 +02:00
Elad Salomons
2b60bec5b5 Fix VB header file and win build script 2018-01-18 13:55:22 +02:00
Michael Tryby
d940904728 Merge pull request #145 from bemcdonnell/dev
Updated Appveyor Badges [default dev branch]
2018-01-17 17:01:43 -05:00
Bryant E. McDonnell
47551d42b9 Updated Readme Appveyor Badge [default dev branch] 2018-01-17 14:21:48 -05:00
Bryant E. McDonnell
a0ed2cf60c Test 2 - 2018-01-17 13:12:01 -05:00
Bryant E. McDonnell
a30d92b9c6 Testing Appveyor 2018-01-17 13:00:59 -05:00
Sam Hatchett
84abab346c modifies cmake to link shared lib to the CLI
also much improved IDE file grouping, for people who use IDEs
2018-01-12 11:38:05 -05: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
Michael Tryby
691c65878b Initial commit of toolkit SWIG wrapper work 2018-01-12 09:46:32 -05:00
Sam Hatchett
d2503bc035 allows changing model units on-the-fly
replaces PR #140
and with special thanks to @eladsal
2018-01-11 15:22:26 -05:00
Sam Hatchett
3892b65759 re-adds EN_PRICEPATTERN getter
this was broken because of #136
2018-01-11 14:17:09 -05:00
Sam Hatchett
e1acb5a601 improves file availability from cmake-generated projects 2018-01-11 14:16:20 -05:00
Sam Hatchett
70c38b0d85 moves windows build to better-named directory 2018-01-11 14:16:00 -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
Elad Salomons
5eead5ae40 Fix quality conversion factor error in ENsetqualtype
Reported here:

http://community.wateranalytics.org/t/difference-in-water-age-calculated-in-epanet-and-in-matlab-using-epanet-matlab-toolkit/406/12
2017-06-15 16:21:39 +03:00
Elad Salomons
a00269e39a Added comment for 3c78856
Added comment for 3c78856
2017-05-01 13:28:59 +03:00
Elad Salomons
3c788567a4 Fix ENsetqualtype to set node initial values
When changing from CHEM to AGE or TRACE, nodes initial quality values
must be returned to their original ones. Reported by R.T., CSIRO AU -
thanks!
2017-05-01 13:25:59 +03:00
Elad Salomons
8ab0f06ccc Added option to retrieve the pumps price pattern
Added to ENgetlinkvalue function like the speed\status pattern. use the
new EN_PRICEPATTERN constant.
2017-04-13 12:14:32 +03:00
Demetrios G. Eliades
8d968738ac Added the link to the step-by-step tutorial (#76) 2016-11-21 14:38:53 -05:00
Elad Salomons
09bf10d4a7 Merge pull request #89 from OpenWaterAnalytics/dev-rule-apis
Merge dev-rule-apis into dev
2016-11-21 21:31:17 +02:00
Elad Salomons
e1da9bc9d7 Fix duplicate w_POWER definition
Fix duplicate w_POWER definition and some house keeping. Tested the new
commit by @AngelaMarchi from #87, all results are the same as version
2.1.
2016-11-09 16:37:57 +02:00
Elad Salomons
bca5409952 Merge pull request #87 from AngelaMarchi/ChangingRuleBased_v2
Thanks @AngelaMarchi
2016-11-08 12:00:20 +02:00
AngelaMarchi
83dd6c7b7c ChangingRuleBased_v2
The code has the following modifications:
- RULE section is written just after controls
- SYST is now written SYSTEM (also PRESSURE, DEMAND, POWER, SETTING,
FILLTIME and DRAINTIME have been changed)
- some description to the function writeRuleinInp has been added
- Actions are now written in the correct order
2016-11-08 18:37:54 +10:30
Elad Salomons
ab4622b276 Updated more float types in function APIs
Updated APIs calls to support EN_API_FLOAT_TYPE and few updates to the
DEF file
2016-10-10 11:45:02 +03:00
Elad Salomons
9942f6761d Updated def file and float types in function APIs
Added the new funcions to the DEF file.
Updated VB headers from Double to Single
Changed a few APIs calls to support EN_API_FLOAT_TYPE - this needs more
work for the rest of the new functions
2016-09-24 12:28:20 +03:00
Elad Salomons
98b86cd014 Merge pull request #84 from AngelaMarchi/ChangingRuleBased
Changing rule based
2016-09-23 14:00:34 +03:00