Skip to content

Commit

Permalink
Minor fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@rafalab
rafalab committed Jan 4, 2024
1 parent afb25f9 commit 2cdcde1
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 39 deletions.
6 changes: 5 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
.Rhistory
.RData
.Ruserdata
*_files
R/*_files/
dataviz/*_files/
docs/*_files/
productivity/*_files/
wrangling/*_files/
*_cache
copy-qmds.R
crossref.sh
Expand Down
Binary file added docs/dataviz/ggplot2_files/figure-html/ggplot-example-1-1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/dataviz/ggplot2_files/figure-html/ggplot-example-7-1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/dataviz/ggplot2_files/figure-html/ggplot2-image-new-colors-1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
58 changes: 29 additions & 29 deletions docs/sitemap.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,118 +2,118 @@
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url>
<loc>http://rafalab.dfci.harvard.edu/dsbook-part-1/index.html</loc>
<lastmod>2024-01-03T14:53:44.112Z</lastmod>
<lastmod>2024-01-04T19:56:40.658Z</lastmod>
</url>
<url>
<loc>http://rafalab.dfci.harvard.edu/dsbook-part-1/intro.html</loc>
<lastmod>2024-01-03T14:53:44.118Z</lastmod>
<lastmod>2024-01-04T19:56:40.664Z</lastmod>
</url>
<url>
<loc>http://rafalab.dfci.harvard.edu/dsbook-part-1/R/intro-to-R.html</loc>
<lastmod>2024-01-03T14:53:44.122Z</lastmod>
<lastmod>2024-01-04T19:56:40.669Z</lastmod>
</url>
<url>
<loc>http://rafalab.dfci.harvard.edu/dsbook-part-1/R/getting-started.html</loc>
<lastmod>2024-01-03T14:53:44.129Z</lastmod>
<lastmod>2024-01-04T19:56:40.677Z</lastmod>
</url>
<url>
<loc>http://rafalab.dfci.harvard.edu/dsbook-part-1/R/R-basics.html</loc>
<lastmod>2024-01-03T14:53:44.174Z</lastmod>
<lastmod>2024-01-04T19:56:40.728Z</lastmod>
</url>
<url>
<loc>http://rafalab.dfci.harvard.edu/dsbook-part-1/R/programming-basics.html</loc>
<lastmod>2024-01-03T14:53:44.187Z</lastmod>
<lastmod>2024-01-04T19:56:40.741Z</lastmod>
</url>
<url>
<loc>http://rafalab.dfci.harvard.edu/dsbook-part-1/R/tidyverse.html</loc>
<lastmod>2024-01-03T14:53:44.211Z</lastmod>
<lastmod>2024-01-04T19:56:40.767Z</lastmod>
</url>
<url>
<loc>http://rafalab.dfci.harvard.edu/dsbook-part-1/R/data-table.html</loc>
<lastmod>2024-01-03T14:53:44.223Z</lastmod>
<lastmod>2024-01-04T19:56:40.780Z</lastmod>
</url>
<url>
<loc>http://rafalab.dfci.harvard.edu/dsbook-part-1/R/importing-data.html</loc>
<lastmod>2024-01-03T14:53:44.233Z</lastmod>
<lastmod>2024-01-04T19:56:40.790Z</lastmod>
</url>
<url>
<loc>http://rafalab.dfci.harvard.edu/dsbook-part-1/dataviz/intro-dataviz.html</loc>
<lastmod>2024-01-03T14:53:44.237Z</lastmod>
<lastmod>2024-01-04T19:56:40.795Z</lastmod>
</url>
<url>
<loc>http://rafalab.dfci.harvard.edu/dsbook-part-1/dataviz/distributions.html</loc>
<lastmod>2024-01-03T14:53:44.244Z</lastmod>
<lastmod>2024-01-04T19:56:40.803Z</lastmod>
</url>
<url>
<loc>http://rafalab.dfci.harvard.edu/dsbook-part-1/dataviz/ggplot2.html</loc>
<lastmod>2024-01-03T14:53:44.263Z</lastmod>
<lastmod>2024-01-04T19:56:40.823Z</lastmod>
</url>
<url>
<loc>http://rafalab.dfci.harvard.edu/dsbook-part-1/dataviz/dataviz-principles.html</loc>
<lastmod>2024-01-03T14:53:44.276Z</lastmod>
<lastmod>2024-01-04T19:56:40.838Z</lastmod>
</url>
<url>
<loc>http://rafalab.dfci.harvard.edu/dsbook-part-1/dataviz/dataviz-in-practice.html</loc>
<lastmod>2024-01-03T14:53:44.306Z</lastmod>
<lastmod>2024-01-04T19:56:40.869Z</lastmod>
</url>
<url>
<loc>http://rafalab.dfci.harvard.edu/dsbook-part-1/wrangling/intro-to-wrangling.html</loc>
<lastmod>2024-01-03T14:53:44.309Z</lastmod>
<lastmod>2024-01-04T19:56:40.873Z</lastmod>
</url>
<url>
<loc>http://rafalab.dfci.harvard.edu/dsbook-part-1/wrangling/reshaping-data.html</loc>
<lastmod>2024-01-03T14:53:44.320Z</lastmod>
<lastmod>2024-01-04T19:56:40.884Z</lastmod>
</url>
<url>
<loc>http://rafalab.dfci.harvard.edu/dsbook-part-1/wrangling/joining-tables.html</loc>
<lastmod>2024-01-03T14:53:44.352Z</lastmod>
<lastmod>2024-01-04T19:56:40.914Z</lastmod>
</url>
<url>
<loc>http://rafalab.dfci.harvard.edu/dsbook-part-1/wrangling/dates-and-times.html</loc>
<lastmod>2024-01-03T14:53:44.361Z</lastmod>
<lastmod>2024-01-04T19:56:40.921Z</lastmod>
</url>
<url>
<loc>http://rafalab.dfci.harvard.edu/dsbook-part-1/wrangling/locales.html</loc>
<lastmod>2024-01-03T14:53:44.369Z</lastmod>
<lastmod>2024-01-04T19:56:40.930Z</lastmod>
</url>
<url>
<loc>http://rafalab.dfci.harvard.edu/dsbook-part-1/wrangling/data-table-wrangling.html</loc>
<lastmod>2024-01-03T14:53:44.377Z</lastmod>
<lastmod>2024-01-04T19:56:40.938Z</lastmod>
</url>
<url>
<loc>http://rafalab.dfci.harvard.edu/dsbook-part-1/wrangling/web-scraping.html</loc>
<lastmod>2024-01-03T14:53:44.386Z</lastmod>
<lastmod>2024-01-04T19:56:40.948Z</lastmod>
</url>
<url>
<loc>http://rafalab.dfci.harvard.edu/dsbook-part-1/wrangling/string-processing.html</loc>
<lastmod>2024-01-03T14:53:44.424Z</lastmod>
<lastmod>2024-01-04T19:56:40.987Z</lastmod>
</url>
<url>
<loc>http://rafalab.dfci.harvard.edu/dsbook-part-1/wrangling/text-analysis.html</loc>
<lastmod>2024-01-03T14:53:44.439Z</lastmod>
<lastmod>2024-01-04T19:56:41.002Z</lastmod>
</url>
<url>
<loc>http://rafalab.dfci.harvard.edu/dsbook-part-1/productivity/intro-productivity.html</loc>
<lastmod>2024-01-03T14:53:44.444Z</lastmod>
<lastmod>2024-01-04T19:56:41.007Z</lastmod>
</url>
<url>
<loc>http://rafalab.dfci.harvard.edu/dsbook-part-1/productivity/installing-git.html</loc>
<lastmod>2024-01-03T14:53:44.448Z</lastmod>
<lastmod>2024-01-04T19:56:41.011Z</lastmod>
</url>
<url>
<loc>http://rafalab.dfci.harvard.edu/dsbook-part-1/productivity/unix.html</loc>
<lastmod>2024-01-03T14:53:44.458Z</lastmod>
<lastmod>2024-01-04T19:56:41.021Z</lastmod>
</url>
<url>
<loc>http://rafalab.dfci.harvard.edu/dsbook-part-1/productivity/git.html</loc>
<lastmod>2024-01-03T14:53:44.468Z</lastmod>
<lastmod>2024-01-04T19:56:41.030Z</lastmod>
</url>
<url>
<loc>http://rafalab.dfci.harvard.edu/dsbook-part-1/productivity/reproducible-projects.html</loc>
<lastmod>2024-01-03T14:53:44.477Z</lastmod>
<lastmod>2024-01-04T19:56:41.039Z</lastmod>
</url>
<url>
<loc>http://rafalab.dfci.harvard.edu/dsbook-part-1/Introduction-to-Data-Science.pdf</loc>
<lastmod>2024-01-03T14:53:43.937Z</lastmod>
<lastmod>2024-01-04T19:56:40.485Z</lastmod>
</url>
</urlset>
14 changes: 7 additions & 7 deletions docs/wrangling/string-processing.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1409,7 +1409,7 @@ <h1 class="title">
</div>
</div>
<p>we see that the legend takes up much of the plot because we have four countries with names longer than 12 characters. We can rename these levels using the <code>case_when</code> function:</p>
<div class="cell" data-layout-align="center" data-hash="string-processing_cache/html/unnamed-chunk-86_94fe1d7277f85679634ddd4837400ccf">
<div class="cell" data-layout-align="center" data-hash="string-processing_cache/html/country-long-names_3bc58a2518c28ca306edbb4173c8de49">
<div class="sourceCode" id="cb86"><pre class="downlit sourceCode r code-with-copy"><code class="sourceCode R"><span><span class="va">x</span> <span class="op">&lt;-</span> <span class="fu"><a href="https://rdrr.io/r/base/levels.html">levels</a></span><span class="op">(</span><span class="va">gapminder</span><span class="op">$</span><span class="va">country</span><span class="op">)</span></span>
<span><span class="fu"><a href="https://rdrr.io/r/base/levels.html">levels</a></span><span class="op">(</span><span class="va">gapminder</span><span class="op">$</span><span class="va">country</span><span class="op">)</span> <span class="op">&lt;-</span> <span class="fu"><a href="https://dplyr.tidyverse.org/reference/case_when.html">case_when</a></span><span class="op">(</span></span>
<span> <span class="va">x</span> <span class="op">==</span> <span class="st">"Antigua and Barbuda"</span> <span class="op">~</span> <span class="st">"Barbuda"</span>,</span>
Expand All @@ -1423,13 +1423,13 @@ <h1 class="title">
<span> <span class="fu"><a href="https://ggplot2.tidyverse.org/reference/geom_path.html">geom_line</a></span><span class="op">(</span><span class="op">)</span></span></code><button title="Copy to Clipboard" class="code-copy-button"><i class="bi"></i></button></pre></div>
<div class="cell-output-display">
<div class="quarto-figure quarto-figure-center">
<figure class="figure"><p><img src="string-processing_files/figure-html/unnamed-chunk-86-1.png" class="img-fluid figure-img" style="width:70.0%"></p>
<figure class="figure"><p><img src="string-processing_files/figure-html/country-long-names-1.png" class="img-fluid figure-img" style="width:70.0%"></p>
</figure>
</div>
</div>
</div>
<p>We can instead use the <code>fct_recode</code> function in the <strong>forcats</strong> package:</p>
<div class="cell" data-layout-align="center" data-hash="string-processing_cache/html/unnamed-chunk-87_86ea0d6f187023319d5b43621b533bc8">
<div class="cell" data-layout-align="center" data-hash="string-processing_cache/html/unnamed-chunk-86_b2366976b38d11db1365cce054e740da">
<div class="sourceCode" id="cb87"><pre class="downlit sourceCode r code-with-copy"><code class="sourceCode R"><span><span class="kw"><a href="https://rdrr.io/r/base/library.html">library</a></span><span class="op">(</span><span class="va"><a href="https://forcats.tidyverse.org/">forcats</a></span><span class="op">)</span></span>
<span><span class="va">gapminder</span><span class="op">$</span><span class="va">country</span> <span class="op">&lt;-</span> </span>
<span> <span class="fu"><a href="https://forcats.tidyverse.org/reference/fct_recode.html">fct_recode</a></span><span class="op">(</span><span class="va">gapminder</span><span class="op">$</span><span class="va">country</span>, </span>
Expand All @@ -1442,16 +1442,16 @@ <h1 class="title">
<span class="header-section-number">17.10</span> Exercises</h2>
<p>1. Complete all lessons and exercises in the RegexOne<a href="#fn7" class="footnote-ref" id="fnref7" role="doc-noteref"><sup>7</sup></a> online interactive tutorial.</p>
<p>2. In the <code>extdata</code> directory of the <strong>dslabs</strong> package, you will find a PDF file containing daily mortality data for Puerto Rico from Jan 1, 2015 to May 31, 2018. You can find the file like this:</p>
<div class="cell" data-layout-align="center" data-hash="string-processing_cache/html/unnamed-chunk-88_aa2ab490b8da71f2232286da87359f59">
<div class="cell" data-layout-align="center" data-hash="string-processing_cache/html/unnamed-chunk-87_f5c32ae50e9fe9d3d1578e3793c493f1">
<div class="sourceCode" id="cb88"><pre class="downlit sourceCode r code-with-copy"><code class="sourceCode R"><span><span class="va">fn</span> <span class="op">&lt;-</span> <span class="fu"><a href="https://rdrr.io/r/base/system.file.html">system.file</a></span><span class="op">(</span><span class="st">"extdata"</span>, <span class="st">"RD-Mortality-Report_2015-18-180531.pdf"</span>,</span>
<span> package<span class="op">=</span><span class="st">"dslabs"</span><span class="op">)</span></span></code><button title="Copy to Clipboard" class="code-copy-button"><i class="bi"></i></button></pre></div>
</div>
<p>Find and open the file or open it directly from RStudio. On a Mac, you can type:</p>
<div class="cell" data-layout-align="center" data-hash="string-processing_cache/html/unnamed-chunk-89_ba96a9ff122ae8831ec809b2a9cab27e">
<div class="cell" data-layout-align="center" data-hash="string-processing_cache/html/unnamed-chunk-88_8a7d1d8d80cd08dfdf10520af54bf8ab">
<div class="sourceCode" id="cb89"><pre class="downlit sourceCode r code-with-copy"><code class="sourceCode R"><span><span class="fu"><a href="https://rdrr.io/r/base/system2.html">system2</a></span><span class="op">(</span><span class="st">"open"</span>, args <span class="op">=</span> <span class="va">fn</span><span class="op">)</span></span></code><button title="Copy to Clipboard" class="code-copy-button"><i class="bi"></i></button></pre></div>
</div>
<p>and on Windows, you can type:</p>
<div class="cell" data-layout-align="center" data-hash="string-processing_cache/html/unnamed-chunk-90_f2dc8c3331d6862f8fe25c7687a7cd79">
<div class="cell" data-layout-align="center" data-hash="string-processing_cache/html/unnamed-chunk-89_3dca16b3ef6ed5cb2abdb31258d7cbad">
<div class="sourceCode" id="cb90"><pre class="downlit sourceCode r code-with-copy"><code class="sourceCode R"><span><span class="fu"><a href="https://rdrr.io/r/base/system.html">system</a></span><span class="op">(</span><span class="st">"cmd.exe"</span>, input <span class="op">=</span> <span class="fu"><a href="https://rdrr.io/r/base/paste.html">paste</a></span><span class="op">(</span><span class="st">"start"</span>, <span class="va">fn</span><span class="op">)</span><span class="op">)</span></span></code><button title="Copy to Clipboard" class="code-copy-button"><i class="bi"></i></button></pre></div>
</div>
<p>Which of the following best describes this file:</p>
Expand All @@ -1462,7 +1462,7 @@ <h1 class="title">
<li>It shows graphs of the data. Extracting the data will be difficult.</li>
</ol>
<p>3. We are going to create a tidy dataset with each row representing one observation. The variables in this dataset will be year, month, day, and deaths. Start by installing and loading the <strong>pdftools</strong> package:</p>
<div class="cell" data-layout-align="center" data-hash="string-processing_cache/html/unnamed-chunk-91_1bc997e72a00eeb32fdda7b5cb59ce38">
<div class="cell" data-layout-align="center" data-hash="string-processing_cache/html/unnamed-chunk-90_ae27db42b5f2d018a09d607a15a352d6">
<div class="sourceCode" id="cb91"><pre class="downlit sourceCode r code-with-copy"><code class="sourceCode R"><span><span class="fu"><a href="https://rdrr.io/r/utils/install.packages.html">install.packages</a></span><span class="op">(</span><span class="st">"pdftools"</span><span class="op">)</span></span>
<span><span class="kw"><a href="https://rdrr.io/r/base/library.html">library</a></span><span class="op">(</span><span class="va"><a href="https://docs.ropensci.org/pdftools/">pdftools</a></span><span class="op">)</span></span></code><button title="Copy to Clipboard" class="code-copy-button"><i class="bi"></i></button></pre></div>
</div>
Expand Down
Binary file added docs/wrangling/string-processing_files/figure-html/caribbean-1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/wrangling/string-processing_files/figure-html/country-long-names-1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions wrangling/string-processing.qmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1231,7 +1231,7 @@ gapminder |>

we see that the legend takes up much of the plot because we have four countries with names longer than 12 characters. We can rename these levels using the `case_when` function:

```{r}
```{r country-long-names}
x <- levels(gapminder$country)
levels(gapminder$country) <- case_when(
x == "Antigua and Barbuda" ~ "Barbuda",
Expand All @@ -1243,7 +1243,6 @@ gapminder |>
filter(region == "Caribbean") |>
ggplot(aes(year, life_expectancy, color = country)) +
geom_line()
```

We can instead use the `fct_recode` function in the **forcats** package:
Expand Down

0 comments on commit 2cdcde1

Please sign in to comment.