Merge pull request #30 from bradleyjeck/cran-v4

Cran v4
bradleyjeck · Aug 10, 2016 · 7cb0e23 · 7cb0e23
2 parents 6471d39 + 4c50ba4
commit 7cb0e23
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git 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 <[email protected]>

diff --git 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)
 ==============================================
 

diff --git 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
diff --git a/man/write.inp.Rd b/man/write.inp.Rd