# HG changeset patch
# User davidvanzessen
# Date 1478854170 18000
# Node ID 933fb21568cecfd301573cd6a73ca58c0b7b99f5
# Parent 6b66c1c57f229c966e871a24162675284fa09caf
Uploaded
diff -r 6b66c1c57f22 -r 933fb21568ce merge_and_filter.r
--- a/merge_and_filter.r Thu Nov 10 08:36:18 2016 -0500
+++ b/merge_and_filter.r Fri Nov 11 03:49:30 2016 -0500
@@ -187,11 +187,13 @@
stop("No data remaining after filter")
}
+result$best_match_class = gsub(",.*", "", result$best_match) #gsub so the unmatched don't have a class after it
+
result$past = do.call(paste, c(result[unlist(strsplit(unique.type, ","))], sep = ":"))
result = result[!(duplicated(result$past)), ]
-result = result[,!(names(result) %in% c("past"))]
+result = result[,!(names(result) %in% c("past", "best_match_class"))]
print(paste("Number of sequences in result after", unique.type, "filtering:", nrow(result)))
diff -r 6b66c1c57f22 -r 933fb21568ce shm_csr.xml
--- a/shm_csr.xml Thu Nov 10 08:36:18 2016 -0500
+++ b/shm_csr.xml Fri Nov 11 03:49:30 2016 -0500
@@ -22,14 +22,14 @@
-
+
-
+
-
+
-
+