Browse code

try1 resolving conflict

Divyagash authored on 01/06/2018 20:58:03
Showing 1 changed files

... ...
@@ -35,6 +35,7 @@ nSamples <- length(Biobase::sampleNames(bs))
35 35
 ```{r read_metrics,echo=FALSE,warning=FALSE,message=FALSE,fig.width=8, fig.height=7,fig.align='center'}
36 36
 # Methylation distribution for all the cells
37 37
 dat <- scmeth::readmetrics(bs)
38
+<<<<<<< HEAD
38 39
 
39 40
 SummaryTable <- dat
40 41
 SummaryTable$sample <- sub('\\..*$', '', SummaryTable$sample)
... ...
@@ -44,6 +45,11 @@ Summary_read <- summary(dat[,c('total','mapped','unmapped')])
44 45
 
45 46
 
46 47
 
48
+=======
49
+o <- order(dat$total,dat$sample)
50
+sampleOrder <- dat$sample[o]
51
+   
52
+>>>>>>> upstream/master
47 53
 m <- reshape2::melt(dat[,c("sample","mapped","unmapped")], id.vars="sample",
48 54
                     variable.name="Mapping_status")
49 55
 m$sample <- factor(m$sample,levels=sampleOrder)
... ...
@@ -124,8 +130,11 @@ g
124 130
 ```{r bs_conversion,echo=FALSE,warning=FALSE,message=FALSE,fig.height=5,fig.width=5,fig.align='center'}
125 131
 bscDf <- scmeth::bsConversionPlot(bs)
126 132
 
133
+<<<<<<< HEAD
127 134
 SummaryTable$Bisulfite.converion.Rate <- round(bscDf$bsc,4)
128 135
 
136
+=======
137
+>>>>>>> upstream/master
129 138
 g <- ggplot2::ggplot(bscDf, ggplot2::aes_string(x="''", y='bsc'))
130 139
 g <- g+ggplot2::geom_boxplot()
131 140
 g <- g+ggplot2::ylim(max(min(bscDf$bsc)-0.02,0),min(max(bscDf$bsc)+0.02,1))