Commit Graph

831 Commits

Author SHA1 Message Date
Michael Tryby
56d1fe2f35 Merge pull request #390 from michaeltryby/dev
Adding reg tests to coverage
2019-02-11 16:22:15 -05:00
Lew Rossman
219e3ab0ce Merge pull request #389 from LRossman/lrossman-dev1
Fixes win_build and VS/cmake build problems
2019-02-11 16:18:22 -05:00
Michael Tryby
02756af9c5 Merge remote-tracking branch 'upstream/dev' into dev 2019-02-11 15:58:54 -05:00
Michael Tryby
f4ea0a671e Running all tests 2019-02-11 15:51:40 -05:00
Michael Tryby
38f1e77759 Merge remote-tracking branch 'origin/dev' into dev 2019-02-11 15:44:56 -05:00
Michael Tryby
3e8e1c6009 Updating Travis to run coverage for reg tests 2019-02-11 15:44:26 -05:00
Michael Tryby
799874d3c8 Adding options and usage to run-nrtest.sh 2019-02-11 15:43:53 -05:00
Lew Rossman
3eb9a68783 Fixes win_build and VS/cmake build problems 2019-02-11 14:30:15 -05:00
Lew Rossman
d6d244d4d2 Merge pull request #386 from LRossman/lrossman-dev
New function clearreport added (see issue #383)
2019-02-10 22:55:54 -05:00
Michael Tryby
339e37b724 Merge pull request #387 from michaeltryby/dev
Adding code coverage
2019-02-09 17:07:14 -05:00
Michael Tryby
6ec7a705de Updating codecov badge 2019-02-09 17:06:33 -05:00
Lew Rossman
996e26158c Updates documentation with newly added functions 2019-02-08 19:06:42 -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
Lew Rossman
2c86a8febb Fixes the win_build Makefile.bat file 2019-02-08 15:27:52 -05:00
Michael Tryby
09cbe57518 Messing with excludes 2019-02-08 15:19:04 -05:00
Michael Tryby
c6642a2485 Merge pull request #2 from michaeltryby/dev-coverage
Dev coverage
2019-02-08 15:12:17 -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
bacbac3e83 Merge remote-tracking branch 'upstream/dev' into dev 2019-02-08 13:03:07 -05:00
Lew Rossman
36b78f28d3 New function clearreport added (see issue #383)
The newly added `gettitle` and `settitle` functions were moved from the Reporting Functions section to the Project (formerly System) Functions section of epanet2.c and epanet.c.
2019-02-08 12:07:56 -05:00
Elad Salomons
140c95214e Merge pull request #385 from eladsal/dev-title
Add new function to get and set title strings
2019-02-07 22:13:40 +02:00
Michael Tryby
8a7277eab0 Adding build option for coverage 2019-02-07 11:34:18 -05:00
Elad Salomons
ab62d3bb61 Add new function to get and set title strings 2019-02-06 11:45:48 +02:00
Michael Tryby
a845f6a586 Merge remote-tracking branch 'upstream/dev' into dev 2019-02-05 14:42:19 -05:00
Michael Tryby
3c5ce9a342 Merge pull request #384 from michaeltryby/dev
Add support to build for default and python library targets
2019-02-05 10:54:52 -05:00
Michael Tryby
6a0151b9c7 Adding support for custom epanet_py build target 2019-02-04 14:28:32 -05:00
Michael Tryby
a16cc7cae1 Merge branch 'dev' into feature-64bit 2019-02-01 11:45:34 -05:00
Michael Tryby
7c89abebaa Merge remote-tracking branch 'upstream/dev' into dev 2019-02-01 11:41:19 -05:00
Michael Tryby
8275a62480 Merge pull request #380 from michaeltryby/dev-swig-redux
Dev swig redux
2019-01-31 15:30:38 -05:00
Michael Tryby
cba9dda5cf Fixing build error gcc / Travis 2019-01-30 14:30:44 -05:00
Michael Tryby
d62d606b30 Removing *.orig file 2019-01-30 13:36:04 -05:00
Michael Tryby
8dd917dfe5 Adding *.orig to .gitignore 2019-01-30 13:35:24 -05:00
Michael Tryby
725650853a Merge remote-tracking branch 'upstream/dev' into dev-swig-redux 2019-01-30 13:29:48 -05:00
Elad Salomons
bdbd23edba Merge pull request #377 from Mariosmsk/patch-1
update example code Hydraulic & Quality analysis steps
2019-01-30 19:47:32 +02:00
Lew Rossman
ba8926e4c4 Merge pull request #378 from LRossman/lrossman-dev
Minor edits to documentation
2019-01-29 19:17:41 -05:00
Marios S. Kyriakou
5adc02bc99 call ENnextH before ENnextQ 2019-01-29 18:50:17 +02:00
Lew Rossman
67947e5ea8 Minor edits to documentation 2019-01-29 09:46:14 -05:00
Michael Tryby
8d12664061 Removing EN_API_FLOAT_TYPE 2019-01-28 11:31:31 -05:00
Michael Tryby
b339ff22ca Merging dev into dev-swig-redux 2019-01-28 11:23:25 -05:00
Michael Tryby
30c9843965 Merge remote-tracking branch 'upstream/dev' into dev-swig-redux 2019-01-28 10:41:23 -05:00
Michael Tryby
7fc2a3b314 Merge remote-tracking branch 'upstream/dev' into dev 2019-01-28 10:26:44 -05:00
Marios S. Kyriakou
d5e467fe47 Update ReleaseNotes2_1.md 2019-01-28 17:25:21 +02:00
Marios S. Kyriakou
c877730f6e added the ENopenQ; in example code
for the hydraulic and water quality analysis steps
2019-01-28 17:24:07 +02:00
Lew Rossman
3b6b0d9f40 Merge pull request #374 from LRossman/lrossman-dev
Replaced the Doxygen files in the doc folder (issue #373)
2019-01-25 15:38:25 -05:00
Lew Rossman
821d13497f Replaced the Doxygen files in the doc folder (issue #373) 2019-01-24 10:51:37 -05:00