Skip to content

Commit 90bdc49

Browse files
actions-useractions-user
committed
differences for PR #669 
1 parent 29cac01 commit 90bdc49

6 files changed

Lines changed: 1408 additions & 5 deletions

File tree

‎.gitignore‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎05-cmdline.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,8 @@ Rscript readings-02.R data/inflammation-01.csv
330330

331331
1. Write a command-line program that does addition and subtraction of two numbers.
332332

333-
**Hint:**
333+
::::::::::::::: hint
334+
334335
Everything argument read from the command-line is interpreted as a character [string](../learners/reference.md#string).
335336
You can convert from a string to a number using the function `as.numeric`.
336337

@@ -352,6 +353,8 @@ Rscript arith.R 3 - 4
352353
-1
353354
```
354355

356+
:::::::::::::::
357+
355358
::::::::::::::: solution
356359

357360

‎config.yaml‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
#------------------------------------------------------------
2+
# Values for this lesson.
3+
#------------------------------------------------------------
4+
5+
# Which carpentry is this (swc, dc, lc, or cp)?
6+
# swc: Software Carpentry
7+
# dc: Data Carpentry
8+
# lc: Library Carpentry
9+
# cp: Carpentries (to use for instructor training for instance)
10+
# incubator: The Carpentries Incubator
11+
carpentry: 'swc'
12+
13+
# Overall title for pages.
14+
title: 'Programming with R'
15+
16+
# Date the lesson was created (YYYY-MM-DD, this is empty by default)
17+
created: '2014-12-18'
18+
19+
# Comma-separated list of keywords for the lesson
20+
keywords: 'software, data, lesson, The Carpentries'
21+
22+
# Life cycle stage of the lesson
23+
# possible values: pre-alpha, alpha, beta, stable
24+
life_cycle: 'stable'
25+
26+
# License of the lesson materials (recommended CC-BY 4.0)
27+
license: 'CC-BY 4.0'
28+
29+
# Link to the source repository for this lesson
30+
source: 'https://github.com/swcarpentry/r-novice-inflammation'
31+
32+
# Default branch of your lesson
33+
branch: 'main'
34+
35+
# Who to contact if there are any issues
36+
contact: 'team@carpentries.org'
37+
38+
# Navigation ------------------------------------------------
39+
#
40+
# Use the following menu items to specify the order of
41+
# individual pages in each dropdown section. Leave blank to
42+
# include all pages in the folder.
43+
#
44+
# Example -------------
45+
#
46+
# episodes:
47+
# - introduction.md
48+
# - first-steps.md
49+
#
50+
# learners:
51+
# - setup.md
52+
#
53+
# instructors:
54+
# - instructor-notes.md
55+
#
56+
# profiles:
57+
# - one-learner.md
58+
# - another-learner.md
59+
60+
# Order of episodes in your lesson
61+
episodes:
62+
- 01-starting-with-data.Rmd
63+
- 02-func-R.Rmd
64+
- 03-loops-R.Rmd
65+
- 04-cond.Rmd
66+
- 05-cmdline.Rmd
67+
- 06-best-practices-R.Rmd
68+
- 07-knitr-R.Rmd
69+
- 08-making-packages-R.Rmd
70+
- 09-supp-intro-rstudio.Rmd
71+
- 10-supp-addressing-data.Rmd
72+
- 11-supp-read-write-csv.Rmd
73+
- 12-supp-factors.Rmd
74+
- 13-supp-data-structures.Rmd
75+
- 14-supp-call-stack.Rmd
76+
- 15-supp-loops-in-depth.Rmd
77+
78+
# Information for Learners
79+
learners:
80+
81+
# Information for Instructors
82+
instructors:
83+
84+
# Learner Profiles
85+
profiles:
86+
87+
# Customisation ---------------------------------------------
88+
#
89+
# This space below is where custom yaml items (e.g. pinning
90+
# sandpaper and varnish versions) should live
91+
92+
93+
url: 'https://swcarpentry.github.io/r-novice-inflammation'
94+
analytics: carpentries
95+
lang: en

‎data/car-speeds-cleaned.csv‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,97 @@
55
"White",34,"Arizona"
66
"Red",25,"Arizona"
77
"Blue",41,"Arizona"
8+
"Blue",34,"NewMexico"
9+
"Black",29,"Colorado"
10+
"White",31,"Arizona"
11+
"Red",26,"Colorado"
12+
"Red",43,"Utah"
13+
"White",26,"Utah"
14+
"Blue",45,"Utah"
15+
"Blue",49,"Utah"
16+
"Black",33,"Utah"
17+
"Red",53,"NewMexico"
18+
"Blue",27,"Arizona"
19+
"Blue",29,"NewMexico"
20+
"White",27,"Arizona"
21+
"Blue",42,"Utah"
22+
"Blue",37,"Utah"
23+
"Blue",42,"Utah"
24+
"Red",48,"NewMexico"
25+
"Blue",26,"Colorado"
26+
"Red",40,"Colorado"
27+
"Red",43,"NewMexico"
28+
"Red",43,"Colorado"
29+
"Red",25,"Utah"
30+
"White",51,"Colorado"
31+
"Blue",48,"Utah"
32+
"Red",54,"NewMexico"
33+
"White",36,"Colorado"
34+
"Black",37,"Colorado"
35+
"Red",38,"Utah"
36+
"Black",33,"Colorado"
37+
"Black",51,"Colorado"
38+
"Blue",28,"NewMexico"
39+
"Red",34,"Arizona"
40+
"Black",54,"Utah"
41+
"Red",47,"Colorado"
42+
"Black",48,"Colorado"
43+
"Black",53,"NewMexico"
44+
"Red",32,"Arizona"
45+
"Red",46,"Utah"
46+
"White",34,"Arizona"
47+
"Black",46,"Colorado"
48+
"Blue",34,"NewMexico"
49+
"Red",43,"NewMexico"
50+
"Red",34,"NewMexico"
51+
"Black",33,"Colorado"
52+
"Black",43,"Arizona"
53+
"Red",41,"Utah"
54+
"White",42,"Utah"
55+
"Red",45,"Arizona"
56+
"Blue",52,"NewMexico"
57+
"Blue",39,"Colorado"
58+
"Black",29,"Utah"
59+
"Blue",27,"Colorado"
60+
"White",30,"Utah"
61+
"Black",31,"Utah"
62+
"Red",29,"Utah"
63+
"Blue",27,"Colorado"
64+
"Blue",50,"NewMexico"
65+
"White",53,"Colorado"
66+
"Black",50,"NewMexico"
67+
"Red",46,"Colorado"
68+
"Red",26,"NewMexico"
69+
"Black",32,"Arizona"
70+
"Blue",54,"NewMexico"
71+
"White",36,"Utah"
72+
"Blue",48,"Utah"
73+
"Red",29,"Colorado"
74+
"White",44,"Arizona"
75+
"White",38,"Utah"
76+
"Blue",49,"Colorado"
77+
"Blue",52,"Colorado"
78+
"Blue",36,"Colorado"
79+
"Blue",45,"Arizona"
80+
"Blue",34,"NewMexico"
81+
"White",31,"Arizona"
82+
"Black",44,"Utah"
83+
"Blue",32,"Colorado"
84+
"White",53,"Colorado"
85+
"Black",34,"Arizona"
86+
"Black",25,"Arizona"
87+
"Red",41,"Arizona"
88+
"Red",43,"Utah"
89+
"White",41,"Arizona"
90+
"White",40,"Utah"
91+
"White",52,"Utah"
92+
"White",44,"Utah"
93+
"Red",34,"Arizona"
94+
"Red",41,"Arizona"
95+
"Red",31,"NewMexico"
96+
"White",25,"Colorado"
97+
"Black",46,"Colorado"
98+
"White",34,"Utah"
99+
"Black",25,"NewMexico"
100+
"Black",32,"Arizona"
101+
"White",42,"Utah"

‎md5sum.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"episodes/02-func-R.Rmd" "32232c310f0fc718c19b87381762f71d" "site/built/02-func-R.md" "2025-08-04"
88
"episodes/03-loops-R.Rmd" "2bb07eee54f52ae7c649aa03cd1ce381" "site/built/03-loops-R.md" "2025-08-04"
99
"episodes/04-cond.Rmd" "8d2ee7105dd93167586f62a00a5da073" "site/built/04-cond.md" "2025-08-04"
10-
"episodes/05-cmdline.Rmd" "4180bab56729ef1e05b422559b502e8a" "site/built/05-cmdline.md" "2025-08-04"
10+
"episodes/05-cmdline.Rmd" "187605df6495ee2abdbd69dbb9e3d189" "site/built/05-cmdline.md" "2025-08-04"
1111
"episodes/06-best-practices-R.Rmd" "650eedd1f474edadf46d47eaef946fb9" "site/built/06-best-practices-R.md" "2025-08-04"
1212
"episodes/07-knitr-R.Rmd" "860a016fd907c4cf32e1b5f4177af203" "site/built/07-knitr-R.md" "2025-08-04"
1313
"episodes/08-making-packages-R.Rmd" "61ca36d1012293fc370718db1781e80c" "site/built/08-making-packages-R.md" "2025-08-04"
@@ -23,4 +23,4 @@
2323
"learners/reference.md" "a290441c6e04883b663820ee64c03813" "site/built/reference.md" "2025-08-04"
2424
"learners/setup.md" "90f05c6c3417b323c692fe5d4e6f7d44" "site/built/setup.md" "2025-08-04"
2525
"profiles/learner-profiles.md" "7948587d1c7af4f170ad6995adf6dcbc" "site/built/learner-profiles.md" "2025-08-04"
26-
"renv/profiles/lesson-requirements/renv.lock" "2bf167ef4346ae6534f2c0059b23f695" "site/built/renv.lock" "2025-08-04"
26+
"renv/profiles/lesson-requirements/renv.lock" "99046b4ec28fca74953dc21bc173b020" "site/built/renv.lock" "2025-08-04"

0 commit comments

Comments
 (0)