OpenWaterAnalytics · samhatchett · Dec 10, 2019 · Apr 3, 2019 · Apr 3, 2019 · Apr 3, 2019
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
@@ -0,0 +1,19 @@
+name: C/C++ CI
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: setup_build_dir
+      run: mkdir buildproducts
+    - name: cmake
+      working-directory: ./buildproducts
+      run: cmake ..
+    - name: make
+      working-directory: ./buildproducts
+      run: make
diff --git a/.gitignore b/.gitignore
@@ -41,7 +41,6 @@ xcuserdata
 *~.nib/
 *.swp
 *~
-*.dat
 *.dep
 
 *.xcodeproj/
@@ -202,3 +201,36 @@ $RECYCLE.BIN/
 # WindSDK compiled folders
 build/WinSDK/32bit/
 build/WinSDK/64bit/
+=======
+
+
+# Python compiler files
+*.py[c]
+
+# Python distribution and packaging
+dist/
+temp/
+*.cfg
+*.egg-info/
+
+# Eclipse Stuff
+.metadata/
+.settings/
+.project
+.cproject
+.pydevproject
+
+# Testing Stuff
+nrtestsuite/
+tests/data/
+tests/outfile/data/en*
+
+
+#Cmake stuff
+__cmake_systeminformation/
+buildprod*/
+*_export.h
+
+
+# git merge
+*.orig
diff --git a/.mailmap b/.mailmap
@@ -1,9 +1,20 @@
-Sam Hatchett <samhatchett@gmail.com>
 James Uber <jim@citilogics.com>
 Demetrios Eliades <eldemet@gmail.com>
 Hyoungmin Woo <hyoungmin.woo@gmail.com>
 Hyoungmin Woo <hyoungmin.woo@gmail.com> <woohn@mail.uc.edu>
 Yunier Soad <yunier.soad@gmail.com>
 Jinduan Chen <jinduan.uc@gmail.com>
 Maurizio Cingi <mrzcng2@gmail.com>
-Elad Salomons <selad@optiwater.com> <elad.salomons@gmail.com>
+Elad Salomons <selad@optiwater.com> <elad.salomons@gmail.com>
+Angela Marchi <angela.marchi@adelaide.edu.au>
+Angela Marchi <angela.marchi@adelaide.edu.au> <a1219261@adelaide.edu.au>
+Bryant McDonnell <bemcdonnell@gmail.com>
+Marios Kyriakou <mariosmsk@gmail.com>
+Marios Kyriakou <mariosmsk@gmail.com> <mariosmsk@mariosmsk.com>
+Sam Hatchett <samhatchett@gmail.com>
+Sam Hatchett <samhatchett@gmail.com> <sam.hatchett@xyleminc.com>
+Markus Sunela <markus.sunela@fluidit.fi>
+Markus Sunela <markus.sunela@fluidit.fi> <30700548+makusuko@users.noreply.github.com>
+Lew Rossman <LRossman@cinci.rr.com>
+Lew Rossman <LRossman@cinci.rr.com> <LRossman@outlook.com>
+Michael Tryby <tryby.michael@epa.gov> michaeltryby <tryby.michael@epa.gov>
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,58 @@
-language: c
+language: python
+
+matrix:
+  include:
+    # works on Precise and Trusty
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - sourceline: 'ppa:mhier/libboost-latest'
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-7
+            - boost1.67
+      env:
+         - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
+         - PLATFORM="linux"
+         - REF_BUILD_ID="220dev1"
+
+python:
+    - "3.6"
+
+env:
+  global:
+    - SUT_BUILD_ID=$TRAVIS_JOB_NUMBER
+    - EPANET_HOME=`pwd`
+    - BUILD_HOME=buildprod
+    - TEST_HOME=nrtestsuite
+
+before_install:
+#  - sudo apt-get -qq update
+  - eval "${MATRIX_EVAL}"
+
+#install:
+#  - sudo apt-get install -y libboost-test-dev
+#  - sudo apt-get install -y libboost-thread-dev
 
 before_script:
-  - cd build/CMake
-  - mkdir buildproducts
-  - cd buildproducts
-  - cmake ..
+  - mkdir -p $BUILD_HOME
+  - cd $BUILD_HOME
+  - cmake -DCMAKE_C_COMPILER=${CC}
+          -DCMAKE_CXX_COMPILER=${CXX}
+          -DBUILD_TESTS=ON
+          -DBUILD_COVERAGE=ON ..
 
 script:
