From 2c4b38ea8b377d9a64b1039595dc033d194694b5 Mon Sep 17 00:00:00 2001 From: Laura DeCicco <ldecicco@usgs.gov> Date: Thu, 25 Apr 2013 12:01:43 -0500 Subject: [PATCH] Added end of line. --- R/checkStartEndDate.r | 2 +- R/compressData.r | 2 +- R/dataOverview.r | 2 +- R/dateFormatCheck.r | 2 +- R/formatCheckDate.r | 2 +- R/formatCheckParameterCd.r | 2 +- R/formatCheckSiteNumber.r | 2 +- R/getDailyDataFromFile.r | 2 +- R/getDataFromFile.r | 2 +- R/getMetaData.r | 2 +- R/getParameterInfo.r | 2 +- R/getPreLoadedDailyData.r | 2 +- R/getPreLoadedData.r | 2 +- R/getPreLoadedSampleData.r | 2 +- R/getQWDataFromFile.r | 2 +- R/getRawQWData.r | 2 +- R/getSampleData.r | 2 +- R/getSampleDataFromFile.r | 2 +- R/getSiteFileData.r | 2 +- R/mergeReport.r | 2 +- R/populateConcentrations.r | 2 +- R/populateDaily.r | 2 +- R/populateDateColumns.r | 2 +- R/populateParameterINFO.r | 2 +- R/populateSampleColumns.r | 2 +- R/populateSiteINFO.r | 2 +- R/removeDuplicates.r | 2 +- R/retrieveNWISqwData.r | 2 +- R/retrieveUnitNWISData.r | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/R/checkStartEndDate.r b/R/checkStartEndDate.r index 3bac9a68..2e516e09 100644 --- a/R/checkStartEndDate.r +++ b/R/checkStartEndDate.r @@ -34,4 +34,4 @@ checkStartEndDate <- function(StartDate, EndDate,interactive=TRUE){ } return(c(StartDate,EndDate)) -} \ No newline at end of file +} diff --git a/R/compressData.r b/R/compressData.r index d98948c0..2be5baef 100644 --- a/R/compressData.r +++ b/R/compressData.r @@ -88,4 +88,4 @@ compressData <- function(data, interactive=TRUE){ } return(returnDataFrame) -} \ No newline at end of file +} diff --git a/R/dataOverview.r b/R/dataOverview.r index b1b66b3b..6bb3689e 100644 --- a/R/dataOverview.r +++ b/R/dataOverview.r @@ -33,4 +33,4 @@ dataOverview <- function(localDaily = Daily, localSample = Sample){ pct<-sum(localSample$Uncen) pct<-((numSamples-pct)/numSamples)*100 cat("\n Percentage of the sample values that are censored is",signif(pct,digits=2),"%") -} \ No newline at end of file +} diff --git a/R/dateFormatCheck.r b/R/dateFormatCheck.r index 93e8f4de..19b0f02f 100644 --- a/R/dateFormatCheck.r +++ b/R/dateFormatCheck.r @@ -25,4 +25,4 @@ dateFormatCheck <- function(date){ # checks for the format YYYY-MM-DD } } return(condition) -} \ No newline at end of file +} diff --git a/R/formatCheckDate.r b/R/formatCheckDate.r index e39531cc..a65d49a8 100644 --- a/R/formatCheckDate.r +++ b/R/formatCheckDate.r @@ -27,4 +27,4 @@ formatCheckDate <- function(Date, dateString,interactive=TRUE){ } } return(Date) -} \ No newline at end of file +} diff --git a/R/formatCheckParameterCd.r b/R/formatCheckParameterCd.r index f2f5e3ce..46f833ec 100644 --- a/R/formatCheckParameterCd.r +++ b/R/formatCheckParameterCd.r @@ -39,4 +39,4 @@ formatCheckParameterCd <- function(ParameterCd, interactive=TRUE){ #checks f } } return(ParameterCd) -} \ No newline at end of file +} diff --git a/R/formatCheckSiteNumber.r b/R/formatCheckSiteNumber.r index 4f06a964..a3357979 100644 --- a/R/formatCheckSiteNumber.r +++ b/R/formatCheckSiteNumber.r @@ -22,4 +22,4 @@ formatCheckSiteNumber <- function(siteNumber, interactive=TRUE){ #checks for a } } return(siteNumber) -} \ No newline at end of file +} diff --git a/R/getDailyDataFromFile.r b/R/getDailyDataFromFile.r index 2eb24e42..83c12657 100644 --- a/R/getDailyDataFromFile.r +++ b/R/getDailyDataFromFile.r @@ -27,4 +27,4 @@ getDailyDataFromFile <- function (filePath,fileName,hasHeader=TRUE,separator="," } localDaily <- populateDaily(data,qConvert, interactive=interactive) return(localDaily) -} \ No newline at end of file +} diff --git a/R/getDataFromFile.r b/R/getDataFromFile.r index fe86c92d..07476c04 100644 --- a/R/getDataFromFile.r +++ b/R/getDataFromFile.r @@ -42,4 +42,4 @@ getDataFromFile <- function (filePath,fileName,hasHeader=TRUE,separator=","){ retval$value <- as.numeric(retval$value) return (retval) -} \ No newline at end of file +} diff --git a/R/getMetaData.r b/R/getMetaData.r index 1d5d3951..f18f4fc2 100644 --- a/R/getMetaData.r +++ b/R/getMetaData.r @@ -38,4 +38,4 @@ getMetaData <- function(siteNumber="", parameterCd="",interactive=TRUE){ INFO <- populateParameterINFO(parameterCd, INFO, interactive=interactive) return(INFO) -} \ No newline at end of file +} diff --git a/R/getParameterInfo.r b/R/getParameterInfo.r index 2dd76230..87b7b8d5 100644 --- a/R/getParameterInfo.r +++ b/R/getParameterInfo.r @@ -27,4 +27,4 @@ getParameterInfo <- function(parameterCd,interactive=TRUE){ parameterData <- parameterCdFile[2,] return(parameterData) -} \ No newline at end of file +} diff --git a/R/getPreLoadedDailyData.r b/R/getPreLoadedDailyData.r index d8d275d1..11df2322 100644 --- a/R/getPreLoadedDailyData.r +++ b/R/getPreLoadedDailyData.r @@ -19,4 +19,4 @@ getPreLoadedDailyData <- function (loadedData,qUnit=1,interactive=TRUE){ } localDaily <- populateDaily(data,qConvert, interactive=interactive) return(localDaily) -} \ No newline at end of file +} diff --git a/R/getPreLoadedData.r b/R/getPreLoadedData.r index 2729e97e..3dcdbe29 100644 --- a/R/getPreLoadedData.r +++ b/R/getPreLoadedData.r @@ -28,4 +28,4 @@ getPreLoadedData <- function (rawData){ retval$value <- as.numeric(retval$value) return (retval) -} \ No newline at end of file +} diff --git a/R/getPreLoadedSampleData.r b/R/getPreLoadedSampleData.r index 0480682c..2862993a 100644 --- a/R/getPreLoadedSampleData.r +++ b/R/getPreLoadedSampleData.r @@ -14,4 +14,4 @@ getPreLoadedSampleData <- function (loadedData,interactive=TRUE){ compressedData <- compressData(loadedData,interactive=interactive) Sample <- populateSampleColumns(compressedData) return(Sample) -} \ No newline at end of file +} diff --git a/R/getQWDataFromFile.r b/R/getQWDataFromFile.r index f9fb2723..e403cbc1 100644 --- a/R/getQWDataFromFile.r +++ b/R/getQWDataFromFile.r @@ -30,4 +30,4 @@ getQWDataFromFile <- function (filePath,fileName,hasHeader=TRUE,separator=","){ retval <- as.data.frame(tmp, stringsAsFactors=FALSE) return (retval) -} \ No newline at end of file +} diff --git a/R/getRawQWData.r b/R/getRawQWData.r index 3ab00903..4bfdb03f 100644 --- a/R/getRawQWData.r +++ b/R/getRawQWData.r @@ -30,4 +30,4 @@ getRawQWData <- function(siteNumber,ParameterCd,StartDate,EndDate,interactive=TR if(actualNumReturned != numToBeReturned) warning(numToBeReturned, " sample results were expected, ", actualNumReturned, " were returned") return(retval) -} \ No newline at end of file +} diff --git a/R/getSampleData.r b/R/getSampleData.r index a9a49273..3cd6d070 100644 --- a/R/getSampleData.r +++ b/R/getSampleData.r @@ -25,4 +25,4 @@ getSampleData <- function(siteNumber,ParameterCd,StartDate,EndDate,interactive=T compressedData <- compressData(data, interactive=interactive) Sample <- populateSampleColumns(compressedData) return(Sample) -} \ No newline at end of file +} diff --git a/R/getSampleDataFromFile.r b/R/getSampleDataFromFile.r index c08e175f..f49ce7aa 100644 --- a/R/getSampleDataFromFile.r +++ b/R/getSampleDataFromFile.r @@ -22,4 +22,4 @@ getSampleDataFromFile <- function (filePath,fileName,hasHeader=TRUE,separator=", compressedData <- compressData(data, interactive=interactive) Sample <- populateSampleColumns(compressedData) return(Sample) -} \ No newline at end of file +} diff --git a/R/getSiteFileData.r b/R/getSiteFileData.r index 12353364..d4f67190 100644 --- a/R/getSiteFileData.r +++ b/R/getSiteFileData.r @@ -36,4 +36,4 @@ getSiteFileData <- function(siteNumber="",interactive=TRUE){ INFO$alt.va <- as.numeric(INFO$alt.va) return(INFO) -} \ No newline at end of file +} diff --git a/R/mergeReport.r b/R/mergeReport.r index f8256544..7db0ebd0 100644 --- a/R/mergeReport.r +++ b/R/mergeReport.r @@ -26,4 +26,4 @@ mergeReport<-function(localDaily = Daily, localSample = Sample, interactive=TRUE LogQ<-log(Q) newSample<-data.frame(localSample,Q,LogQ) return(newSample) -} \ No newline at end of file +} diff --git a/R/populateConcentrations.r b/R/populateConcentrations.r index cf6cf249..582e1d70 100644 --- a/R/populateConcentrations.r +++ b/R/populateConcentrations.r @@ -19,4 +19,4 @@ populateConcentrations <- function(rawData){ # rawData is a dataframe with valu concentrationColumns$Uncen <- ifelse(tempConcLow==0,0,1) #Add if value = NA? return (concentrationColumns) # returns ConcLow, ConcHigh, Uncen (0 if censored, 1 if uncensored) -} \ No newline at end of file +} diff --git a/R/populateDaily.r b/R/populateDaily.r index 1e6a76fb..c2dc6b35 100644 --- a/R/populateDaily.r +++ b/R/populateDaily.r @@ -80,4 +80,4 @@ populateDaily <- function(rawData,qConvert,interactive=TRUE){ # rawData is a da } return (localDaily) -} \ No newline at end of file +} diff --git a/R/populateDateColumns.r b/R/populateDateColumns.r index 76b956c2..476dcaf8 100644 --- a/R/populateDateColumns.r +++ b/R/populateDateColumns.r @@ -21,4 +21,4 @@ populateDateColumns <- function(rawData){ # rawData is a vector of dates DateFrame$MonthSeq <- ((year-1850)*12)+DateFrame$Month return (DateFrame) -} \ No newline at end of file +} diff --git a/R/populateParameterINFO.r b/R/populateParameterINFO.r index 557cacf0..9bb87787 100644 --- a/R/populateParameterINFO.r +++ b/R/populateParameterINFO.r @@ -52,4 +52,4 @@ populateParameterINFO <- function(parameterCd, localINFO=INFO, interactive=TRUE) } return(localINFO) -} \ No newline at end of file +} diff --git a/R/populateSampleColumns.r b/R/populateSampleColumns.r index 7e7cabb7..38461e71 100644 --- a/R/populateSampleColumns.r +++ b/R/populateSampleColumns.r @@ -29,4 +29,4 @@ populateSampleColumns <- function(rawData){ # rawData is a dataframe with dateT Sample$CosDY <- cos(2*pi*Sample$DecYear) Sample2 <- subset(Sample, (!is.na(Sample$ConcHigh))) # Was just ConcHigh..... return (Sample2) -} \ No newline at end of file +} diff --git a/R/populateSiteINFO.r b/R/populateSiteINFO.r index 71793104..52c4f744 100644 --- a/R/populateSiteINFO.r +++ b/R/populateSiteINFO.r @@ -112,4 +112,4 @@ populateSiteINFO <- function(INFO, siteNumber,interactive=TRUE){ INFO$staAbbrev <- NA } return(INFO) -} \ No newline at end of file +} diff --git a/R/removeDuplicates.r b/R/removeDuplicates.r index 3d6e574b..ede786a6 100644 --- a/R/removeDuplicates.r +++ b/R/removeDuplicates.r @@ -14,4 +14,4 @@ removeDuplicates <- function(localSample=Sample) { Sample1 <- localSample[!duplicated(localSample[c("DecYear","ConcHigh")]),] return(Sample1) -} \ No newline at end of file +} diff --git a/R/retrieveNWISqwData.r b/R/retrieveNWISqwData.r index 27929d48..7b7010a9 100644 --- a/R/retrieveNWISqwData.r +++ b/R/retrieveNWISqwData.r @@ -56,4 +56,4 @@ retrieveNWISqwData <- function (siteNumber,pCodes,startDate,endDate){ data <- data[,c(ncol(data):(ncol(data)-1),(1:(ncol(data)-2)))] return (data) -} \ No newline at end of file +} diff --git a/R/retrieveUnitNWISData.r b/R/retrieveUnitNWISData.r index 591e472f..b40b98af 100644 --- a/R/retrieveUnitNWISData.r +++ b/R/retrieveUnitNWISData.r @@ -33,4 +33,4 @@ retrieveUnitNWISData <- function (siteNumber,ParameterCd,StartDate,EndDate,forma } return (data) -} \ No newline at end of file +} -- GitLab