Updated function library locations following moving code from working…

… directory to separate script directory location
seanlhodges · Jul 18, 2017 · 0800386 · 0800386
1 parent 8f58830
commit 0800386
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 16 deletions.
diff --git a/PackageDataForDelivery.R b/PackageDataForDelivery.R
@@ -16,7 +16,8 @@ od<-getwd()
 setwd("//file/herman/r/oa/08/02/2017/Water Quality/R/lawa_state")
 
 #/* -===Include required function libraries===- */ 
-source("lawa_state_functions.R")
+
+source("scripts/WQualityStateTrend/lawa_state_functions.R")
 
 wqparam <- c("BDISC","TURB","PH","NH4","TON","TN","DRP","TP","ECOLI") 
 wqparam <- as.data.frame(as.matrix(wqparam))

diff --git a/lawa_10yrsDataPull.R b/lawa_10yrsDataPull.R
@@ -39,7 +39,7 @@ EndYear <- 2016
 
 #/* -===Include required function libraries===- */ 
 
-source("lawa_state_functions.R")
+source("scripts/WQualityStateTrend/lawa_state_functions.R")
 
 #/* -===Global variable/constant definitions===- */ 
 vendor <- c("52NORTH","AQUATIC","HILLTOP","KISTERS")

diff --git a/lawa_intersect_WFS.R b/lawa_intersect_WFS.R
@@ -15,13 +15,13 @@ rm(list = ls())
 ANALYSIS<-"Intersect WFS"
 # Set working directory
 
-od <- getwd()
-wd <- "\\\\file\\herman\\R\\OA\\08\\02\\2017\\Water Quality\\R\\lawa_state"
+od     <- getwd()
+wd     <- "\\\\file\\herman\\R\\OA\\08\\02\\2017\\Water Quality\\R\\lawa_state"
 setwd(wd)
 
 #/* -===Include required function libraries===- */ 
 
-source("lawa_state_functions.R")
+source("scripts\\WQualityStateTrend\\lawa_state_functions.R")
 
 require(rgeos)
 require(spatialEco)

diff --git a/lawa_state_5yr.R b/lawa_state_5yr.R
@@ -55,8 +55,7 @@ EndYear <- 2016
 
 #/* -===Include required function libraries===- */ 
 
-
-source("lawa_state_functions.R")
+source("scripts/WQualityStateTrend/lawa_state_functions.R")
 
 #/* -===Global variable/constant definitions===- */ 
 vendor <- c("52NORTH","AQUATIC","HILLTOP","KISTERS")
@@ -253,14 +252,7 @@ for(i in 1:length(wqparam)){
                      "Region","Agency","ISLAND","CatchID","CatchType",
                      "NZREACH","Catchment","Comments","LawaCatchm","CatchLbl")
 
-  # newFieldNames <- c("SiteName","Date","Value","Method","parameter",
-  #                    "Censored","CenType","ROS","iValues",
-  #                    "OriginalValues","X","LAWAID","ID",
-  #                    "UsedInLAWA","AltitudeGroup","LanduseGroup","FrequencyAll","Frequency",
-  #                    "Region","Agency","ISLAND","CatchID","CatchType",
-  #                    "NZREACH","Catchment","Comments","LawaCatchm","CatchLbl")
-  # 
-  # 
+
   names(wqdata) <- newFieldNames
 
   ### ADD IN THE LAWA SITE TABLE ATTRIBUTES

diff --git a/lawa_trend_x_yrs.R b/lawa_trend_x_yrs.R
@@ -43,7 +43,7 @@ StartYear <- EndYear - TRENDPERIOD + 1
 
 #/* -===Include required function libraries===- */ 
 
-source("lawa_state_functions.R")
+source("scripts/WQualityStateTrend/lawa_state_functions.R")
 
 #/* -===Global variable/constant definitions===- */ 
 vendor <- c("52NORTH","AQUATIC","HILLTOP","KISTERS")