Merge branch 'master' into gh-pages

idhx · Sep 6, 2020 · 7b87e69 · 7b87e69
2 parents 3dd2982 + 1438e7b
commit 7b87e69
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 148 deletions.
diff --git a/Arsenic/data/arsenic_setup.R b/Arsenic/data/arsenic_setup.R
@@ -2,7 +2,7 @@
 
 # Load libraries
 library("rprojroot")
-root<-has_dirname("RAOS-Examples")$make_fix_file()
+root<-has_file(".ROS-Examples-root")$make_fix_file()
 library("foreign")
 
 # Read in the data

diff --git a/Congress/congress.R b/Congress/congress.R
@@ -53,7 +53,7 @@ for (s in 1:n_sims) {
 }
 
 #' #### Our posterior mean and sd of how many districts the Dems will win
-print(c(mean(dems_pred), sqrt(var(dems_pred))),digits=2)
+print(c(mean(dems_pred), sd(dems_pred)), digits=2)
 #' #### Histogram of how many districts the Dems will win
 hist(dems_pred)
 

diff --git a/Congress/congress.Rmd b/Congress/congress.Rmd
@@ -78,7 +78,7 @@ for (s in 1:n_sims) {
 #### Our posterior mean and sd of how many districts the Dems will win
 
 ```{r }
-print(c(mean(dems_pred), sqrt(var(dems_pred))),digits=2)
+print(c(mean(dems_pred), sd(dems_pred)), digits=2)
 ```
 
 #### Histogram of how many districts the Dems will win

diff --git a/Congress/congress_plots.R b/Congress/congress_plots.R
@@ -24,7 +24,7 @@ savefigs <- FALSE
 
 #' #### Load packages
 library("rprojroot")
-root<-has_dirname("RAOS-Examples")$make_fix_file()
+root<-has_file(".ROS-Examples-root")$make_fix_file()
 
 #' #### Load and pre-process data
 congress <- vector("list", 49)

diff --git a/Congress/congress_plots.Rmd b/Congress/congress_plots.Rmd
@@ -26,7 +26,7 @@ savefigs <- FALSE
 
 ```{r }
 library("rprojroot")
-root<-has_dirname("RAOS-Examples")$make_fix_file()
+root<-has_file(".ROS-Examples-root")$make_fix_file()
 ```
 
 #### Load and pre-process data

diff --git a/Introclass/fakeresid.Rmd b/Introclass/fakeresid.Rmd