From a33f1bbbf6f6121e8ad40284690a463733a00bc2 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Mon, 9 Oct 2017 08:48:39 +0200 Subject: Write Step 2 input files on windows --- ChangeLog | 15 +++++++++++++++ DESCRIPTION | 4 ++-- R/PEC_sw_focus.R | 5 +++-- build.log | 10 +++++----- man/PEC_sw_focus.Rd | 2 +- 5 files changed, 26 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1ae9892..4c94b31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +commit 311c4fbcc51ad727551da41569d64e6bc290c2b2 +Author: Johannes Ranke +Date: 2017-10-06 09:30:21 +0200 + + Update docs, small bugfix + +commit 72d7358581bca88af8c507b6c80791100aaafafc +Author: Johannes Ranke +Date: 2017-08-24 10:30:11 +0200 + + Build for windows using roxygen from master + + Now that roxygen can handle UTF8 characters in function + arguments thanks to Hadley Wickham and Jim Hester + commit a8a2a9d57f40ec7a4fc70df3dc470d88cd10c525 Author: Johannes Ranke Date: 2017-07-24 16:31:07 +0200 diff --git a/DESCRIPTION b/DESCRIPTION index 73dbea8..385ac3c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: pfm Type: Package Title: Utilities for Pesticide Fate Modelling -Version: 0.4-4 -Date: 2017-08-24 +Version: 0.4-5 +Date: 2017-10-06 Authors@R: person("Johannes Ranke", email = "jranke@uni-bremen.de", role = c("aut", "cre", "cph")) Description: Utilities for simple calculations of predicted environmental diff --git a/R/PEC_sw_focus.R b/R/PEC_sw_focus.R index 1564535..e063ff3 100644 --- a/R/PEC_sw_focus.R +++ b/R/PEC_sw_focus.R @@ -107,8 +107,9 @@ PEC_sw_focus <- function(parent, rate, n = 1, i = NA, "DT50 water", "DT50 sediment", "Region / Season", "Interception class") - add_line <- function(x) cat(x, sep = "\r\n", - file = txt, append = TRUE) + add_line <- function(x) { + cat(paste0(x, "\r\n"), file = txt, append = TRUE) + } if (file.exists(txt_file)) { if (append) { txt <- file(txt_file, "a") diff --git a/build.log b/build.log index 8401b46..95a265b 100644 --- a/build.log +++ b/build.log @@ -1,8 +1,8 @@ -* checking for file './DESCRIPTION' ... OK -* preparing 'pfm': +* checking for file ‘./DESCRIPTION’ ... OK +* preparing ‘pfm’: * checking DESCRIPTION meta-information ... OK -* checking for LF line-endings in source and make files +* checking for LF line-endings in source and make files and shell scripts * checking for empty or unneeded directories -* looking to see if a 'data/datalist' file should be added -* building 'pfm_0.4-4.tar.gz' +* looking to see if a ‘data/datalist’ file should be added +* building ‘pfm_0.4-5.tar.gz’ diff --git a/man/PEC_sw_focus.Rd b/man/PEC_sw_focus.Rd index 00975a2..f953923 100644 --- a/man/PEC_sw_focus.Rd +++ b/man/PEC_sw_focus.Rd @@ -58,7 +58,7 @@ Steps.12 input text file to which the specification of the run(s) should be written} \item{overwrite}{Should an existing file a the location specified in -\code{txt_file} be overwritten?} +\code{txt_file} be overwritten? Only takes effect if append is FALSE.} \item{append}{Should the input text file be appended?} } -- cgit v1.2.1