differences for PR #618

02-func-R.md

@@ -48,6 +48,8 @@ The list of argument names are contained within parentheses.
 Next, the [body](../learners/reference.md#function-body) of the function--the statements that are executed when it runs--is contained within curly braces (`{}`).
 The statements in the body are indented by two spaces, which makes the code easier to read but does not affect how the code operates.
 
+![Vocabulary associated with functions.](fig/function-terminology.svg){alt="A screenshot of the function `fahrenheit_to_celsius` defined above with some extra text annotations on specific function elements. Above the text `fahrenheit_to_celsisus`, the text reads 'Function name'. Above the text `temp_F`, the text reads 'Function argument(s)'.' The next two lines, surrounded by curly braces, are labelled 'Function body'."}
+
 When we call the function, the values we pass to it are assigned to those variables so that we can use them inside the function.
 Inside the function, we use a [return statement](../learners/reference.md#return-statement) to send a result back to whoever asked for it.
 

config.yaml

@@ -0,0 +1,95 @@
+#------------------------------------------------------------
+# Values for this lesson.
+#------------------------------------------------------------
+
+# Which carpentry is this (swc, dc, lc, or cp)?
+# swc: Software Carpentry
+# dc: Data Carpentry
+# lc: Library Carpentry
+# cp: Carpentries (to use for instructor training for instance)
+# incubator: The Carpentries Incubator
+carpentry: 'swc'
+
+# Overall title for pages.
+title: 'Programming with R'
+
+# Date the lesson was created (YYYY-MM-DD, this is empty by default)
+created: '2014-12-18'
+
+# Comma-separated list of keywords for the lesson
+keywords: 'software, data, lesson, The Carpentries'
+
+# Life cycle stage of the lesson
+# possible values: pre-alpha, alpha, beta, stable
+life_cycle: 'stable'
+
+# License of the lesson materials (recommended CC-BY 4.0)
+license: 'CC-BY 4.0'
+
+# Link to the source repository for this lesson
+source: 'https://github.com/swcarpentry/r-novice-inflammation'
+
+# Default branch of your lesson
+branch: 'main'
+
+# Who to contact if there are any issues
+contact: 'team@carpentries.org'
+
+# Navigation ------------------------------------------------
+#
+# Use the following menu items to specify the order of
+# individual pages in each dropdown section. Leave blank to
+# include all pages in the folder.
+#
+# Example -------------
+#
+# episodes:
+# - introduction.md
+# - first-steps.md
+#
+# learners:
+# - setup.md
+#
+# instructors:
+# - instructor-notes.md
+#
+# profiles:
+# - one-learner.md
+# - another-learner.md
+
+# Order of episodes in your lesson
+episodes: 
+- 01-starting-with-data.Rmd
+- 02-func-R.Rmd
+- 03-loops-R.Rmd
+- 04-cond.Rmd
+- 05-cmdline.Rmd
+- 06-best-practices-R.Rmd
+- 07-knitr-R.Rmd
+- 08-making-packages-R.Rmd
+- 09-supp-intro-rstudio.Rmd
+- 10-supp-addressing-data.Rmd
+- 11-supp-read-write-csv.Rmd
+- 12-supp-factors.Rmd
+- 13-supp-data-structures.Rmd
+- 14-supp-call-stack.Rmd
+- 15-supp-loops-in-depth.Rmd
+
+# Information for Learners
+learners: 
+
+# Information for Instructors
+instructors: 
+
+# Learner Profiles
+profiles: 
+
+# Customisation ---------------------------------------------
+#
+# This space below is where custom yaml items (e.g. pinning
+# sandpaper and varnish versions) should live
+
+
+url: 'https://swcarpentry.github.io/r-novice-inflammation'
+analytics: carpentries
+lang: en

data/car-speeds-cleaned.csv

@@ -5,3 +5,97 @@
 "White",34,"Arizona"
 "Red",25,"Arizona"
 "Blue",41,"Arizona"
+"Blue",34,"NewMexico"
+"Black",29,"Colorado"
+"White",31,"Arizona"
+"Red",26,"Colorado"
+"Red",43,"Utah"
+"White",26,"Utah"
+"Blue",45,"Utah"
+"Blue",49,"Utah"
+"Black",33,"Utah"
+"Red",53,"NewMexico"
+"Blue",27,"Arizona"
+"Blue",29,"NewMexico"
+"White",27,"Arizona"
+"Blue",42,"Utah"
+"Blue",37,"Utah"
+"Blue",42,"Utah"
+"Red",48,"NewMexico"
+"Blue",26,"Colorado"
+"Red",40,"Colorado"
+"Red",43,"NewMexico"
+"Red",43,"Colorado"
+"Red",25,"Utah"
+"White",51,"Colorado"
+"Blue",48,"Utah"
+"Red",54,"NewMexico"
+"White",36,"Colorado"
+"Black",37,"Colorado"
+"Red",38,"Utah"
+"Black",33,"Colorado"
+"Black",51,"Colorado"
+"Blue",28,"NewMexico"
+"Red",34,"Arizona"
+"Black",54,"Utah"
+"Red",47,"Colorado"
+"Black",48,"Colorado"
+"Black",53,"NewMexico"
+"Red",32,"Arizona"
+"Red",46,"Utah"
+"White",34,"Arizona"
+"Black",46,"Colorado"
+"Blue",34,"NewMexico"
+"Red",43,"NewMexico"
+"Red",34,"NewMexico"
+"Black",33,"Colorado"
+"Black",43,"Arizona"
+"Red",41,"Utah"
+"White",42,"Utah"
+"Red",45,"Arizona"
+"Blue",52,"NewMexico"
+"Blue",39,"Colorado"
+"Black",29,"Utah"
+"Blue",27,"Colorado"
+"White",30,"Utah"
+"Black",31,"Utah"
+"Red",29,"Utah"
+"Blue",27,"Colorado"
+"Blue",50,"NewMexico"
+"White",53,"Colorado"
+"Black",50,"NewMexico"
+"Red",46,"Colorado"
+"Red",26,"NewMexico"
+"Black",32,"Arizona"
+"Blue",54,"NewMexico"
+"White",36,"Utah"
+"Blue",48,"Utah"
+"Red",29,"Colorado"
+"White",44,"Arizona"
+"White",38,"Utah"
+"Blue",49,"Colorado"
+"Blue",52,"Colorado"
+"Blue",36,"Colorado"
+"Blue",45,"Arizona"
+"Blue",34,"NewMexico"
+"White",31,"Arizona"
+"Black",44,"Utah"
+"Blue",32,"Colorado"
+"White",53,"Colorado"
+"Black",34,"Arizona"
+"Black",25,"Arizona"
+"Red",41,"Arizona"
+"Red",43,"Utah"
+"White",41,"Arizona"
+"White",40,"Utah"
+"White",52,"Utah"
+"White",44,"Utah"
+"Red",34,"Arizona"
+"Red",41,"Arizona"
+"Red",31,"NewMexico"
+"White",25,"Colorado"
+"Black",46,"Colorado"
+"White",34,"Utah"
+"Black",25,"NewMexico"
+"Black",32,"Arizona"
+"White",42,"Utah"

md5sum.txt

@@ -4,7 +4,7 @@
 "config.yaml" "c198bba3496d5a77c7b4ab59e81194f8" "site/built/config.yaml" "2024-04-02"
 "index.md" "df0cbbfded289fe4a899db2c1655b342" "site/built/index.md" "2024-04-02"
 "episodes/01-starting-with-data.Rmd" "32ebb9a53c8fac58d58a31ea346748cd" "site/built/01-starting-with-data.md" "2024-04-02"
-"episodes/02-func-R.Rmd" "dfd6013d11abc9d57030e3cc65153297" "site/built/02-func-R.md" "2024-04-02"
+"episodes/02-func-R.Rmd" "25f5fc590f8e88e5392f1ee13b182a48" "site/built/02-func-R.md" "2024-04-07"
 "episodes/03-loops-R.Rmd" "5f4c204ffd96681509368665a212e66e" "site/built/03-loops-R.md" "2024-04-02"
 "episodes/04-cond.Rmd" "6c75b64cafdd5473d6dff10b45c123b1" "site/built/04-cond.md" "2024-04-02"
 "episodes/05-cmdline.Rmd" "cfcc57d0b46dfab9eb97670ed6e1aeaa" "site/built/05-cmdline.md" "2024-04-02"