deploy: a06184a

UBC-DSCI · Sep 28, 2023 · acf503c · acf503c
1 parent 5714649
commit acf503c
Show file tree

Hide file tree

Showing 54 changed files with 1,653 additions and 862 deletions.
diff --git a/dev/_images/activate-and-run-button-annotated.png b/dev/_images/activate-and-run-button-annotated.png
diff --git a/dev/_images/code-cell-not-run.png b/dev/_images/code-cell-not-run.png
diff --git a/dev/_images/code-cell-run.png b/dev/_images/code-cell-run.png
diff --git a/dev/_images/convert-to-markdown-cell.png b/dev/_images/convert-to-markdown-cell.png
diff --git a/dev/_images/create-new-code-cell.png b/dev/_images/create-new-code-cell.png
diff --git a/dev/_images/git_add_01.png b/dev/_images/git_add_01.png
diff --git a/dev/_images/git_add_02.png b/dev/_images/git_add_02.png
diff --git a/dev/_images/git_add_03.png b/dev/_images/git_add_03.png
diff --git a/dev/_images/git_commit_01.png b/dev/_images/git_commit_01.png
diff --git a/dev/_images/git_commit_03.png b/dev/_images/git_commit_03.png
diff --git a/dev/_images/git_pull_01.png b/dev/_images/git_pull_01.png
diff --git a/dev/_images/git_pull_02.png b/dev/_images/git_pull_02.png
diff --git a/dev/_images/git_pull_03.png b/dev/_images/git_pull_03.png
diff --git a/dev/_images/git_pull_04.png b/dev/_images/git_pull_04.png
diff --git a/dev/_images/git_push_01.png b/dev/_images/git_push_01.png
diff --git a/dev/_images/git_push_02.png b/dev/_images/git_push_02.png
diff --git a/dev/_images/git_push_03.png b/dev/_images/git_push_03.png
diff --git a/dev/_images/intro-bootstrap.jpeg b/dev/_images/intro-bootstrap.jpeg
diff --git a/dev/_images/jupyter.png b/dev/_images/jupyter.png
diff --git a/dev/_images/launcher-annotated.png b/dev/_images/launcher-annotated.png
diff --git a/dev/_images/markdown-cell-not-run.png b/dev/_images/markdown-cell-not-run.png
diff --git a/dev/_images/markdown-cell-run.png b/dev/_images/markdown-cell-run.png
diff --git a/dev/_images/merge_conflict_01.png b/dev/_images/merge_conflict_01.png
diff --git a/dev/_images/merge_conflict_03.png b/dev/_images/merge_conflict_03.png
diff --git a/dev/_images/merge_conflict_04.png b/dev/_images/merge_conflict_04.png
diff --git a/dev/_images/merge_conflict_05.png b/dev/_images/merge_conflict_05.png
diff --git a/dev/_images/merge_conflict_06.png b/dev/_images/merge_conflict_06.png
diff --git a/dev/_images/open_data_w_editor_01.png b/dev/_images/open_data_w_editor_01.png
diff --git a/dev/_images/open_data_w_editor_02.png b/dev/_images/open_data_w_editor_02.png
diff --git a/dev/_images/out-of-order-1.png b/dev/_images/out-of-order-1.png
diff --git a/dev/_images/out-of-order-2.png b/dev/_images/out-of-order-2.png
diff --git a/dev/_images/out-of-order-3.png b/dev/_images/out-of-order-3.png
diff --git a/dev/_images/png-vs-svg.png b/dev/_images/png-vs-svg.png
diff --git a/dev/_images/restart-kernel-run-all.png b/dev/_images/restart-kernel-run-all.png
diff --git a/dev/_sources/acknowledgements.md b/dev/_sources/acknowledgements.md
@@ -27,6 +27,8 @@ list of topics in this book. We would especially like to thank Matías
 Salibían-Barrera for his mentorship during the initial development and roll-out
 of both DSCI 100 and this book. His door was always open when
 we needed to chat about how to best introduce and teach data science to our first-year students.
+We would also like to thank Gabriela Cohen Freue for her DSCI 561 (Regression I) teaching materials
+from the UBC Master of Data Science program, as some of our linear regression figures were inspired from these.
 
 We would also like to thank all those who contributed to the process of
 publishing this book. In particular, we would like to thank all of our reviewers for their feedback and suggestions:

diff --git a/dev/_sources/clustering.md b/dev/_sources/clustering.md
diff --git a/dev/_sources/jupyter.md b/dev/_sources/jupyter.md
@@ -30,15 +30,6 @@ Note that we assume that you already have Jupyter set up and ready to use. If th
 {numref}`Chapter %s <move-to-your-own-machine>` to learn how to install and configure Jupyter on your own
 computer.
 
-```{note}
-This book was originally written for the R programming language, and
-has been edited to focus instead on Python. This chapter on Jupyter notebooks
-has not yet been fully updated to focus on Python; it has images and examples from
-the R version of the book. But the concepts related to Jupyter notebooks are generally
-the same. We are currently working on producing new Python-based images and examples
-for this chapter.
-```
-
 ## Chapter learning objectives
 
 By the end of the chapter, readers will be able to do the following:

diff --git a/dev/_sources/regression1.md b/dev/_sources/regression1.md
@@ -308,15 +308,15 @@ nearest_neighbors
 nn_plot = small_plot + rule
 
 # plot horizontal lines which is perpendicular to x=2000
+h_lines = []
 for i in range(5):
     h_line_df = pd.DataFrame({
         "sqft": [nearest_neighbors.iloc[i, 4], 2000],
         "price": [nearest_neighbors.iloc[i, 6]] * 2
     })
-    h_line = alt.Chart(h_line_df).mark_line(color="orange").encode(x="sqft", y="price")
-    nn_plot += h_line
+    h_lines.append(alt.Chart(h_line_df).mark_line(color="orange").encode(x="sqft", y="price"))
 
-nn_plot
+nn_plot = alt.layer(*h_lines, small_plot, rule)
 ```
 
 ```{code-cell} ipython3
@@ -487,13 +487,15 @@ errors_plot = (
     small_plot
     + alt.Chart(sacr_full_preds_hid).mark_line().encode(x="sqft", y="predicted")
     + alt.Chart(sacr_new_preds_hid)
-    .mark_circle()
+    .mark_circle(opacity=1)
     .encode(x="sqft", y="price")
 )
+v_lines = []
 for i in pts["sqft"]:
     line_df = sacr_new_preds_melted_df.query("sqft == @i")
-    errors_plot += alt.Chart(line_df).mark_line(color="red").encode(x="sqft", y="value")
+    v_lines.append(alt.Chart(line_df).mark_line(color="red").encode(x="sqft", y="value"))
 
+errors_plot = alt.layer(*v_lines, errors_plot)
 errors_plot
 ```
 

diff --git a/dev/_sources/regression2.md b/dev/_sources/regression2.md
@@ -305,13 +305,13 @@ small_sacramento_pred = small_sacramento_pred[["sqft", "price", "predicted"]].me
     id_vars=["sqft"]
 )
 
-error_plot = small_plot.copy()
-
+v_lines = []
 for i in range(len(small_sacramento)):
     sqft_val = small_sacramento.iloc[i]["sqft"]
     line_df = small_sacramento_pred.query("sqft == @sqft_val")
-    error_plot += alt.Chart(line_df).mark_line(color="red").encode(x="sqft", y="value")
+    v_lines.append(alt.Chart(line_df).mark_line(color="red").encode(x="sqft", y="value"))
 
+error_plot = alt.layer(*v_lines, small_plot).configure_circle(opacity=1)
 error_plot
 ```
 

diff --git a/dev/_sources/version-control.md b/dev/_sources/version-control.md
@@ -40,15 +40,6 @@ used day-to-day in a standard data science project.
 There are many user interfaces for Git; in this chapter
 we will cover the Jupyter Git interface.
 
-```{note}
-This book was originally written for the R programming language, and
-has been edited to focus instead on Python. This chapter on version control
-has not yet been fully updated to focus on Python; it has images and examples from
-the R version of the book. But the concepts related to version control are generally
-the same. We are currently working on producing new Python-based images and examples
-for this chapter.
-```
-
 ## Chapter learning objectives
 
 By the end of the chapter, readers will be able to do the following:
