Skip to content

Commit 8239813

Browse files
Merge pull request #424 from UBC-DSCI/dev
update master with dev
2 parents bb5742b + aebdc0e commit 8239813

18 files changed

+143
-98
lines changed

Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ RUN sed -i 's/256MiB/4GiB/' /etc/ImageMagick-6/policy.xml
102102
RUN sed -i 's/512MiB/4GiB/' /etc/ImageMagick-6/policy.xml
103103
RUN sed -i 's/1GiB/4GiB/' /etc/ImageMagick-6/policy.xml
104104

105-
106105
# install version of tinytex with fixed index double-compile (no release for this yet, so install from commit hash)
107106
RUN Rscript -e "remove.packages('xfun')"
108107
RUN Rscript -e "devtools::install_github('yihui/[email protected]')"

acknowledgements.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Rohan Alexander, Isabella Ghement, Virgilio Gómez Rubio, Albert Kim, Adam Loy,
1919
The book was improved substantially by their insights.
2020
We would like to give special thanks to Jim Zidek
2121
for his support and encouragement throughout the process, and to
22-
Roger Peng for graciously offering to write the foreword.
22+
Roger Peng for graciously offering to write the Foreword.
2323

2424
Finally, we owe a debt of gratitude to all of the students of DSCI 100 over the past
2525
few years. They provided invaluable feedback on the book and worksheets;

build_html.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Script to generate HTML book
2-
docker run --rm -m 5g -v $(pwd):/home/rstudio/introduction-to-datascience ubcdsci/intro-to-ds:v0.21.0 /bin/bash -c "cd /home/rstudio/introduction-to-datascience; Rscript _build_html.r"
2+
docker run --rm -m 5g -v $(pwd):/home/rstudio/introduction-to-datascience ubcdsci/intro-to-ds:v0.22.0 /bin/bash -c "cd /home/rstudio/introduction-to-datascience; Rscript _build_html.r"

build_pdf.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ cp -r data/ pdf/data
2525
cp -r img/ pdf/img
2626

2727
# Build the book with bookdown
28-
docker run --rm -m 5g -v $(pwd):/home/rstudio/introduction-to-datascience ubcdsci/intro-to-ds:v0.21.0 /bin/bash -c "cd /home/rstudio/introduction-to-datascience/pdf; Rscript _build_pdf.r"
28+
docker run --rm -m 5g -v $(pwd):/home/rstudio/introduction-to-datascience ubcdsci/intro-to-ds:v0.22.0 /bin/bash -c "cd /home/rstudio/introduction-to-datascience/pdf; Rscript _build_pdf.r"
2929

3030
# clean files in pdf dir
3131
rm -rf pdf/references.bib

classification1.Rmd

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1415,9 +1415,14 @@ wkflw_plot
14151415
## Exercises
14161416

