Browse Source

updated README.md

Taavi Päll 1 year ago
parent
commit
590edc7389
2 changed files with 1 additions and 34 deletions
  1. 0 15
      README.md
  2. 1 19
      scripts/README.Rmd

+ 0 - 15
README.md

@@ -3,12 +3,8 @@ 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.
 
@@ -92,19 +88,11 @@ 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.
 
@@ -176,7 +164,6 @@ stancode(m)
     ##   // actual population-level intercept
     ##   real b_Intercept = Intercept - dot_product(means_X, b);
     ## }
-<<<<<<< HEAD
 
 ## This document
 
@@ -185,5 +172,3 @@ This README.md was generated by running:
 ``` r
 rmarkdown::render("scripts/README.Rmd", output_file = here::here("README.md"))
 ```
-=======
->>>>>>> 6416228e39f1b6de21e374074ffdd2ecf62b9007

+ 1 - 19
scripts/README.Rmd

@@ -5,11 +5,7 @@ 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.
 
@@ -56,7 +52,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)
@@ -71,13 +67,7 @@ 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.
 
@@ -87,10 +77,6 @@ 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 ")`.
@@ -108,7 +94,6 @@ head(data)
 stancode(m)
 ```
 
-<<<<<<< HEAD
 
 ## This document
 
@@ -118,6 +103,3 @@ This README.md was generated by running:
 rmarkdown::render("scripts/README.Rmd", output_file = here::here("README.md"))
 ```
 
-
-=======
->>>>>>> 6416228e39f1b6de21e374074ffdd2ecf62b9007