Commit 2bc250c4 authored by Laura A DeCicco's avatar Laura A DeCicco Committed by GitHub
Browse files

Merge pull request #291 from wdwatkins/master

changed Inst stat code
parents f15444ea 4051fa33
......@@ -21,13 +21,13 @@
#' @return A dataset like \code{data} with selected columns renamed.
#' @note The following statistics codes are converted by \code{renameNWISColumns}.
#'\describe{
#'\item{00000}{Instantaneous Value, suffix: Inst}
#'\item{00001}{Maximum value, suffix: Max}
#'\item{00002}{Minimum value, suffix: Min}
#'\item{00003}{Mean value, no suffix}
#'\item{00006}{Sum of values, suffix: Sum}
#'\item{00007}{Modal value, suffix: Mode}
#'\item{00008}{Median value, suffix: Median}
#'\item{00011}{Instantaneous Value, suffix: Inst}
#'\item{00012}{Equivalent mean value, suffix: EqMean}
#'\item{00021}{Tidal high-high value, suffix: HiHiTide}
#'\item{00022}{Tidal low-high value, suffix: LoHiTide}
......@@ -69,13 +69,13 @@ renameNWISColumns <- function(rawData, p00010="Wtemp", p00045="Precip",
Conv$p63680 <- p63680
Conv$p72019 <- p72019
Conv$s00000<- "Inst" # Why is this in dv?
Conv$s00001 <- "Max"
Conv$s00002 <- "Min"
Conv$s00003 <- ""
Conv$s00006 <- "Sum"
Conv$s00007 <- "Mode"
Conv$s00008 <- "Median"
Conv$s00011<- "Inst" # Why is this in dv?
Conv$s00012<- "EqMean"
Conv$s00021<- "HiHiTide"
Conv$s00022<- "LoHiTide"
......
This diff is collapsed.
......@@ -46,13 +46,13 @@ to rename those columns.
\note{
The following statistics codes are converted by \code{renameNWISColumns}.
\describe{
\item{00000}{Instantaneous Value, suffix: Inst}
\item{00001}{Maximum value, suffix: Max}
\item{00002}{Minimum value, suffix: Min}
\item{00003}{Mean value, no suffix}
\item{00006}{Sum of values, suffix: Sum}
\item{00007}{Modal value, suffix: Mode}
\item{00008}{Median value, suffix: Median}
\item{00011}{Instantaneous Value, suffix: Inst}
\item{00012}{Equivalent mean value, suffix: EqMean}
\item{00021}{Tidal high-high value, suffix: HiHiTide}
\item{00022}{Tidal low-high value, suffix: LoHiTide}
......
......@@ -31,9 +31,9 @@ test_that("Unit value data returns correct types", {
endDate <- "2012-07-17"
dd_2 <- readNWISuv(site, pCode, startDate, endDate)
expect_true(all(names(dd_2) %in% c("agency_cd","site_no",
"dateTime","X_.YSI.6136.UP._63680_00011",
"X_YSI.6136.DOWN_63680_00011","X_.YSI.6136.UP._63680_00011_cd",
"X_YSI.6136.DOWN_63680_00011_cd","tz_cd")))
"dateTime","X_.YSI.6136.UP._63680_00000",
"X_YSI.6136.DOWN_63680_00000","X_.YSI.6136.UP._63680_00000_cd",
"X_YSI.6136.DOWN_63680_00000_cd","tz_cd")))
})
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment