fixed typo

ncss-tech · Jun 27, 2017 · 6e576a4 · 6e576a4 · brownag · Jun 27, 2017
1 parent 1c6eabd
commit 6e576a4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/R/fetchNASIS.R b/R/fetchNASIS.R
@@ -33,7 +33,6 @@ fetchNASIS <- function(rmHzErrors=TRUE, nullFragsAreZero=TRUE, soilColorState='m
     hz_data$total_frags_pct_cal <- ifelse(is.na(hz_data$total_frags_pct_cal), 0, hz_data$total_frags_pct_cal)
   }
 
-
 	# join horizon + hz color: all horizons
 	h <- join(hz_data, color_data, by='phiid', type='left')
 
@@ -96,7 +95,6 @@ fetchNASIS <- function(rmHzErrors=TRUE, nullFragsAreZero=TRUE, soilColorState='m
     assign("bad.horizons", value = data.frame(bad.horizons), envir = soilDB.env)
   }
 
-
 	## join hz + phlabresults
 	if (lab) {
 	  h <- join(h, phlabresults, by = "phiid", type = "left")

diff --git a/R/simplfyFragmentData.R b/R/simplfyFragmentData.R
@@ -122,12 +122,16 @@ simplfyFragmentData <- function(rf, id.var, nullFragsAreZero=TRUE) {
             lapply(rf.wide[, -1], function(i) ifelse(is.na(i), 0, i))
       ), stringsAsFactors=FALSE)
   }
-
 
   # compute total fragments
   # trap no frag condition
-  if(ncol(rf.wide) > 1)
-    rf.wide$total_frags_pct <- rowSums(rf.wide[, -1], na.rm=TRUE)
+  if(ncol(rf.wide) > 1) {
+    #calculate another column for total RF, ignoring parafractions
+    rf.wide$total_frags_pct_nopf <- rowSums(rf.wide[,c(FALSE,!grepl(levels(rf.classes$class),pattern="para"))], na.rm=TRUE)
+
+    #calculate total fragments (including para)
+    rf.wide$total_frags_pct <- rowSums(rf.wide[, -c(1,length(names(rf.wide)))], na.rm=TRUE)
+  }
 
   # corrections:
   # 1. fine gravel is a subset of gravel, therefore: gravel = gravel + fine_gravel