From 6022dd114a49ee17f82b085fb2d02fd3861d817e Mon Sep 17 00:00:00 2001 From: Brad Eck Date: Wed, 10 Aug 2016 16:35:32 +0100 Subject: [PATCH 1/2] doc updates --- DESCRIPTION | 2 +- R/write.inp.r | 3 +-- man/plotSparklineTable.Rd | 2 +- man/write.inp.Rd | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 8101410..283989d 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: epanetReader Type: Package Title: Read Epanet Files into R -Version: 0.3.1-0007 +Version: 0.4.0 Date: 2016-08-10 Author: Bradley J. Eck Maintainer: Bradley Eck diff --git a/R/write.inp.r b/R/write.inp.r index 430d146..ff61fce 100644 --- a/R/write.inp.r +++ b/R/write.inp.r @@ -20,10 +20,9 @@ #' @return nothing #' @examples #' write.inp(Net1, "Net1-fromR.inp") -#' \dontrun{ #' n1 <- read.inp("Net1-fromR.inp") #' all.equal(Net1, n1) -#' } +#' write.inp <- function(x, file){ diff --git a/man/plotSparklineTable.Rd b/man/plotSparklineTable.Rd index 656e60c..947cb46 100644 --- a/man/plotSparklineTable.Rd +++ b/man/plotSparklineTable.Rd @@ -1,5 +1,5 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in R/plotSparklineTable.R +% Please edit documentation in R/plotSparklineTable.r \name{plotSparklineTable} \alias{plotSparklineTable} \title{Plot Sparkline Table} diff --git a/man/write.inp.Rd b/man/write.inp.Rd index 3d238ec..96f1507 100644 --- a/man/write.inp.Rd +++ b/man/write.inp.Rd @@ -23,9 +23,8 @@ with EPANET. } \examples{ write.inp(Net1, "Net1-fromR.inp") -\dontrun{ n1 <- read.inp("Net1-fromR.inp") all.equal(Net1, n1) -} + } From 4c50ba44899a725b11582193ccb510637e09fa8c Mon Sep 17 00:00:00 2001 From: Brad Eck Date: Wed, 10 Aug 2016 17:27:57 +0100 Subject: [PATCH 2/2] news file --- NEWS | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/NEWS b/NEWS index d675aae..a10c2e3 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,20 @@ +epanetReader version 0.4.0 (released Aug 2016) +============================================== +Changes: +* Use readlines from package Kmisc, if available, to speed up reading of large files + +* Added write.inp() function for writing inp files from an R object + +* Allow page breaks in rpt files to support reading rpt files + created by Epanet's Windows GUI + +* Added citation information for recently published papers + +* Added support for reading sections of inp files that were not supported yet + +* Handled % sign in rpt file node result header for water trace analysis + + epanetReader version 0.3.1 (released Feb 2016) ==============================================