14171417
Practice exercises for the material covered in this chapter
1418-
can be found in the accompanying [worksheet](https://github.com/UBC-DSCI/data-science-a-first-intro-worksheets/blob/main/worksheet_classification1/worksheet_classification1.ipynb).
1419-
The worksheet tries to provide automated feedback
1420-
and help guide you through the problems.
1421-
To make sure this functionality works as intended,
1422-
please follow the instructions for computer setup needed to run the worksheets
1423-
found in Chapter \@ref(move-to-your-own-machine).
1418+
can be found in the accompanying
1419+
[worksheets repository](https://github.com/UBC-DSCI/data-science-a-first-intro-worksheets#readme)
1420+
in the "Classification I: training and predicting" row.
1421+
You can launch an interactive version of the worksheet in your browser by clicking the "launch binder" button.
1422+
You can also preview a non-interactive version of the worksheet by clicking "view worksheet."
1423+
If you instead decide to download the worksheet and run it on your own machine,
1424+
make sure to follow the instructions for computer setup
1425+
found in Chapter \@ref(move-to-your-own-machine). This will ensure that the automated feedback
1426+
and guidance that the worksheets provide will function as intended.
1427+
1428+

classification2.Rmd

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1386,12 +1386,17 @@ fwd_sel_accuracies_plot
13861386
## Exercises
13871387

13881388
Practice exercises for the material covered in this chapter
1389-
can be found in the accompanying [worksheet](https://github.com/UBC-DSCI/data-science-a-first-intro-worksheets/blob/main/worksheet_classification2/worksheet_classification2.ipynb).
1390-
The worksheet tries to provide automated feedback
1391-
and help guide you through the problems.
1392-
To make sure this functionality works as intended,
1393-
please follow the instructions for computer setup needed to run the worksheets
1394-
found in Chapter \@ref(move-to-your-own-machine).
1389+
can be found in the accompanying
1390+
[worksheets repository](https://github.com/UBC-DSCI/data-science-a-first-intro-worksheets#readme)
1391+
in the "Classification II: evaluation and tuning" row.
1392+
You can launch an interactive version of the worksheet in your browser by clicking the "launch binder" button.
1393+
You can also preview a non-interactive version of the worksheet by clicking "view worksheet."
1394+
If you instead decide to download the worksheet and run it on your own machine,
1395+
make sure to follow the instructions for computer setup
1396+
found in Chapter \@ref(move-to-your-own-machine). This will ensure that the automated feedback
1397+
and guidance that the worksheets provide will function as intended.
1398+
1399+
13951400

13961401
## Additional resources
13971402
- The [`tidymodels` website](https://tidymodels.org/packages) is an excellent

clustering.Rmd

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,12 +1103,15 @@ elbow_plot
11031103
## Exercises
11041104

11051105
Practice exercises for the material covered in this chapter
1106-
can be found in the accompanying [worksheet](https://github.com/UBC-DSCI/data-science-a-first-intro-worksheets/blob/main/worksheet_clustering/worksheet_clustering.ipynb).
1107-
The worksheet tries to provide automated feedback
1108-
and help guide you through the problems.
1109-
To make sure this functionality works as intended,
1110-
please follow the instructions for computer setup needed to run the worksheets
1111-
found in Chapter \@ref(move-to-your-own-machine).
1106+
can be found in the accompanying
1107+
[worksheets repository](https://github.com/UBC-DSCI/data-science-a-first-intro-worksheets#readme)
1108+
in the "Clustering" row.
1109+
You can launch an interactive version of the worksheet in your browser by clicking the "launch binder" button.
1110+
You can also preview a non-interactive version of the worksheet by clicking "view worksheet."
1111+
If you instead decide to download the worksheet and run it on your own machine,
1112+
make sure to follow the instructions for computer setup
1113+
found in Chapter \@ref(move-to-your-own-machine). This will ensure that the automated feedback
1114+
and guidance that the worksheets provide will function as intended.
11121115

11131116
## Additional resources
11141117
- Chapter 10 of *An Introduction to Statistical

inference.Rmd

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1169,14 +1169,15 @@ statistical techniques you may learn about in the future!
11691169
## Exercises
11701170

11711171
Practice exercises for the material covered in this chapter
1172-
can be found in the two accompanying worksheets
1173-
([first worksheet](https://github.com/UBC-DSCI/data-science-a-first-intro-worksheets/blob/main/worksheet_inference1/worksheet_inference1.ipynb)
1174-
and [second worksheet](https://github.com/UBC-DSCI/data-science-a-first-intro-worksheets/blob/main/worksheet_inference2/worksheet_inference2.ipynb)).
1175-
The worksheets try to provide automated feedback
1176-
and help guide you through the problems.
1177-
To make sure this functionality works as intended,
1178-
please follow the instructions for computer setup needed to run the worksheets
1179-
found in Chapter \@ref(move-to-your-own-machine).
1172+
can be found in the accompanying
1173+
[worksheets repository](https://github.com/UBC-DSCI/data-science-a-first-intro-worksheets#readme)
1174+
in the two "Statistical inference" rows.
1175+
You can launch an interactive version of each worksheet in your browser by clicking the "launch binder" button.
1176+
You can also preview a non-interactive version of each worksheet by clicking "view worksheet."
1177+
If you instead decide to download the worksheets and run them on your own machine,
1178+
make sure to follow the instructions for computer setup
1179+
found in Chapter \@ref(move-to-your-own-machine). This will ensure that the automated feedback
1180+
and guidance that the worksheets provide will function as intended.
11801181

11811182
## Additional resources
11821183

intro.Rmd

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ image_read("img/ggplot_function.jpeg") |>
528528
image_crop("1625x1900")
529529
```
530530

531-
```{r barplot-mother-tongue, fig.width=5, fig.height=3, warning=FALSE, fig.cap = "Bar plot of the ten Aboriginal languages most often reported by Canadian residents as their mother tongue."}
531+
```{r barplot-mother-tongue, fig.width=5, fig.height=3, warning=FALSE, fig.cap = "Bar plot of the ten Aboriginal languages most often reported by Canadian residents as their mother tongue. Note that this visualization is not done yet; there are still improvements to be made."}
532532
ggplot(ten_lang, aes(x = language, y = mother_tongue)) +
533533
geom_bar(stat = "identity")
534534
```
@@ -567,7 +567,7 @@ words (e.g. `"Mother Tongue (Number of Canadian Residents)"`) as arguments to
567567
layers to format the plot further, and we will explore these in Chapter
568568
\@ref(viz).
569569

570-
(ref:barplot-mother-tongue-labs) Bar plot of the ten Aboriginal languages most often reported by Canadian residents as their mother tongue with x and y labels.
570+
(ref:barplot-mother-tongue-labs) Bar plot of the ten Aboriginal languages most often reported by Canadian residents as their mother tongue with x and y labels. Note that this visualization is not done yet; there are still improvements to be made.
571571

572572
```{r barplot-mother-tongue-labs, fig.width=5, fig.height=3.6, warning=FALSE, fig.cap = "(ref:barplot-mother-tongue-labs)", fig.pos = "H", out.extra=""}
573573
ggplot(ten_lang, aes(x = language, y = mother_tongue)) +
@@ -583,7 +583,7 @@ currently making it difficult to read the different language names.
583583
One solution is to rotate the plot such that the bars are horizontal rather than vertical.
584584
To accomplish this, we will swap the x and y coordinate axes:
585585

586-
```{r barplot-mother-tongue-flipped, fig.width=5, fig.height=3, fig.pos = "H", out.extra="", warning=FALSE, fig.cap = "Horizontal bar plot of the ten Aboriginal languages most often reported by Canadian residents as their mother tongue."}
586+
```{r barplot-mother-tongue-flipped, fig.width=5, fig.height=3, fig.pos = "H", out.extra="", warning=FALSE, fig.cap = "Horizontal bar plot of the ten Aboriginal languages most often reported by Canadian residents as their mother tongue. There are no more serious issues with this visualization, but it could be refined further."}
587587
ggplot(ten_lang, aes(x = mother_tongue, y = language)) +
588588
geom_bar(stat = "identity") +
589589
xlab("Mother Tongue (Number of Canadian Residents)") +
@@ -704,9 +704,12 @@ knitr::include_graphics("img/help-filter.png")
704704
## Exercises
705705

706706
Practice exercises for the material covered in this chapter
707-
can be found in the accompanying [worksheet](https://github.com/UBC-DSCI/data-science-a-first-intro-worksheets/blob/main/worksheet_intro/worksheet_intro.ipynb).
708-
The worksheet tries to provide automated feedback
709-
and help guide you through the problems.
710-
To make sure this functionality works as intended,
711-
please follow the instructions for computer setup needed to run the worksheets
712-
found in Chapter \@ref(move-to-your-own-machine).
707+
can be found in the accompanying
708+
[worksheets repository](https://github.com/UBC-DSCI/data-science-a-first-intro-worksheets#readme)
709+
in the "R and the tidyverse" row.
710+
You can launch an interactive version of the worksheet in your browser by clicking the "launch binder" button.
711+
You can also preview a non-interactive version of the worksheet by clicking "view worksheet."
712+
If you instead decide to download the worksheet and run it on your own machine,
713+
make sure to follow the instructions for computer setup
714+
found in Chapter \@ref(move-to-your-own-machine). This will ensure that the automated feedback
715+
and guidance that the worksheets provide will function as intended.

pdf/latex/before_body.tex

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,7 @@
1818
%\includegraphics{images/dedication.pdf}
1919
\end{center}
2020

21+
\cleardoublepage\newpage\thispagestyle{empty}\null
22+
2123
\setlength{\abovedisplayskip}{-5pt}
2224
\setlength{\abovedisplayshortskip}{-5pt}

0 commit comments

Comments
 (0)