-  - make
-  - cd ../../../tests
-  - ./test_networks.sh
+  - cmake --build .
+  # run unit tests
+  - cd tests
+  - ctest --output-on-failure
+  # run regression tests
+  - cd $EPANET_HOME
+  - pip install -r tools/requirements.txt
+  - tools/before-test.sh $PLATFORM $REF_BUILD_ID $SUT_BUILD_ID $TRAVIS_COMMIT
+  - tools/run-nrtest.sh -c -s $SUT_BUILD_ID
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)
diff --git a/AUTHORS b/AUTHORS
@@ -1,8 +1,12 @@
 # Authors ordered by first contribution.
-# Generated by tools/update-authors.sh
 
-Lew Rossman <LRossman@cinci.rr.com>
+Authors with Contributions in the Public Domain:
+
+Lewis Rossman <LRossman@cinci.rr.com>
 Michael Tryby <tryby.michael@epa.gov>
+
+Authors with Contributions Subject to Copyright (see LICENSE):
+
 Sam Hatchett <samhatchett@gmail.com>
 Feng Shang <fshang>
 James Uber <jim@citilogics.com>
@@ -14,7 +18,10 @@ Mike Kane <muke195@gmail.com>
 Demetrios Eliades <eldemet@gmail.com>
 Will Furnass <will@thearete.co.uk>
 Steffen Macke <sdteffen@sdteffen.de>
-Mariosmsk <mariosmsk@gmail.com>
+Marios Kyriakou <mariosmsk@gmail.com>
 Elad Salomons <selad@optiwater.com>
 Maurizio Cingi <mrzcng2@gmail.com>
 Bryant McDonnell <bemcdonnell@gmail.com>
