Merge 707a6e1 into 6d076f1

USGS-R · Aug 12, 2019 · ded7505 · ded7505
2 parents 6d076f1 + 707a6e1
commit ded7505
Show file tree

Hide file tree

Showing 23 changed files with 218 additions and 266 deletions.
diff --git a/R/aggregate_HUC.R b/R/aggregate_HUC.R
@@ -13,21 +13,20 @@
 #' sum_avg <- "sum"
 #' test_HUC <- aggregate_HUC(s.wuds, HUC, sum_avg)
 aggregate_HUC <- function(s.wuds, HUC, sum_avg){
-
-  if(!("FROM_HUC_CD" %in% names(s.wuds))){
+  if (!("FROM_HUC_CD" %in% names(s.wuds))){
     message("no aquifer column")
     return(NULL)
   }
-
   s.wuds <- s.wuds[s.wuds$FROM_HUC_CD %in% HUC, ]
   s.wuds$Volume_mgd <- as.numeric(s.wuds$Volume_mgd)
-
-  if(sum_avg == "sum"){
-    s.wuds <- aggregate(as.numeric(s.wuds$Volume_mgd), by = list(HUC = s.wuds$FROM_HUC_CD), FUN = sum, na.rm = TRUE)
+  if (sum_avg == "sum"){
+    s.wuds <- aggregate(as.numeric(s.wuds$Volume_mgd),
+                        by = list(HUC = s.wuds$FROM_HUC_CD),
+                        FUN = sum, na.rm = TRUE)
   } else if (sum_avg == "avg"){
-    s.wuds <- aggregate(as.numeric(s.wuds$Volume_mgd), by = list(HUC = s.wuds$FROM_HUC_CD), FUN = mean, na.rm = TRUE)
+    s.wuds <- aggregate(as.numeric(s.wuds$Volume_mgd),
+                        by = list(HUC = s.wuds$FROM_HUC_CD),
+                        FUN = mean, na.rm = TRUE)
   }
-
   return(s.wuds)
-
 }
diff --git a/R/aggregate_aquifer.R b/R/aggregate_aquifer.R
@@ -15,21 +15,20 @@
 #' test_aquifer <- aggregate_aquifier(s.wuds, aquifer, sum_avg)
 #' 
 aggregate_aquifier <- function(s.wuds, aquifer, sum_avg){
-
-  if(!("aquifer" %in% names(s.wuds))){
+  if (!("aquifer" %in% names(s.wuds))){
     message("no aquifer column")
     return(NULL)
   }
-
   s.wuds <- s.wuds[s.wuds$aquifer %in% aquifer, ]
   s.wuds$Volume_mgd <- as.numeric(s.wuds$Volume_mgd)
-
-  if(sum_avg == "sum"){
-    s.wuds <- aggregate(as.numeric(s.wuds$Volume_mgd), by = list(aquifer = s.wuds$aquifer), FUN = sum, na.rm = TRUE)
+  if (sum_avg == "sum"){
+    s.wuds <- aggregate(as.numeric(s.wuds$Volume_mgd),
+                        by = list(aquifer = s.wuds$aquifer),
+                        FUN = sum, na.rm = TRUE)
   } else if (sum_avg == "avg"){
-    s.wuds <- aggregate(as.numeric(s.wuds$Volume_mgd), by = list(aqiufer = s.wuds$aquifer), FUN = mean, na.rm = TRUE)
+    s.wuds <- aggregate(as.numeric(s.wuds$Volume_mgd),
+                        by = list(aqiufer = s.wuds$aquifer),
+                        FUN = mean, na.rm = TRUE)
   }
-
   return(s.wuds)
-
 }
diff --git a/R/aggregate_county.R b/R/aggregate_county.R
@@ -15,18 +15,17 @@
 #' test_county <- aggregate_county(s.wuds, state_county, sum_avg)
 #' 
 aggregate_county <- function(s.wuds, state_county, sum_avg){
-
-  s.wuds$state_county <- paste0(s.wuds$FROM_STATE_CD,s.wuds$FROM_COUNTY_CD)
-
-  s.wuds <- s.wuds[s.wuds$state_county %in% state_county,]
+  s.wuds$state_county <- paste0(s.wuds$FROM_STATE_CD, s.wuds$FROM_COUNTY_CD)
+  s.wuds <- s.wuds[s.wuds$state_county %in% state_county, ]
   s.wuds$Volume_mgd <- as.numeric(s.wuds$Volume_mgd)
-
-  if(sum_avg == "sum"){
-    s.wuds <- aggregate(as.numeric(s.wuds$Volume_mgd), by = list(state_county = s.wuds$state_county), FUN = sum, na.rm = TRUE)
+  if (sum_avg == "sum"){
+    s.wuds <- aggregate(as.numeric(s.wuds$Volume_mgd),
+                        by = list(state_county = s.wuds$state_county),
+                        FUN = sum, na.rm = TRUE)
   } else if (sum_avg == "avg"){
-    s.wuds <- aggregate(as.numeric(s.wuds$Volume_mgd), by = list(state_county = s.wuds$state_county), FUN = mean, na.rm = TRUE)
+    s.wuds <- aggregate(as.numeric(s.wuds$Volume_mgd),
+                        by = list(state_county = s.wuds$state_county),
+                        FUN = mean, na.rm = TRUE)
   }
-
   return(s.wuds)
-
 }
diff --git a/R/aggregate_month.R b/R/aggregate_month.R
@@ -13,17 +13,17 @@
 #' sum_avg <- "sum"
 #' test_month <- aggregate_month(s.wuds, month, sum_avg)
 #' 
-aggregate_month<- function(s.wuds, month, sum_avg){
-
+aggregate_month <- function(s.wuds, month, sum_avg){
   s.wuds <- s.wuds[s.wuds$Month %in% month, ]
   s.wuds$Volume_mgd <- as.numeric(s.wuds$Volume_mgd)
-
-  if(sum_avg == "sum"){
-    s.wuds <- aggregate(as.numeric(s.wuds$Volume_mgd), by = list(Month = s.wuds$Month), FUN = sum, na.rm = TRUE)
-
-
+  if (sum_avg == "sum"){
+    s.wuds <- aggregate(as.numeric(s.wuds$Volume_mgd),
+                        by = list(Month = s.wuds$Month),
+                        FUN = sum, na.rm = TRUE)
   } else if (sum_avg == "avg"){
-    s.wuds <- aggregate(as.numeric(s.wuds$Volume_mgd), by = list(Month = s.wuds$Month), FUN = mean, na.rm = TRUE)
+    s.wuds <- aggregate(as.numeric(s.wuds$Volume_mgd),
+                        by = list(Month = s.wuds$Month),
+                        FUN = mean, na.rm = TRUE)
   }
-
+  return(s.wuds)
 }
diff --git a/R/aggregate_season.R b/R/aggregate_season.R
@@ -13,46 +13,39 @@
 #' season <- "Fall"
 #' test_aggSeason <- aggregate_season(s.wuds, season, sum_avg)
 #' 
-aggregate_season<- function(s.wuds, season, sum_avg){
-
-  if(season == "Winter" && sum_avg == "sum"){
+aggregate_season <- function(s.wuds, season, sum_avg){
+  if (season == "Winter" && sum_avg == "sum"){
     #get Winter sum
     s.wuds <- s.wuds[s.wuds$Month %in% c("Jan", "Feb", "Mar"), ]
     s.wuds$winterSum <- sum(as.numeric(s.wuds$Volume_mgd), na.rm = TRUE)
-
   } else if (season == "Winter" && sum_avg == "avg"){
     #get Winter avg
     s.wuds <- s.wuds[s.wuds$Month %in% c("Jan", "Feb", "Mar"), ]
     s.wuds$winterAvg <- mean(as.numeric(s.wuds$Volume_mgd), na.rm = TRUE)
-
   } else if (season == "Spring" && sum_avg == "sum"){
     #get Spring sum
     s.wuds <- s.wuds[s.wuds$Month %in% c("Mar", "Apr", "May"), ]
     s.wuds$springSum <- sum(as.numeric(s.wuds$Volume_mgd), na.rm = TRUE)
-
   } else if (season == "Spring" && sum_avg == "avg"){
     #get Spring avg
     s.wuds <- s.wuds[s.wuds$Month %in% c("Mar", "Apr", "May"), ]
     s.wuds$springAvg <- mean(as.numeric(s.wuds$Volume_mgd), na.rm = TRUE)
-
   } else if (season == "Summer" && sum_avg == "sum"){
     #get Summer sum
     s.wuds <- s.wuds[s.wuds$Month %in% c("Jun", "Jul", "Aug"), ]
     s.wuds$summerSum <- sum(as.numeric(s.wuds$Volume_mgd), na.rm = TRUE)
-
   } else if (season == "Summer" && sum_avg == "avg"){
     #get Summer avg
     s.wuds <- s.wuds[s.wuds$Month %in% c("Jun", "Jul", "Aug"), ]
     s.wuds$summerAvg <- mean(as.numeric(s.wuds$Volume_mgd), na.rm = TRUE)
-
   } else if (season == "Fall" && sum_avg == "sum"){
     #get Fall sum
     s.wuds <- s.wuds[s.wuds$Month %in% c("Sep", "Oct", "Nov"), ]
     s.wuds$fallSum <- sum(as.numeric(s.wuds$Volume_mgd), na.rm = TRUE)
-
   } else if (season == "Fall" && sum_avg == "avg"){
     #get Fall avg
     s.wuds <- s.wuds[s.wuds$Month %in% c("Sep", "Oct", "Nov"), ]
     s.wuds$fallAvg <- mean(as.numeric(s.wuds$Volume_mgd), na.rm = TRUE)
   }
-}
+  return(s.wuds)
+}
diff --git a/R/aggregate_year.R b/R/aggregate_year.R
@@ -15,16 +15,16 @@
 #' test_year <- aggregate_year(s.wuds, year, sum_avg)
 #' 
 aggregate_year <- function(s.wuds, year, sum_avg){
-
   s.wuds <- s.wuds[s.wuds$YEAR %in% year, ]
   s.wuds$Volume_mgd <- as.numeric(s.wuds$Volume_mgd)
-
-  if(sum_avg == "sum"){
-    s.wuds <- aggregate(as.numeric(s.wuds$Volume_mgd), by = list(Year = s.wuds$YEAR), FUN = sum, na.rm = TRUE)
-
-
+  if (sum_avg == "sum"){
+    s.wuds <- aggregate(as.numeric(s.wuds$Volume_mgd),
+                        by = list(Year = s.wuds$YEAR),
+                        FUN = sum, na.rm = TRUE)
   } else if (sum_avg == "avg"){
-    s.wuds <- aggregate(as.numeric(s.wuds$Volume_mgd), by = list(Year = s.wuds$YEAR), FUN = mean, na.rm = TRUE)
+    s.wuds <- aggregate(as.numeric(s.wuds$Volume_mgd),
+                        by = list(Year = s.wuds$YEAR),
+                        FUN = mean, na.rm = TRUE)
   }
-
+  return(s.wuds)
 }
diff --git a/R/filter_HUC.R b/R/filter_HUC.R
@@ -13,12 +13,10 @@
 #' test_HUC <- filter_HUC(s.wuds, HUC)
 #' 
 filter_HUC <- function(s.wuds, HUC){
-
-  if(!("FROM_HUC_CD" %in% names(s.wuds))){
-
+  if (!("FROM_HUC_CD" %in% names(s.wuds))){
+    stop("data has no column FROM_HUC_CD")
   } else {
     s.wuds <- s.wuds[which(s.wuds$FROM_HUC_CD == HUC), ]
   }
-
   return(s.wuds)
-}
+}
diff --git a/R/filter_aquifer.R b/R/filter_aquifer.R
@@ -12,14 +12,11 @@
 #' test_aquifer <- filter_aquifer(s.wuds, aquifer)
 #' 
 filter_aquifer <- function(s.wuds, aquifer){
-
-  if(!("aquifer" %in% names(s.wuds))){
+  if (!("aquifer" %in% names(s.wuds))){
     message("aquifer not in dataset")
     return(NULL)
   } else {
     s.wuds <- s.wuds[which(s.wuds$aquifer == aquifer), ]
   }
-
   return(s.wuds)
-
-}
+}
diff --git a/R/filter_category.R b/R/filter_category.R
@@ -12,13 +12,11 @@
 #' test_category <- filter_category(s.wuds, category)
 #' 
 filter_category <- function(s.wuds, category){
-  
-  if(!("FROM_NAT_WATER_USE_CD" %in% names(s.wuds))){
+
+  if (!("FROM_NAT_WATER_USE_CD" %in% names(s.wuds))){
     stop("FROM_NAT_WATER_USE_CD not in dataset")
   } else {
     s.wuds <- s.wuds[which(s.wuds$FROM_NAT_WATER_USE_CD == category), ]
   }
-
   return(s.wuds)
-
-}
+}
diff --git a/R/filter_county.R b/R/filter_county.R
@@ -14,9 +14,8 @@
 #' 
 #' 
 filter_county <- function(s.wuds, state_county){
-
-  s.wuds$state_county <- paste(s.wuds$FROM_STATE_NM, s.wuds$FROM_COUNTY_NM, sep = "_")
+  s.wuds$state_county <- paste(s.wuds$FROM_STATE_NM,
+                               s.wuds$FROM_COUNTY_NM, sep = "_")
   s.wuds <- s.wuds[which(s.wuds$state_county == state_county), ]
-
   return(s.wuds)
-}
+}
diff --git a/R/filter_month.R b/R/filter_month.R
@@ -13,5 +13,5 @@
 #' 
 filter_month <- function(s.wuds, month){
   s.wuds <- s.wuds[which(s.wuds$months == month), ]
-
-}
+  return(s.wuds)
+}
diff --git a/R/filter_siteType.R b/R/filter_siteType.R
@@ -13,4 +13,4 @@
 #' 
 filter_siteType <- function(s.wuds, siteType){
   s.wuds <- s.wuds[which(s.wuds$FROM_SITE_TP_CD == siteType), ]
-}
+}
diff --git a/R/filter_state.R b/R/filter_state.R
@@ -14,4 +14,4 @@
 #' 
 filter_state <- function(s.wuds, state){
   s.wuds <- s.wuds[which(s.wuds$FROM_STATE_NM == state), ]
-}
+}
diff --git a/R/filter_waterType.R b/R/filter_waterType.R
@@ -14,4 +14,4 @@
 
 filter_waterType <- function(s.wuds, waterType){
   s.wuds <- s.wuds[which(s.wuds$`Water Type Code` == waterType), ]
-}
+}
diff --git a/R/filter_year.R b/R/filter_year.R
@@ -13,4 +13,4 @@
 #' 
 filter_year <- function(s.wuds, year){
   s.wuds <- s.wuds[which(s.wuds$YEAR == year), ]
-}
+}