Merge pull request #5 from USGS-R/jlthomps-master

Jlthomps master

Author: jlthomps

.Rhistory

@@ -6,41 +6,16 @@ Date: 2013-08-08
 Author: Jessica Thompson
 Maintainer: Who to complain to <[email protected]>
 Depends:
-    R (>= 3.0),
+    R (>= 3.0)
+Imports:
     zoo,
     chron,
     doBy,
     XML,
-    hydroGOF,
-    HITHATStats,
-    lmomco
+    EflowStats,
+    lmomco,
+    hydroGOF
 Description: Calculates comparison stats for two timeseries.
 License: file LICENSE
-Collate:
-    'SWE_CSV_IHA.R'
-    'getScenarioSites.R'
-    'nse.R'
-    'cv.R'
-    'l7Q10.R'
-    'l7Q2.R'
-    'monthly.mean.ts.R'
-    'nselog.R'
-    'return_10.R'
-    'rmse.R'
-    'sdev.R'
-    'includedData.R'
-    'skew.R'
-    'FlowStats.R'
-    'MonthlyAnnualGoF.R'
-    'RegionalGoF.R'
-    'SiteGoF.R'
-    'compute_magnif7.r'
-    'deseason.R'
-    'rsr.R'
-    'rmsne.R'
-    'FlowStats_all.R'
-    'getWFSFieldAsNumeric.R'
-    'getEmptyResultArrayNWCStats.R'
-    'getSupportedStatNames.R'
-    'calculateStatsGroups.R'
-    'nameStatsArray.R'
+LazyLoad: yes
+LazyData: yes

DESCRIPTION

@@ -1,26 +1,25 @@
-export(FlowStats)
-export(FlowStatsAll)
 export(MonthlyAnnualGoF)
 export(RegionalGoF)
 export(SWE_CSV_IHA)
 export(SiteGoF)
-export(cv)
-export(deseason)
+export(calculateStatsDiffs)
+export(calculateStatsGroups)
+export(getEmptyResultArrayNWCStats)
+export(getScenarioDates)
 export(getScenarioSites)
-export(l7Q10)
-export(l7Q2)
-export(magnifSeven)
-export(monthly.mean.ts)
+export(getSupportedStatNames)
+export(getWFSFieldAsNumeric)
+export(nameStatsArray)
 export(nse)
 export(nselog)
-export(return_10)
 export(rmse)
 export(rmsne)
 export(rsr)
-export(sdev)
 export(skew)
-export(calculateStatsGroups)
-export(nameStatsArray)
-export(getWFSFieldAsNumeric)
-export(getEmptyResultArrayNWCStats)
-export(getSupportedStatNames)
+import(EflowStats)
+import(XML)
+import(chron)
+import(doBy)
+import(hydroGOF)
+import(lmomco)
+import(zoo)

NAMESPACE

@@ -8,10 +8,8 @@
 #' @return Output data frame of calculated statistics
 #' @export
 #' @examples
-#' load_data<-paste(system.file(package="NWCCompare"),"/data/qfiletempf.csv",sep="")
-#' load_mod<-paste(system.file(package="NWCCompare"),"/data/qfiletempf.csv",sep="")
-#' Gaged<-read.csv(load_data,stringsAsFactors=FALSE)
-#' Modeled<-read.csv(load_mod,stringsAsFactors=FALSE)
+#' Gaged<-qfiletempf
+#' Modeled<-qfiletempf
 #' MonthlyAnnualGoF(Gaged,Modeled)
 MonthlyAnnualGoF <- function(Gaged,Modeled) {
   NSEv <- vector(length=14)
@@ -47,8 +45,8 @@ MonthlyAnnualGoF <- function(Gaged,Modeled) {
   for (m in 1:12) {
     if (m<10) {month <- paste("0",m,sep="")
     } else {month<-paste("",m,sep="")}
-    monthobs<-subset(Gaged,ifelse(nchar(month_val)<2,paste("0",month_val,sep=""),month_val)==month)
-    monthmod<-subset(Modeled,ifelse(nchar(month_val)<2,paste("0",month_val,sep=""),month_val)==month)
+    monthobs<-subset(Gaged,ifelse(nchar(Gaged$month_val)<2,paste("0",Gaged$month_val,sep=""),Gaged$month_val)==month)
+    monthmod<-subset(Modeled,ifelse(nchar(Modeled$month_val)<2,paste("0",Modeled$month_val,sep=""),Modeled$month_val)==month)
     GagedTmp <- aggregate(monthobs$discharge, list(monthobs$year_val), FUN = mean, na.rm=TRUE)
     ModeledTmp <- aggregate(monthmod$discharge, list(monthmod$year_val), FUN = mean, na.rm=TRUE)
     i <- 2+m

NWCCompare_1.0.tar.gz

@@ -5,17 +5,22 @@
 #' 
 #' @param Gaged data frame of daily flow data
 #' @param Modeled data frame of daily flow data
-#' @param stats list of requested stat groups
 #' @return Output data frame of calculated statistics
 #' @export
+#' @import hydroGOF
+#' @import XML
+#' @import zoo
+#' @import chron
+#' @import doBy
+#' @import EflowStats
+#' @import lmomco
 #' @examples
-#' load_data<-paste(system.file(package="NWCCompare"),"/data/qfiletempf.csv",sep="")
-#' load_mod<-paste(system.file(package="NWCCompare"),"/data/qfiletempf.csv",sep="")
-#' Gaged<-read.csv(load_data,stringsAsFactors=FALSE)
-#' Modeled<-read.csv(load_mod,stringsAsFactors=FALSE)
-#' SiteGoF(Gaged,Modeled,"GOF,GOFMonth")
-SiteGoF <- function(Gaged,Modeled,stats="GOF,GOFMonth") {
-  if (grep("GOF",stats)>0) {
+#' load_data<-qfiletempf
+#' load_mod<-qfiletempf
+#' Gaged<-load_data
+#' Modeled<-load_mod
+#' SiteGoF(Gaged,Modeled)
+SiteGoF <- function(Gaged,Modeled) {
   nsev<-nse(Gaged$discharge,Modeled$discharge)
   nselogv<-nselog(Gaged$discharge,Modeled$discharge)
   rmsev<-rmse(Gaged$discharge,Modeled$discharge)
@@ -78,7 +83,7 @@ SiteGoF <- function(Gaged,Modeled,stats="GOF,GOFMonth") {
   spearmanv_25_50 <- cor(Gaged$discharge[obs_25_50_indices],Modeled$discharge[obs_25_50_indices],method="spearman")
   spearmanv_10_25 <- cor(Gaged$discharge[obs_10_25_indices],Modeled$discharge[obs_10_25_indices],method="spearman")
   spearmanv_10 <- cor(Gaged$discharge[obs_10_indices],Modeled$discharge[obs_10_indices],method="spearman")
-  }
+  
   NSEbyMonth <-vector(length=12)
   NSELOGbyMonth <-vector(length=12)
   RMSEbyMonth <-vector(length=12)
@@ -87,12 +92,12 @@ SiteGoF <- function(Gaged,Modeled,stats="GOF,GOFMonth") {
   BiasbyMonth <-vector(length=12)
   PearsonbyMonth <-vector(length=12)
   SpearmanbyMonth <-vector(length=12)
-  if (grep("GOFMonth",stats)>0) {
+  
   for (m in 1:12) {
     if (m<10) {month <- paste("0",m,sep="")
     } else {month<-paste("",m,sep="")}
-    monthobs<-subset(Gaged,month_val==month)
-    monthmod<-subset(Modeled,month_val==month)
+    monthobs<-subset(Gaged,Gaged$month_val==month)
+    monthmod<-subset(Modeled,Modeled$month_val==month)
     NSEbyMonth[m] <- nse(monthobs$discharge,monthmod$discharge)
     NSELOGbyMonth[m] <- nselog(monthobs$discharge,monthmod$discharge)
     RMSEbyMonth[m] <- rmse(monthobs$discharge,monthmod$discharge)
@@ -102,7 +107,7 @@ SiteGoF <- function(Gaged,Modeled,stats="GOF,GOFMonth") {
     PearsonbyMonth[m] <- cor(monthobs$discharge,monthmod$discharge,method="pearson")
     SpearmanbyMonth[m] <- cor(monthobs$discharge,monthmod$discharge,method="spearman")
   }
-  }
+  
   Output <- c(nsev,nselogv,rmsev,rmsnev,rsrv,pbiasv,pearsonv,spearmanv,
               nsev_90,nsev_75_90,nsev_50_75,nsev_25_50,nsev_10_25,nsev_10,
               rmsev_90,rmsev_75_90,rmsev_50_75,rmsev_25_50,rmsev_10_25,rmsev_10,