+Angela Marchi <angela.marchi@adelaide.edu.au>
+Markus Sunela <markus.sunela@fluidit.fi>
+Milad Ghiami <milad-ghiami@users.noreply.github.com>
diff --git a/BUILDING.md b/BUILDING.md
@@ -0,0 +1,19 @@
+The most straightforward way to build the EPANET files is by using `CMake` ([https://cmake.org/](https://cmake.org/)). `CMake` is a cross-platform build tool that generates platform native build systems that can be used with your compiler of choice. It uses a generator concept to represent different build tooling. `CMake` automatically detects the platform it is running on and generates the appropriate makefiles for the platform default compiler. Different generators can also be specified.
+
+The project's `CMake` file (`CMakeLists.txt`) is located in its root directory and supports builds for Linux, Mac OS and Windows. To build the EPANET library and its command line executable using `CMake`, first open a console window and navigate to the project's root directory. Then enter the following commands:
+```
+mkdir build
+cd build
+cmake ..
+cmake --build . --config Release
+```
+
+Note: under Windows, the third command should be `cmake .. -A Win32` for a 32-bit build or `cmake .. -A x64` for a 64-bit build when Microsoft Visual Studio is the default compiler.
+
+For Windows the resulting EPANET toolkit library `epanet2.dll` and its command line executable `runepanet.exe` are placed in the `build\bin\Release` directory. The `build\lib\Release` directory will contain an `epanet2.lib` file which is needed to build C/C++ applications using the Windows version of the library. For Linux and Mac OS the EPANET toolkit shared library `libepanet2.so` ap
10000
pears in the `build/lib` directory and the command line executable `runepanet` is in the `build/bin` directory. 
+
+In addition, two Windows one-click-build scripts are included in the `win_build` directory:
+1. `Makefile2.bat`: this script uses the `CMake` file and requires the build tools for Visual Studio available from [https://visualstudio.microsoft.com/downloads/](https://visualstudio.microsoft.com/downloads/). The Community version will work just fine. This script was tested with Visual Studio 2017 and 2019.
+2. `Makefile.bat`: this is the legacy build script compatible with Visual Studio 2010 which conforms with the C89 Standard which was the standard EPANET supported from earlier versions. This script requires the installation of Microsoft Windows SDK 7.1 ([https://www.microsoft.com/en-us/download/details.aspx?id=8279](https://www.microsoft.com/en-us/download/details.aspx?id=8279)) and will probably not run correctly on later versions of the SDK. `CMake` is not used in this script.
+
+These two scripts build EPANET binaries for both the 32 and 64 bit Windows platforms, placing them in the `win_build\32bit` and `win_build\64bit` directories, respectively.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -0,0 +1,102 @@
+# CMakeLists.txt - CMake configuration file for EPANET 2.0
+#
+# CMake is a cross-platform build tool. CMake generates platform native
+# build systems that can be used with your compiler of choice. CMake uses a
+# generator concept to represent different build tooling. CMake automatically
+# detects the platform it is running on and generates the appropriate makefiles
+# for the platform default compiler. Different generators can also be specified.
+#
+# Note: CMake requires that your platform build system and compiler are
+# properly installed. Build using Visual Studio requires msbuild shell.
+#
+# Build Options:
+#   BUILD_TESTS = ON/OFF
+#   BUILD_PY_LIB = ON/OFF
+#
+# Generic Invocation:
+#   cmake -E make_directory buildprod
+#   cd build
+#   cmake -G GENERATOR -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=ON ..
+#   cmake --build . --target SOME_TARGET --config Release
+#
+# More information:
+#   cmake --help
+#
+#   CMake is available at https://cmake.org/download/
+#
+
+cmake_minimum_required (VERSION 2.8.8)
+
+project(EPANET)
+
+# Append local dir to module search path
+list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+
+option(BUILD_TESTS "Build tests (requires Boost)" OFF)
+option(BUILD_PY_LIB "Build library for Python wrapper" OFF)
+option(BUILD_COVERAGE "Build library for coverage" OFF)
+
+
+IF (NOT BUILD_PY_LIB)
+  add_subdirectory(run)
+ENDIF (NOT BUILD_PY_LIB)
+add_subdirectory(src/outfile)
+
+IF (BUILD_TESTS)
+    #Prep ourselves for compiling with boost
+    IF(WIN32)
+        set(Boost_USE_STATIC_LIBS       ON)
+    ELSE(TRUE)
+        set(Boost_USE_STATIC_LIBS       OFF)
+        add_definitions(-DBOOST_ALL_DYN_LINK)
+    ENDIF(WIN32)
+
+    find_package(Boost COMPONENTS unit_test_framework system thread filesystem)
+    include_directories (${Boost_INCLUDE_DIRS})
+
+    enable_testing()
+    add_subdirectory(tests)
+    add_subdirectory(tests/outfile)
+    add_subdirectory(tests/util)
+ENDIF (BUILD_TESTS)
+
+
+# Sets the output directory for executables and libraries.
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+
+
+# Sets the position independent code property for all targets
+SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+
+IF (APPLE)
+  set(INSTALL_NAME_DIR @executable_path/../lib)
+  set(CMAKE_MACOSX_RPATH 1)
+ENDIF (APPLE)
+
+IF (MSVC)
+  set(CMAKE_C_FLAGS_RELEASE "/GL")
+  add_definitions(-D_CRT_SECURE_NO_DEPRECATE -MT)
+ENDIF (MSVC)
+
+# configure file groups
+file(GLOB EPANET_SOURCES RELATIVE ${PROJECT_SOURCE_DIR} src/*.c src/util/*.c)
+file(GLOB EPANET_LIB_ALL RELATIVE ${PROJECT_SOURCE_DIR} src/* src/util/*)
+# exclude epanet python API from the default build
+list(REMOVE_ITEM EPANET_LIB_ALL "src/epanet_py.c")
+source_group("Library" FILES ${EPANET_LIB_ALL})
+
+# the shared library
+IF(MSVC AND "${CMAKE_VS_PLATFORM_NAME}" MATCHES "(Win32)")
+  message("   ************************************")
+  message("   Configuring with epanet2.def mapping")
+  message("   ************************************")
+  add_library(epanet2 SHARED ${EPANET_LIB_ALL} ${PROJECT_SOURCE_DIR}/include/epanet2.def)
+  set_source_files_properties(${PROJECT_SOURCE_DIR}/include/epanet2.def PROPERTIES_HEADER_FILE_ONLY TRUE)
+ELSE(TRUE)
+  add_library(epanet2 SHARED ${EPANET_LIB_ALL})
+ENDIF(MSVC AND "${CMAKE_VS_PLATFORM_NAME}" MATCHES "(Win32)")
+
+target_include_directories(epanet2 PUBLIC ${PROJECT_SOURCE_DIR}/include)
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting any member of the [project team](https://github.com/OpenWaterAnalytics/EPANET/wiki/Project-Team). All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 Open Water Analytics
+Copyright (c) 2017 (see AUTHORS)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal