From c5d160d6f99aea8cbcd2607d57d711789556e3fb Mon Sep 17 00:00:00 2001
From: Laura DeCicco <ldecicco@usgs.gov>
Date: Thu, 14 Feb 2013 17:54:39 -0600
Subject: [PATCH] Cleaned up qualifier line.
---
R/processQWData.r | 31 ++++++++++++++++++-------------
1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/R/processQWData.r b/R/processQWData.r
index 9e5866f2..6de7ddc5 100644
--- a/R/processQWData.r
+++ b/R/processQWData.r
@@ -15,19 +15,24 @@
#' rawSampleSelect <- processQWData(rawSample)
processQWData <- function(data){
- qualifier <- ifelse(
- (
- (
- data$ResultDetectionConditionText == "Not Detected"
- & length(grep("Lower", data$DetectionQuantitationLimitTypeName)) > 0
- )
- |
- (
- data$ResultMeasureValue < data$DetectionQuantitationLimitMeasure.MeasureValue
- & data$ResultValueTypeName == "Actual"
- )
- ),"<",""
- )
+ qualifier <- ifelse((rawData$ResultDetectionConditionText == "Not Detected" |
+ rawData$ResultDetectionConditionText == "Detected Not Quantified" |
+ data$ResultMeasureValue < data$DetectionQuantitationLimitMeasure.MeasureValue),"<","")
+
+
+# qualifier <- ifelse(
+# (
+# (
+# data$ResultDetectionConditionText == "Not Detected"
+# & length(grep("Lower", data$DetectionQuantitationLimitTypeName)) > 0
+# )
+# |
+# (
+# data$ResultMeasureValue < data$DetectionQuantitationLimitMeasure.MeasureValue
+# & data$ResultValueTypeName == "Actual"
+# )
+# ),"<",""
+# )
correctedData<-ifelse((nchar(qualifier)==0),data$ResultMeasureValue,data$DetectionQuantitationLimitMeasure.MeasureValue)
test <- data.frame(data$USGSPCode)
--
GitLab