Browse Source

updated README.md

Merge branch 'master' of ssh://gin.g-node.org:22/tpall/geo-htseq-paper

# Conflicts:
#	README.md
#	scripts/README.Rmd
Taavi Päll 2 years ago
parent
commit
8bb65dc176
2 changed files with 34 additions and 0 deletions
  1. 15 0
      README.md
  2. 19 0
      scripts/README.Rmd

+ 15 - 0
README.md

@@ -3,8 +3,12 @@ Working with model objects
 
 ## Install
 
+<<<<<<< HEAD
 -   Download and install R <https://www.r-project.org> (and RStudio
     <https://www.rstudio.com/products/rstudio/>).
+=======
+-   Download and install R (and Rstudio).
+>>>>>>> 6416228e39f1b6de21e374074ffdd2ecf62b9007
 
 -   Go to R console or open scripts/README.Rmd in RStudio.
 
@@ -88,11 +92,19 @@ head(post)
     anti-conservative p value histograms between DESeq2 and EdgeR?
 
 ``` r
+<<<<<<< HEAD
 posterior_deseq_edger <- inv_logit_scaled(post$b_de_tooldeseq - post$b_de_tooledger)
 hist(posterior_deseq_edger, breaks = 40)
 ```
 
 ![](plots/posterior.png)
+=======
+posterior_deseq_edger <- (inv_logit_scaled(post$b_de_tooldeseq - post$b_de_tooledger))
+hist(posterior_deseq_edger, breaks = 40)
+```
+
+![](/Users/taavi/Downloads/geo-htseq-paper/README_files/figure-gfm/unnamed-chunk-6-1.png)<!-- -->
+>>>>>>> 6416228e39f1b6de21e374074ffdd2ecf62b9007
 
 -   The posterior summary for the effect size.
 
@@ -164,6 +176,7 @@ stancode(m)
     ##   // actual population-level intercept
     ##   real b_Intercept = Intercept - dot_product(means_X, b);
     ## }
+<<<<<<< HEAD
 
 ## This document
 
@@ -172,3 +185,5 @@ This README.md was generated by running:
 ``` r
 rmarkdown::render("scripts/README.Rmd", output_file = here::here("README.md"))
 ```
+=======
+>>>>>>> 6416228e39f1b6de21e374074ffdd2ecf62b9007

+ 19 - 0
scripts/README.Rmd

@@ -5,7 +5,11 @@ output: github_document
 
 ## Install
 
+<<<<<<< HEAD
 - Download and install R [https://www.r-project.org](https://www.r-project.org) (and RStudio [https://www.rstudio.com/products/rstudio/](https://www.rstudio.com/products/rstudio/)).
+=======
+- Download and install R (and Rstudio).
+>>>>>>> 6416228e39f1b6de21e374074ffdd2ecf62b9007
 
 - Go to R console or open scripts/README.Rmd in RStudio.
 
@@ -52,6 +56,7 @@ head(post)
 
 - What is the estimated difference in the proportion of anti-conservative p value histograms between DESeq2 and EdgeR?
 
+<<<<<<< HEAD
 ```{r, eval=FALSE}
 posterior_deseq_edger <- inv_logit_scaled(post$b_de_tooldeseq - post$b_de_tooledger)
 hist(posterior_deseq_edger, breaks = 40)
@@ -66,6 +71,13 @@ invisible(dev.off())
 ```
 
 ![](plots/posterior.png)
+=======
+```{r}
+posterior_deseq_edger <- (inv_logit_scaled(post$b_de_tooldeseq - post$b_de_tooledger))
+hist(posterior_deseq_edger, breaks = 40)
+```
+
+>>>>>>> 6416228e39f1b6de21e374074ffdd2ecf62b9007
 
 - The posterior summary for the effect size.
 
@@ -75,6 +87,10 @@ posterior_summary(posterior_deseq_edger)
 
 ```{r, echo=FALSE}
 ps <- posterior_summary(posterior_deseq_edger)
+<<<<<<< HEAD
+=======
+
+>>>>>>> 6416228e39f1b6de21e374074ffdd2ecf62b9007
 ```
 
 The estimated effect size is somewhere between `r paste(scales::percent(ps[1,3:4]), collapse = " and ")`.
@@ -92,6 +108,7 @@ head(data)
 stancode(m)
 ```
 
+<<<<<<< HEAD
 
 ## This document
 
@@ -102,3 +119,5 @@ rmarkdown::render("scripts/README.Rmd", output_file = here::here("README.md"))
 ```
 
 
+=======
+>>>>>>> 6416228e39f1b6de21e374074ffdd2ecf62b9007