@@ -1046,8 +1037,8 @@ marked by `>>>>>>>`. Between these markings, Git also inserts a separator
 (`=======`). The version of the change before the separator is your change, and
 the version that follows the separator was the change that existed on GitHub.
 In {numref}`merge-conflict-05`, you can see that in your local repository
-there is a line of code that calls `scale_color_manual` with three color values (`deeppink2`, `cyan4`, and `purple1`).
-It looks like your collaborator made an edit to that line too, except with different colors (to `blue3`, `red3`, and `black`)!
+there is a line of code that sets the axis scaling to `"sqrt"`.
+It looks like your collaborator made an edit to that line too, except with axis scaling `"log"`!
 
 ```{figure} img/version-control/merge_conflict_05.png
 ---
@@ -1165,8 +1156,7 @@ Now that you've picked up the basics of version control with Git and GitHub,
 you can expand your knowledge through the resources listed below:
 
 - GitHub's [guides website](https://guides.github.com/) and [YouTube
-  channel](https://www.youtube.com/githubguides), and [*Happy Git and GitHub
-  for the useR*](https://happygitwithr.com/) are great resources to take the next steps in
+  channel](https://www.youtube.com/githubguides) are great resources to take the next steps in
   learning about Git and GitHub.
 - [Good enough practices in scientific
   computing](https://journals.plos.org/ploscompbiol/article?id=10.1371/journal.pcbi.1005510#sec014)

diff --git a/dev/acknowledgements.html b/dev/acknowledgements.html
@@ -361,7 +361,9 @@ <h1>Acknowledgments<a class="headerlink" href="#acknowledgments" title="Permalin
 list of topics in this book. We would especially like to thank Matías
 Salibían-Barrera for his mentorship during the initial development and roll-out
 of both DSCI 100 and this book. His door was always open when
-we needed to chat about how to best introduce and teach data science to our first-year students.</p>
+we needed to chat about how to best introduce and teach data science to our first-year students.
+We would also like to thank Gabriela Cohen Freue for her DSCI 561 (Regression I) teaching materials
+from the UBC Master of Data Science program, as some of our linear regression figures were inspired from these.</p>
 <p>We would also like to thank all those who contributed to the process of
 publishing this book. In particular, we would like to thank all of our reviewers for their feedback and suggestions:
 Rohan Alexander, Isabella Ghement, Virgilio Gómez Rubio, Albert Kim, Adam Loy, Maria Prokofieva, Emily Riederer, and Greg Wilson.

diff --git a/dev/classification1.html b/dev/classification1.html
diff --git a/dev/classification2.html b/dev/classification2.html
diff --git a/dev/clustering.html b/dev/clustering.html
diff --git a/dev/inference.html b/dev/inference.html
diff --git a/dev/intro.html b/dev/intro.html
diff --git a/dev/jupyter.html b/dev/jupyter.html
@@ -394,15 +394,6 @@ <h2><span class="section-number">11.1. </span>Overview<a class="headerlink" href
 Note that we assume that you already have Jupyter set up and ready to use. If that is not the case, please first read
 <a class="reference internal" href="setup.html#move-to-your-own-machine"><span class="std std-numref">Chapter 13</span></a> to learn how to install and configure Jupyter on your own
 computer.</p>
-<div class="admonition note">
-<p class="admonition-title">Note</p>
-<p>This book was originally written for the R programming language, and
-has been edited to focus instead on Python. This chapter on Jupyter notebooks
-has not yet been fully updated to focus on Python; it has images and examples from
-the R version of the book. But the concepts related to Jupyter notebooks are generally
-the same. We are currently working on producing new Python-based images and examples
-for this chapter.</p>
-</div>
 </section>
 <section id="chapter-learning-objectives">
 <h2><span class="section-number">11.2. </span>Chapter learning objectives<a class="headerlink" href="#chapter-learning-objectives" title="Permalink to this heading">#</a></h2>

diff --git a/dev/objects.inv b/dev/objects.inv
diff --git a/dev/regression1.html b/dev/regression1.html
diff --git a/dev/regression2.html b/dev/regression2.html
diff --git a/dev/searchindex.js b/dev/searchindex.js
diff --git a/dev/version-control.html b/dev/version-control.html
@@ -401,15 +401,6 @@ <h2><span class="section-number">12.1. </span>Overview<a class="headerlink" href
 used day-to-day in a standard data science project.
 There are many user interfaces for Git; in this chapter
 we will cover the Jupyter Git interface.</p>
-<div class="admonition note">
-<p class="admonition-title">Note</p>
-<p>This book was originally written for the R programming language, and
-has been edited to focus instead on Python. This chapter on version control
-has not yet been fully updated to focus on Python; it has images and examples from
-the R version of the book. But the concepts related to version control are generally
-the same. We are currently working on producing new Python-based images and examples
-for this chapter.</p>
-</div>
 </section>
 <section id="chapter-learning-objectives">
 <h2><span class="section-number">12.2. </span>Chapter learning objectives<a class="headerlink" href="#chapter-learning-objectives" title="Permalink to this heading">#</a></h2>
@@ -1187,8 +1178,8 @@ <h3><span class="section-number">12.8.3. </span>Handling merge conflicts<a class
 (<code class="docutils literal notranslate"><span class="pre">=======</span></code>). The version of the change before the separator is your change, and
 the version that follows the separator was the change that existed on GitHub.
 In <a class="reference internal" href="#merge-conflict-05"><span class="std std-numref">Fig. 12.48</span></a>, you can see that in your local repository
-there is a line of code that calls <code class="docutils literal notranslate"><span class="pre">scale_color_manual</span></code> with three color values (<code class="docutils literal notranslate"><span class="pre">deeppink2</span></code>, <code class="docutils literal notranslate"><span class="pre">cyan4</span></code>, and <code class="docutils literal notranslate"><span class="pre">purple1</span></code>).
-It looks like your collaborator made an edit to that line too, except with different colors (to <code class="docutils literal notranslate"><span class="pre">blue3</span></code>, <code class="docutils literal notranslate"><span class="pre">red3</span></code>, and <code class="docutils literal notranslate"><span class="pre">black</span></code>)!</p>
+there is a line of code that sets the axis scaling to <code class="docutils literal notranslate"><span class="pre">&quot;sqrt&quot;</span></code>.
+It looks like your collaborator made an edit to that line too, except with axis scaling <code class="docutils literal notranslate"><span class="pre">&quot;log&quot;</span></code>!</p>
 <figure class="align-default" id="merge-conflict-05">
 <img alt="_images/merge_conflict_05.png" src="_images/merge_conflict_05.png" />
 <figcaption>
@@ -1288,8 +1279,7 @@ <h2><span class="section-number">12.10. </span>Additional resources<a class="hea
 you can expand your knowledge through the resources listed below:</p>
 <ul class="simple">
 <li><p>GitHub’s <a class="reference external" href="https://guides.github.com/">guides website</a> and <a class="reference external" href="https://www.youtube.com/githubguides">YouTube
-channel</a>, and <a class="reference external" href="https://happygitwithr.com/"><em>Happy Git and GitHub
-for the useR</em></a> are great resources to take the next steps in
+channel</a> are great resources to take the next steps in
 learning about Git and GitHub.</p></li>
 <li><p><a class="reference external" href="https://journals.plos.org/ploscompbiol/article?id=10.1371/journal.pcbi.1005510#sec014">Good enough practices in scientific
 computing</a>

diff --git a/dev/viz.html b/dev/viz.html
diff --git a/dev/wrangling.html b/dev/wrangling.html
@@ -5055,7 +5055,7 @@ <h2><span class="section-number">3.9. </span>Performing operations on groups of
 </div>
 </div>
 <div class="cell_output docutils container">
-<div class="output text_plain highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>&lt;pandas.core.groupby.generic.DataFrameGroupBy object at 0x7f2da6068790&gt;
+<div class="output text_plain highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>&lt;pandas.core.groupby.generic.DataFrameGroupBy object at 0x7f294af34a10&gt;
 </pre></div>
 </div>
 </div>