# HG changeset patch
# User davidvanzessen
# Date 1424794766 18000
# Node ID f35c127b29b1a2ced17b7c69e61d2a09a6b95bfd
# Parent  99020e5ce46c292675fce7bea821e3b7ed2687c3
Uploaded

diff -r 99020e5ce46c -r f35c127b29b1 RScript.r
--- a/RScript.r	Tue Feb 24 10:10:45 2015 -0500
+++ b/RScript.r	Tue Feb 24 11:19:26 2015 -0500
@@ -349,10 +349,9 @@
       }
     } else { #scatterplot data
       scatterplot_locus_data = scatterplot_data[grepl(V_Segment, scatterplot_data$V_Segment_Major_Gene) & grepl(J_Segment, scatterplot_data$J_Segment_Major_Gene),]
-      scatterplot_locus_data$type = ifelse(scatterplot_locus_data$Clone_Sequence %in% patientMerge12[one_two,]$Clone_Sequence.x, "In two", "In one")
-      scatterplot_locus_data$type = ifelse(scatterplot_locus_data$Clone_Sequence %in% patientMerge13[one_three,]$Clone_Sequence.x, "In two", "In one")
-      scatterplot_locus_data$type = ifelse(scatterplot_locus_data$Clone_Sequence %in% patientMerge23[two_three,]$Clone_Sequence.x, "In two", "In one")
-      scatterplot_locus_data$type = ifelse(scatterplot_locus_data$type == "In two", ifelse(scatterplot_locus_data$Clone_Sequence %in% patientMerge[all,]$Clone_Sequence.x, "In three", "In two"), "In one")
+      scatterplot_locus_data$type = ifelse((scatterplot_locus_data$Clone_Sequence %in% patientMerge12[one_two,]$Clone_Sequence.x) | (scatterplot_locus_data$Clone_Sequence %in% patientMerge13[one_three,]$Clone_Sequence.x) | (scatterplot_locus_data$Clone_Sequence %in% patientMerge23[two_three,]$Clone_Sequence.x), "In two", "In one")
+      #scatterplot_locus_data$type = ifelse(scatterplot_locus_data$type == "In two", ifelse(scatterplot_locus_data$Clone_Sequence %in% patientMerge[all,]$Clone_Sequence.x, "In three", "In two"), "In one")
+      scatterplot_locus_data[(scatterplot_locus_data$Clone_Sequence %in% patientMerge[all,]$Clone_Sequence.x),]$type = "In three"
       scatterplot_locus_data$type = ifelse(scatterplot_locus_data$type == "In one", "In one", "In multiple")
       
       p = NULL