From 0aa9fe63c082d0b433cb6570307d93836ad9fc68 Mon Sep 17 00:00:00 2001 From: Samantha Oliver Date: Thu, 20 Sep 2018 08:38:18 -0500 Subject: [PATCH 1/2] notes for writing tests --- tests/testthat/test_discharge_events.R | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/testthat/test_discharge_events.R b/tests/testthat/test_discharge_events.R index 9bc64f0..64bec09 100644 --- a/tests/testthat/test_discharge_events.R +++ b/tests/testthat/test_discharge_events.R @@ -1,3 +1,5 @@ # tests the function discharge_events -# test discharge record that starts and ends in mid-storm \ No newline at end of file +# test discharge record that starts and ends in mid-storm + +# test time zones \ No newline at end of file From 21cb5931bc2388f6413d45022862a1fa4269c064 Mon Sep 17 00:00:00 2001 From: Oliver Date: Thu, 20 Sep 2018 11:40:47 -0500 Subject: [PATCH 2/2] moved conversion of numeric dates to outside of loop. --- R/RMevents_sample.R | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/R/RMevents_sample.R b/R/RMevents_sample.R index 1313e1d..c209fb7 100644 --- a/R/RMevents_sample.R +++ b/R/RMevents_sample.R @@ -112,8 +112,12 @@ RMevents_sample <- function(df, } tipsbystorm <- sub_tips } else { - startRainDates <- as.POSIXct(c(startRainDates,BD), origin = "1970-01-01", tz = rain_timezone) - endRainDates <- as.POSIXct(c(endRainDates,ED), origin = "1970-01-01", tz = rain_timezone) + #startRainDates <- as.POSIXct(c(startRainDates,BD), origin = "1970-01-01", tz = rain_timezone) + #endRainDates <- as.POSIXct(c(endRainDates,ED), origin = "1970-01-01", tz = rain_timezone) + startRainDates <- c(startRainDates,BD) + endRainDates <- c(endRainDates,ED) + + if (nrow(sub_tips) > 0) { event <- event + 1 } else { @@ -127,8 +131,8 @@ RMevents_sample <- function(df, } } - dfsamples$StartDate <- startRainDates - dfsamples$EndDate <- endRainDates + dfsamples$StartDate <- as.POSIXct(startRainDates, origin = '1970-01-01', tz = rain_timezone) + dfsamples$EndDate <- as.POSIXct(endRainDates, origin = '1970-01-01', tz = rain_timezone) dfsamples$rain <- rainDepth dfsamples$stormnum <- 1:nrow(dfsamples)