-
Notifications
You must be signed in to change notification settings - Fork 56
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Handbook v2.5 en #410
base: master
Are you sure you want to change the base?
Handbook v2.5 en #410
Conversation
…s and grammar issues.
…dated. Should have a discussion on twitter links and non-English learning materials
git status git status @ :
…handbook_eng into handbook_v2.5_en
✅ Deploy Preview for erh-quarto ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
✅ Deploy Preview for euphonious-melomakarona-1c9abb ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
new_pages/basics.qmd
Outdated
@@ -364,7 +360,7 @@ age_pyramid(linelist, "age_cat5", "gender") | |||
**A more complex `age_pyramid()` command might include the *optional* arguments to:** | |||
|
|||
- Show proportions instead of counts (set `proportional = TRUE` when the default is `FALSE`)\ | |||
- Specify the two colors to use (`pal =` is short for "palette" and is supplied with a vector of two color names. See the [objects](#objectstructure) page for how the function `c()` makes a vector) | |||
- Specify the two colors to use (`pal =` is short for "palette" and is supplied with a vector of two color names. See the [objects](https://epirhandbook.com/new_pages/basics.html#objects) page for how the function `c()` makes a vector) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@arranhamlet is there a reason this link was hard-coded to URL instead of to the page's tag?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missed this in my update of file paths. Updated now.
new_pages/basics.qmd
Outdated
@@ -483,7 +480,7 @@ In summary: to use the functions available in an R package, 2 steps must be impl | |||
|
|||
#### Your library {.unnumbered} | |||
|
|||
Your "library" is actually a folder on your computer, containing a folder for each package that has been installed. Find out where R is installed in your computer, and look for a folder called "win-library". For example: `R\win-library\4.0` (the 4.0 is the R version - you'll have a different library for each R version you've downloaded). | |||
Your "library" is actually a folder on your computer, containing a folder for each package that has been installed. Find out where R is installed in your computer, and look for a folder called "win-library". For example: `R\win-library\4.4.1` (the 4.4.1 is the R version - you'll have a different library for each R version you've downloaded). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@arranhamlet can you check if "win-library" is still relevant and change this if necessary? In my R install now, the folder to the library is "R/R-4.4.1/library"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated, the library location has changed.
new_pages/basics.qmd
Outdated
|
||
**Install from Github** | ||
|
||
Sometimes, you need to install a package that is not yet available from CRAN. Or perhaps the package is available on CRAN but you want the *development version* with new features not yet offered in the more stable published CRAN version. These are often hosted on the website [github.com](https://github.com/) in a free, public-facing code "repository". Read more about Github in the handbook page on [Version control and collaboration with Git and Github]. | ||
Sometimes, you need to install a package that is not yet available from CRAN. Or perhaps the package is available on CRAN but you want the *development version* with new features not yet offered in the more stable published CRAN version. These are often hosted on the website [github.com](https://github.com/) in a free, public-facing code "repository". Read more about Github in the handbook page on [Version control and collaboration with Git and Github](https://epirhandbook.com/new_pages/collaboration.html). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can this go directly to the # tag for the page instead of the URL?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@arranhamlet thanks for all this work.
Let's connect to discuss a few parts, and whether you have time for small corrections or not.
new_pages/basics.qmd
Outdated
|
||
**Install from Github** | ||
|
||
Sometimes, you need to install a package that is not yet available from CRAN. Or perhaps the package is available on CRAN but you want the *development version* with new features not yet offered in the more stable published CRAN version. These are often hosted on the website [github.com](https://github.com/) in a free, public-facing code "repository". Read more about Github in the handbook page on [Version control and collaboration with Git and Github]. | ||
Sometimes, you need to install a package that is not yet available from CRAN. Or perhaps the package is available on CRAN but you want the *development version* with new features not yet offered in the more stable published CRAN version. These are often hosted on the website [github.com](https://github.com/) in a free, public-facing code "repository". Read more about Github in the handbook page on [Version control and collaboration with Git and Github](https://epirhandbook.com/new_pages/collaboration.html). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
new_pages/basics.qmd
Outdated
@@ -922,7 +932,7 @@ gen_out_table | |||
|
|||
**Columns** | |||
|
|||
Columns in a dataset are also objects and can be defined, over-written, and created as described below in the section on Columns. | |||
Columns in a dataset are also objects and can be defined, over-written, and created as described below in the section on [Columns](https://epirhandbook.com/new_pages/basics.html#columnsvariables). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@arranhamlet can this also just be the # tag so that if the URL shifts it will still work?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Or like this: dates as I saw done below. Whatever the proper syntax is for quarto
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated
new_pages/characters_strings.qmd
Outdated
* Detect and locate - `str_detect()`, `str_subset()`, `str_match()`, `str_extract()` | ||
* Modify and replace - `str_sub()`, `str_replace_all()` | ||
7. Regular expressions ("regex") | ||
1. Combine, order, split, arrange - `str_c()`, `str_glue()`, `str_order()`, `str_split()`. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@arranhamlet flagging these periods for review
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated
new_pages/characters_strings.qmd
Outdated
1) the character vector(s) | ||
2) start position | ||
3) end position | ||
1) the character vector(s). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Flagging these periods for review
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated
new_pages/characters_strings.qmd
Outdated
2) Meta characters | ||
3) Quantifiers | ||
4) Groups | ||
1) Character sets. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Flagging these periods for review as not complete sentences
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated
|
||
Quarto provides the flexibility and automation that R Markdown pioneered, with a more powerful underlying flexibility that streamlines a lot of the sharing and publishing processes of your work! While R Markdown is tied to R, Quarto documents allow you to use a number of different programming languages such as R, Python, Javascript and Julia. This means that if you are working with people writing in several different coding languages, they can all use the same document to carry out their analysis. | ||
|
||
Even if you are only working in R, Quarto has several advantages. Rather than relying on individual packages to create different outputs, Quarto handles this all internally. To produce a website, PowerPoint slides, or a html report, rather than using external packages, Quarto has this functionality inbuilt. This means you have fewer packages to update, and if one of the packages is no longer maintained, you don't need to change your approach to maintain the same output. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not clear waht other packages would be involvced in Rmd?
Can't Rmd also use chunks of other programming languages? It's just more clunky?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As is my understanding, R Markdown outputs are generated through a number of different packages (i.e. slides through xaringan (https://bookdown.org/yihui/rmarkdown/xaringan.html), isoslides (https://bookdown.org/yihui/rmarkdown/ioslides-presentation.html), revaljs (https://bookdown.org/yihui/rmarkdown/revealjs.html).
Quarto appears to handle this within itself, https://quarto.org/docs/faq/rmarkdown.html.
I had no idea Rmarkdown could use other languages, but yes it appears it can (https://bookdown.org/yihui/rmarkdown/language-engines.html). I'll update this section to mention this.
knitr::include_graphics(here::here("images", "quarto/5_quarto_report.png")) | ||
``` | ||
|
||
## Moving beyond simple reports |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What to do about the issues Chris Jarvis raised about objects in the environment not being found, and issues changing the saving location?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is included in the section ### Limitations of Quarto {.unnumbered}
new_pages/rmarkdown.qmd
Outdated
4) Process data | ||
5) Produce outputs (tables, plots, etc.) | ||
6) Save outputs, if applicable (.csv, .png, etc.) | ||
1) Set global **knitr** options. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
periods need to be reviewed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated
@@ -469,9 +469,16 @@ Now use a column from the above data frame (`facility_order$location_name`) to b | |||
pacman::p_load(forcats) | |||
|
|||
# create factor and define levels manually | |||
numerical_order <- gsub("Facility ","", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file that was edited seems to be not the current one - see how it is in the "old_bookdown folder. Can you bring the edits over to the actual Qmd?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated
@@ -671,7 +671,7 @@ you were working on. | |||
*PULL* - First, click the "Pull" icon (downward arrow) which fetches and | |||
pulls at the same time. | |||
|
|||
*PUSH* - Clicking the green "Pull" icon (upward arrow). You may be asked | |||
*PUSH* - Clicking the green "Push" icon (upward arrow). You may be asked |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file that was edited seems to be not the current one - see how it is in the "old_bookdown folder. Can you bring the edits over to the actual Qmd?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
aran can you get rid of these changes in your branch pls as we have removed old_bookdown from this repo
…handbook_eng into handbook_v2.5_en
…handbook_eng into handbook_v2.5_en
link to list of changes |
new_pages/phylogenetic_trees.qmd
Outdated
@@ -23,17 +23,17 @@ sample_data <- read.csv(here::here("data","phylo", "sample_data_Shigella_tree.cs | |||
|
|||
|
|||
ggtree(tree, layout="circular", branch.length='none') %<+% sample_data + # the %<+% is used to add your dataframe with sample data to the tree |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
so ggtree and treeio arent on cran and chuck an error @arranhamlet
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
seems they need to be installed with {BiocManager} from bioconductor
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I updated the quarto document with this, lines 47-62. Is it still throwing an error?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it did for me until i installed separately
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, it was because they are needed to generate the header image. I've saved this output as a file now rather than re-generating it everytime.
@arranhamlet - any chance you could update the data import bit of |
Updated! |
Clicked the wrong button - sorry! |
Creating the PR to allow easier comparison (e.g. file filter)
I am now reviewing Arran's edits and may edit further as necessary.
Then the plan is to: