Merge branch 'master' into master

ttochev · Jul 1, 2021 · 1f55d21 · 1f55d21
2 parents 313a2ab + 3f8e6a2
commit 1f55d21
Show file tree

Hide file tree

Showing 41 changed files with 2,687 additions and 2,711 deletions.
diff --git a/03-shell/03-shell.Rmd b/03-shell/03-shell.Rmd
@@ -1238,6 +1238,7 @@ for i in {1..5}; do echo $i; done
 ```
 
 ---
+name: combine_csvs
 
 # Example 2: Combine CSVs
 
@@ -1274,14 +1275,16 @@ Did it work? (See next slide.)
 
 # Example 2: Combine CSVs (cont.)
 
-Hmmm. Sort of, but we need to get rid of the repeating header. 
-
 ```{bash for2b}
 cat examples/meals/mealplan.csv
 ```
 
 --
 
+Hmmm. Sort of, but we need to get rid of the repeating header. 
+
+--
+
 Can you think of a way? 
  - Answer on the next slide. (_Hint:_ `tail` and `head`...) 
 

diff --git a/03-shell/03-shell.html b/03-shell/03-shell.html
@@ -834,12 +834,12 @@
 
 ```
 ## total 148K
-## drwxr-xr-x 2 grant users 4.0K Feb 24 12:48 ABC
-## drwxr-xr-x 2 grant users 4.0K Sep 10 22:06 Bad folder name
+## drwxr-xr-x 2 grant users 4.0K May 25 20:30 ABC
+## drwxr-xr-x 2 grant users 4.0K Sep 10  2020 Bad folder name
 ## -rw-r--r-- 1 grant users  149 Feb 24 12:48 hello.R
 ## -rwxr-xr-x 1 grant users   37 Jan 14  2019 hello.sh
-## drwxr-xr-x 2 grant users 4.0K Feb 24 12:48 meals
-## -rw-r--r-- 1 grant users   32 Feb 24 12:48 nursery.txt
+## drwxr-xr-x 2 grant users 4.0K May 25 20:30 meals
+## -rw-r--r-- 1 grant users   32 May 25 20:30 nursery.txt
 ## -rwxrwxrwx 1 grant users  153 Jan 12  2019 reps.txt
 ## -rw-r--r-- 1 grant users 120K Jan 12  2019 sonnets.txt
 ```
@@ -4755,6 +4755,7 @@
 ```
 
 ---
+name: combine_csvs
 
 # Example 2: Combine CSVs
 
@@ -4785,8 +4786,6 @@
 
 # Example 2: Combine CSVs (cont.)
 
-Hmmm. Sort of, but we need to get rid of the repeating header. 
-
 
 ```bash
 $ cat examples/meals/mealplan.csv
@@ -4811,6 +4810,10 @@
 
 --
 
+Hmmm. Sort of, but we need to get rid of the repeating header. 
+
+--
+
 Can you think of a way? 
  - Answer on the next slide. (_Hint:_ `tail` and `head`...) 
 

diff --git a/03-shell/03-shell.pdf b/03-shell/03-shell.pdf
diff --git a/04-rlang/04-rlang.Rmd b/04-rlang/04-rlang.Rmd
@@ -495,6 +495,7 @@ The `View()` function is also very helpful. This is the same as clicking on the
 - E.g. `View(d)`.
 
 ---
+name: global_env
 
 # Global environment
 

diff --git a/04-rlang/04-rlang.html b/04-rlang/04-rlang.html
@@ -681,6 +681,7 @@
 - E.g. `View(d)`.
 
 ---
+name: global_env
 
 # Global environment
 

diff --git a/04-rlang/04-rlang.pdf b/04-rlang/04-rlang.pdf
diff --git a/05-tidyverse/05-tidyverse.Rmd b/05-tidyverse/05-tidyverse.Rmd
@@ -256,6 +256,7 @@ Remember: Using vertical space costs nothing and makes for much more readable/wr
 PS — The pipe is originally from the [**magrittr**](https://magrittr.tidyverse.org/) package ([geddit?](https://en.wikipedia.org/wiki/The_Treachery_of_Images)), which can do some other cool things if you're inclined to explore.
 
 ---
+name: nativepipe
 
 # A further aside on the base R pipe: |>
 

diff --git a/05-tidyverse/05-tidyverse.html b/05-tidyverse/05-tidyverse.html
@@ -177,13 +177,13 @@
 ```
 
 ```
-## ── Attaching packages ─────────────────────────────────────── tidyverse 1.3.0 ──
+## ── Attaching packages ─────────────────────────────────────── tidyverse 1.3.1 ──
 ```
 
 ```
 ## ✓ ggplot2 3.3.3     ✓ purrr   0.3.4
-## ✓ tibble  3.1.0     ✓ dplyr   1.0.4
-## ✓ tidyr   1.1.2     ✓ stringr 1.4.0
+## ✓ tibble  3.1.1     ✓ dplyr   1.0.5
+## ✓ tidyr   1.1.3     ✓ stringr 1.4.0
 ## ✓ readr   1.4.0     ✓ forcats 0.5.1
 ```
 
@@ -292,6 +292,7 @@
 PS — The pipe is originally from the [**magrittr**](https://magrittr.tidyverse.org/) package ([geddit?](https://en.wikipedia.org/wiki/The_Treachery_of_Images)), which can do some other cool things if you're inclined to explore.
 
 ---
+name: nativepipe
 
 # A further aside on the base R pipe: |&gt;
 
@@ -333,7 +334,7 @@
 ```
 
 ```
-## [1] '1.0.4'
+## [1] '1.0.5'
 ```
 
 ```r

diff --git a/05-tidyverse/05-tidyverse.pdf b/05-tidyverse/05-tidyverse.pdf
diff --git a/08-regression/08-regression.Rmd b/08-regression/08-regression.Rmd
diff --git a/08-regression/08-regression.html b/08-regression/08-regression.html
diff --git a/08-regression/08-regression.pdf b/08-regression/08-regression.pdf
diff --git a/08-regression/08-regression_files/figure-html/coefplot-1.png b/08-regression/08-regression_files/figure-html/coefplot-1.png
diff --git a/08-regression/08-regression_files/figure-latex/coefplot-1.pdf b/08-regression/08-regression_files/figure-latex/coefplot-1.pdf
diff --git a/08-regression/08-regression_files/figure-latex/margins3-1.pdf b/08-regression/08-regression_files/figure-latex/margins3-1.pdf
diff --git a/08-regression/08-regression_files/figure-latex/margins4-1.pdf b/08-regression/08-regression_files/figure-latex/margins4-1.pdf
-Original file line number
+Diff line change
@@ Expand Up @@
     - E.g. `View(d)`.
     ---
+    name: global_env
     # Global environment
@@ Expand Down @@