From 626a736d8fa08c9321f6a89a645cf11848c2e7a1 Mon Sep 17 00:00:00 2001
From: unknown <ldecicco@usgs.gov>
Date: Mon, 15 Jun 2015 09:27:30 -0500
Subject: [PATCH] Quick fix for #125
---
R/importWaterML1.r | 6 +++---
R/readNWISqw.r | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/R/importWaterML1.r b/R/importWaterML1.r
index a67b988c..6773791a 100644
--- a/R/importWaterML1.r
+++ b/R/importWaterML1.r
@@ -404,7 +404,7 @@ importWaterML1 <- function(obs_url,asDateTime=FALSE, tz=""){
sortingColumns <- names(mergedDF)[!(names(mergedDF) %in% c(dataColumns,qualColumns))]
- meltedmergedDF <- melt(mergedDF,id.vars=sortingColumns)
+ meltedmergedDF <- reshape2::melt(mergedDF,id.vars=sortingColumns)
meltedmergedDF <- meltedmergedDF[!is.na(meltedmergedDF$value),]
meltedmergedDF <- meltedmergedDF[!duplicated(meltedmergedDF),]
@@ -416,7 +416,7 @@ importWaterML1 <- function(obs_url,asDateTime=FALSE, tz=""){
indexDups <- as.numeric(row.names(qualDups))
if(length(indexDups) > 0){
- mergedDF2 <- dcast(meltedmergedDF[-indexDups,], castFormula, drop=FALSE, value.var = "value",)
+ mergedDF2 <- reshape2::dcast(meltedmergedDF[-indexDups,], castFormula, drop=FALSE, value.var = "value",)
# Need to get value....
dupInfo <- meltedmergedDF[indexDups, sortingColumns]
@@ -434,7 +434,7 @@ importWaterML1 <- function(obs_url,asDateTime=FALSE, tz=""){
dataColumns2 <- !(names(mergedDF2) %in% sortingColumns)
} else {
- mergedDF2 <- dcast(meltedmergedDF, castFormula, drop=FALSE, value.var = "value")
+ mergedDF2 <- reshape2::dcast(meltedmergedDF, castFormula, drop=FALSE, value.var = "value")
dataColumns2 <- !(names(mergedDF2) %in% sortingColumns)
}
diff --git a/R/readNWISqw.r b/R/readNWISqw.r
index 5c59d4b7..ce933492 100644
--- a/R/readNWISqw.r
+++ b/R/readNWISqw.r
@@ -145,8 +145,8 @@ readNWISqw <- function (siteNumbers,parameterCd,startDate="",endDate="",
if(sum(data$parm_cd == "") > 0){
warning("Some or all data returned without pCodes, those data will not be included in reshape")
}
- longDF <- melt(dataWithPcodes, columnsToMelt)
- wideDF <- dcast(longDF, ... ~ variable + parm_cd )
+ longDF <- reshape2::melt(dataWithPcodes, columnsToMelt)
+ wideDF <- reshape2::dcast(longDF, ... ~ variable + parm_cd )
wideDF[,grep("_va_",names(wideDF))] <- sapply(wideDF[,grep("_va_",names(wideDF))], function(x) as.numeric(x))
pCodesReturned <- unique(dataWithPcodes$parm_cd)
groupByPCode <- as.vector(sapply(pCodesReturned, function(x) grep(x, names(wideDF)) ))
--
GitLab