From 1324a6be89dc03a93033046e9cd97676a0027204 Mon Sep 17 00:00:00 2001
From: unknown <ldecicco@usgs.gov>
Date: Tue, 21 Oct 2014 13:21:04 -0500
Subject: [PATCH] Updated data + user file function.
---
R/getDataFromFile.r | 18 +++++++++---------
inst/extdata/ChoptankRiverNitrate.csv | 16 ++++++++--------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/R/getDataFromFile.r b/R/getDataFromFile.r
index 5ecc6000..1bffc892 100644
--- a/R/getDataFromFile.r
+++ b/R/getDataFromFile.r
@@ -20,7 +20,7 @@
#' ChopData <- getDataFromFile(filePath,fileName, separator="\t")
getDataFromFile <- function (filePath,fileName,hasHeader=TRUE,separator=","){
totalPath <- paste(filePath,fileName,sep="");
- tmp <- read.delim(
+ retval <- read.delim(
totalPath,
header = hasHeader,
sep=separator,
@@ -28,19 +28,19 @@ getDataFromFile <- function (filePath,fileName,hasHeader=TRUE,separator=","){
fill = TRUE,
comment.char="#")
- retval <- as.data.frame(tmp, stringsAsFactors=FALSE)
if(ncol(retval) == 2){
- names(retval) <- c('dateTime', 'value')
- } else if (ncol(retval) == 3){
- names(retval) <- c('dateTime', 'code','value')
+ numCol <- 2
+ } else {
+ numCol <- seq(from = 3,to = ncol(retval), by = 2)
}
- if(dateFormatCheck(retval$dateTime)){
- retval$dateTime <- as.Date(retval$dateTime)
+ if(dateFormatCheck(retval[,1])){
+ retval[,1] <- as.Date(retval[,1])
} else {
- retval$dateTime <- as.Date(retval$dateTime,format="%m/%d/%Y")
+ retval[,1] <- as.Date(retval[,1],format="%m/%d/%Y")
}
- retval$value <- as.numeric(retval$value)
+ retval[,numCol] <- sapply(numCol, function(x) as.numeric(retval[,x]))
+
return (retval)
}
diff --git a/inst/extdata/ChoptankRiverNitrate.csv b/inst/extdata/ChoptankRiverNitrate.csv
index b6122e4f..7bd46344 100644
--- a/inst/extdata/ChoptankRiverNitrate.csv
+++ b/inst/extdata/ChoptankRiverNitrate.csv
@@ -1,8 +1,8 @@
-cdate;remarkCode;Nitrate
-1999-10-07;;1.4
-1999-11-04;<;0.99
-1999-12-30;;1.42
-2000-01-04;;1.59
-2000-02-03;;1.54
-2000-02-15;;1.37
-2000-02-19;<;1.24
+cdate;remarkCode;Nitrate;remarkCode2;Nitrate2
+1999-10-07;;1.4;;1.2
+1999-11-04;<;0.99;<;0.25
+1999-12-30;;1.42;;1.4
+2000-01-04;;1.59;;2.1
+2000-02-03;;1.54;;1.0
+2000-02-15;;1.37;<;.50
+2000-02-19;<;1.24;;1.4
--
GitLab