Skip to content

Commit 819d80d

Browse files
Merge branch 'main' into julia_session_3
2 parents be3e6c2 + 80fbda1 commit 819d80d

File tree

122 files changed

+12437
-696
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+12437
-696
lines changed

_config.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ exclude_patterns:
4040
- README.md
4141
- individual_modules/python_for_data_analysis/data-analysis-task-solutions.ipynb
4242

43+
parse:
44+
myst_enable_extensions: # default extensions to enable in the myst parser. See https://myst
45+
- strikethrough
4346

4447
# Execute all notebooks by default.
4548
# The R notebooks are excluded from running during the building of the book due to the formatting issues. When ran wen building the output for each of the cells will create a new code block for each space due to the R magic command.
@@ -94,3 +97,11 @@ execute:
9497
- 'individual_modules/improve_your_r_code/data_table.ipynb'
9598
- 'individual_modules/improve_your_r_code/parallelisation.ipynb'
9699
- 'individual_modules/improve_your_r_code/rcpp.ipynb'
100+
- 'individual_modules/Introduction_to_Markdown_in_R/Background_to_Markdown.md'
101+
- 'individual_modules/Introduction_to_Markdown_in_R/Course_Outro.md'
102+
- 'individual_modules/Introduction_to_Markdown_in_R/Getting_Started_with_Markdown_in_R.md'
103+
- 'individual_modules/Introduction_to_Markdown_in_R/Processing_RMarkdown_Files.md'
104+
- 'individual_modules/Introduction_to_Markdown_in_R/RMarkdown_Components_Embedded_Code.md'
105+
- 'individual_modules/Introduction_to_Markdown_in_R/RMarkdown_Components_Formatted_Text.md'
106+
- 'individual_modules/Introduction_to_Markdown_in_R/RMarkdown_Components_Visual_Prelude.md'
107+
- 'individual_modules/Introduction_to_Markdown_in_R/RMarkdown_Components_YAML_Header.md'

_static/multiple_regression_hyperplane.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

_static/multiple_regression_hyperplane_2.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

_static/workshops_network_hpc.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ <h1></h1>
282282

283283

284284
// parsing and collecting nodes and edges from the python
285-
nodes = new vis.DataSet([{"color": "#FFD700", "id": "Introduction to HPC", "label": "Introduction to HPC", "level": 2, "shape": "dot", "size": 10, "title": "Course Name: Introduction to HPC\nCourse Pre-reqs: Introduction to Unix\nSubsequent Courses: Parallel Computing"}, {"color": "#FFD700", "id": "Parallel Computing", "label": "Parallel Computing", "level": 3, "shape": "dot", "size": 10, "title": "Course Name: Parallel Computing\nCourse Pre-reqs: Introduction to HPC\nSubsequent Courses: None"}, {"color": "#FFD700", "id": "Introduction to Unix", "label": "Introduction to Unix", "level": 1, "shape": "dot", "size": 10, "title": "Course Name: Introduction to Unix\nCourse Pre-reqs: None\nSubsequent Courses: Introduction to HPC, Introduction to Version Control with Git and GitHub"}, {"color": "#FFD700", "id": "Introduction to Version Control with Git and GitHub", "label": "Introduction to Version Control with Git and GitHub", "level": 2, "shape": "dot", "size": 10, "title": "Course Name: Introduction to Version Control with Git and GitHub\nCourse Pre-reqs: Introduction to Unix\nSubsequent Courses: Intermediate Version Control"}, {"color": "#FFD700", "id": "Intermediate Version Control", "label": "Intermediate Version Control", "level": 3, "shape": "dot", "size": 10, "title": "Course Name: Intermediate Version Control\nCourse Pre-reqs: Introduction to Version Control with Git and GitHub\nSubsequent Courses: None"}, {"color": "#FFD700", "id": "Introduction to Python", "label": "Introduction to Python", "level": 1, "shape": "dot", "size": 10, "title": "Course Name: Introduction to Python\nCourse Pre-reqs: None\nSubsequent Courses: None"}]);
285+
nodes = new vis.DataSet([{"color": "#4682B4", "id": "Introduction to HPC", "label": "Introduction to HPC", "level": 2, "shape": "dot", "size": 10, "title": "Course Name: Introduction to HPC\nCourse Pre-reqs: Introduction to Unix\nSubsequent Courses: Parallel Computing"}, {"color": "#4682B4", "id": "Parallel Computing", "label": "Parallel Computing", "level": 3, "shape": "dot", "size": 10, "title": "Course Name: Parallel Computing\nCourse Pre-reqs: Introduction to HPC\nSubsequent Courses: None"}, {"color": "#4682B4", "id": "Introduction to Unix", "label": "Introduction to Unix", "level": 1, "shape": "dot", "size": 10, "title": "Course Name: Introduction to Unix\nCourse Pre-reqs: None\nSubsequent Courses: Introduction to HPC, Introduction to Version Control with Git and GitHub"}, {"color": "#4682B4", "id": "Introduction to Version Control with Git and GitHub", "label": "Introduction to Version Control with Git and GitHub", "level": 2, "shape": "dot", "size": 10, "title": "Course Name: Introduction to Version Control with Git and GitHub\nCourse Pre-reqs: Introduction to Unix\nSubsequent Courses: Intermediate Version Control"}, {"color": "#4682B4", "id": "Intermediate Version Control", "label": "Intermediate Version Control", "level": 3, "shape": "dot", "size": 10, "title": "Course Name: Intermediate Version Control\nCourse Pre-reqs: Introduction to Version Control with Git and GitHub\nSubsequent Courses: None"}, {"color": "#4682B4", "id": "Introduction to Python", "label": "Introduction to Python", "level": 1, "shape": "dot", "size": 10, "title": "Course Name: Introduction to Python\nCourse Pre-reqs: None\nSubsequent Courses: None"}]);
286286
edges = new vis.DataSet([{"arrows": "to", "from": "Introduction to HPC", "to": "Parallel Computing", "width": 1}, {"arrows": "to", "from": "Introduction to Unix", "to": "Introduction to HPC", "width": 1}, {"arrows": "to", "from": "Introduction to Unix", "to": "Introduction to Version Control with Git and GitHub", "width": 1}, {"arrows": "to", "from": "Introduction to Version Control with Git and GitHub", "to": "Intermediate Version Control", "width": 1}]);
287287

288288
nodeColors = {};

_static/workshops_network_python_ds.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ <h1></h1>
282282

283283

284284
// parsing and collecting nodes and edges from the python
285-
nodes = new vis.DataSet([{"color": "#4682B4", "id": "Introduction to Version Control with Git and GitHub", "label": "Introduction to Version Control with Git and GitHub", "level": 2, "shape": "dot", "size": 10, "title": "Course Name: Introduction to Version Control with Git and GitHub\nCourse Pre-reqs: Introduction to Unix\nSubsequent Courses: Intermediate Version Control"}, {"color": "#4682B4", "id": "Intermediate Version Control", "label": "Intermediate Version Control", "level": 3, "shape": "dot", "size": 10, "title": "Course Name: Intermediate Version Control\nCourse Pre-reqs: Introduction to Version Control with Git and GitHub\nSubsequent Courses: None"}, {"color": "#4682B4", "id": "Introduction to Unix", "label": "Introduction to Unix", "level": 1, "shape": "dot", "size": 10, "title": "Course Name: Introduction to Unix\nCourse Pre-reqs: None\nSubsequent Courses: Introduction to Version Control with Git and GitHub"}, {"color": "#4682B4", "id": "Introduction to Python", "label": "Introduction to Python", "level": 1, "shape": "dot", "size": 10, "title": "Course Name: Introduction to Python\nCourse Pre-reqs: None\nSubsequent Courses: Python for Data Analysis"}, {"color": "#4682B4", "id": "Python for Data Analysis", "label": "Python for Data Analysis", "level": 2, "shape": "dot", "size": 10, "title": "Course Name: Python for Data Analysis\nCourse Pre-reqs: Introduction to Python\nSubsequent Courses: Introduction to Machine Learning"}, {"color": "#4682B4", "id": "Introduction to Machine Learning", "label": "Introduction to Machine Learning", "level": 3, "shape": "dot", "size": 10, "title": "Course Name: Introduction to Machine Learning\nCourse Pre-reqs: Python for Data Analysis\nSubsequent Courses: None"}]);
285+
nodes = new vis.DataSet([{"color": "#FF6347", "id": "Introduction to Version Control with Git and GitHub", "label": "Introduction to Version Control with Git and GitHub", "level": 2, "shape": "dot", "size": 10, "title": "Course Name: Introduction to Version Control with Git and GitHub\nCourse Pre-reqs: Introduction to Unix\nSubsequent Courses: Intermediate Version Control"}, {"color": "#FF6347", "id": "Intermediate Version Control", "label": "Intermediate Version Control", "level": 3, "shape": "dot", "size": 10, "title": "Course Name: Intermediate Version Control\nCourse Pre-reqs: Introduction to Version Control with Git and GitHub\nSubsequent Courses: None"}, {"color": "#FF6347", "id": "Introduction to Unix", "label": "Introduction to Unix", "level": 1, "shape": "dot", "size": 10, "title": "Course Name: Introduction to Unix\nCourse Pre-reqs: None\nSubsequent Courses: Introduction to Version Control with Git and GitHub"}, {"color": "#FF6347", "id": "Introduction to Python", "label": "Introduction to Python", "level": 1, "shape": "dot", "size": 10, "title": "Course Name: Introduction to Python\nCourse Pre-reqs: None\nSubsequent Courses: Python for Data Analysis"}, {"color": "#FF6347", "id": "Python for Data Analysis", "label": "Python for Data Analysis", "level": 2, "shape": "dot", "size": 10, "title": "Course Name: Python for Data Analysis\nCourse Pre-reqs: Introduction to Python\nSubsequent Courses: Introduction to Machine Learning"}, {"color": "#FF6347", "id": "Introduction to Machine Learning", "label": "Introduction to Machine Learning", "level": 3, "shape": "dot", "size": 10, "title": "Course Name: Introduction to Machine Learning\nCourse Pre-reqs: Python for Data Analysis\nSubsequent Courses: None"}]);
286286
edges = new vis.DataSet([{"arrows": "to", "from": "Introduction to Version Control with Git and GitHub", "to": "Intermediate Version Control", "width": 1}, {"arrows": "to", "from": "Introduction to Unix", "to": "Introduction to Version Control with Git and GitHub", "width": 1}, {"arrows": "to", "from": "Introduction to Python", "to": "Python for Data Analysis", "width": 1}, {"arrows": "to", "from": "Python for Data Analysis", "to": "Introduction to Machine Learning", "width": 1}]);
287287

288288
nodeColors = {};

_static/workshops_network_r_ds.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ <h1></h1>
282282

283283

284284
// parsing and collecting nodes and edges from the python
285-
nodes = new vis.DataSet([{"color": "#FF6347", "id": "Introduction to R", "label": "Introduction to R", "level": 1, "shape": "dot", "size": 10, "title": "Course Name: Introduction to R\nCourse Pre-reqs: None\nSubsequent Courses: Regression analysis with R, Working With Data In R"}, {"color": "#FF6347", "id": "Regression analysis with R", "label": "Regression analysis with R", "level": 2, "shape": "dot", "size": 10, "title": "Course Name: Regression analysis with R\nCourse Pre-reqs: Introduction to R\nSubsequent Courses: Advanced Regression Analysis With R "}, {"color": "#FF6347", "id": "Working With Data In R", "label": "Working With Data In R", "level": 2, "shape": "dot", "size": 10, "title": "Course Name: Working With Data In R\nCourse Pre-reqs: Introduction to R\nSubsequent Courses: None"}, {"color": "#FF6347", "id": "Advanced Regression Analysis With R ", "label": "Advanced Regression Analysis With R ", "level": 3, "shape": "dot", "size": 10, "title": "Course Name: Advanced Regression Analysis With R \nCourse Pre-reqs: Regression analysis with R\nSubsequent Courses: None"}, {"color": "#FF6347", "id": "Introduction to Version Control with Git and GitHub", "label": "Introduction to Version Control with Git and GitHub", "level": 2, "shape": "dot", "size": 10, "title": "Course Name: Introduction to Version Control with Git and GitHub\nCourse Pre-reqs: Introduction to Unix\nSubsequent Courses: Intermediate Version Control"}, {"color": "#FF6347", "id": "Intermediate Version Control", "label": "Intermediate Version Control", "level": 3, "shape": "dot", "size": 10, "title": "Course Name: Intermediate Version Control\nCourse Pre-reqs: Introduction to Version Control with Git and GitHub\nSubsequent Courses: None"}, {"color": "#FF6347", "id": "Introduction to Unix", "label": "Introduction to Unix", "level": 1, "shape": "dot", "size": 10, "title": "Course Name: Introduction to Unix\nCourse Pre-reqs: None\nSubsequent Courses: Introduction to Version Control with Git and GitHub"}]);
285+
nodes = new vis.DataSet([{"color": "#FFD700", "id": "Introduction to R", "label": "Introduction to R", "level": 1, "shape": "dot", "size": 10, "title": "Course Name: Introduction to R\nCourse Pre-reqs: None\nSubsequent Courses: Regression analysis with R, Working With Data In R"}, {"color": "#FFD700", "id": "Regression analysis with R", "label": "Regression analysis with R", "level": 2, "shape": "dot", "size": 10, "title": "Course Name: Regression analysis with R\nCourse Pre-reqs: Introduction to R\nSubsequent Courses: Advanced Regression Analysis With R "}, {"color": "#FFD700", "id": "Working With Data In R", "label": "Working With Data In R", "level": 2, "shape": "dot", "size": 10, "title": "Course Name: Working With Data In R\nCourse Pre-reqs: Introduction to R\nSubsequent Courses: None"}, {"color": "#FFD700", "id": "Advanced Regression Analysis With R ", "label": "Advanced Regression Analysis With R ", "level": 3, "shape": "dot", "size": 10, "title": "Course Name: Advanced Regression Analysis With R \nCourse Pre-reqs: Regression analysis with R\nSubsequent Courses: None"}, {"color": "#FFD700", "id": "Introduction to Version Control with Git and GitHub", "label": "Introduction to Version Control with Git and GitHub", "level": 2, "shape": "dot", "size": 10, "title": "Course Name: Introduction to Version Control with Git and GitHub\nCourse Pre-reqs: Introduction to Unix\nSubsequent Courses: Intermediate Version Control"}, {"color": "#FFD700", "id": "Intermediate Version Control", "label": "Intermediate Version Control", "level": 3, "shape": "dot", "size": 10, "title": "Course Name: Intermediate Version Control\nCourse Pre-reqs: Introduction to Version Control with Git and GitHub\nSubsequent Courses: None"}, {"color": "#FFD700", "id": "Introduction to Unix", "label": "Introduction to Unix", "level": 1, "shape": "dot", "size": 10, "title": "Course Name: Introduction to Unix\nCourse Pre-reqs: None\nSubsequent Courses: Introduction to Version Control with Git and GitHub"}]);
286286
edges = new vis.DataSet([{"arrows": "to", "from": "Introduction to R", "to": "Regression analysis with R", "width": 1}, {"arrows": "to", "from": "Introduction to R", "to": "Working With Data In R", "width": 1}, {"arrows": "to", "from": "Regression analysis with R", "to": "Advanced Regression Analysis With R ", "width": 1}, {"arrows": "to", "from": "Introduction to Version Control with Git and GitHub", "to": "Intermediate Version Control", "width": 1}, {"arrows": "to", "from": "Introduction to Unix", "to": "Introduction to Version Control with Git and GitHub", "width": 1}]);
287287

288288
nodeColors = {};

_toc.yml

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ parts:
2424
- file: programme_information/intro_to_python
2525
- file: programme_information/python_for_data_analysis
2626
- file: programme_information/introduction_to_machine_learning
27+
- file: programme_information/markdown_with_python
2728
- file: programme_information/R
2829
sections:
2930
- file: programme_information/intro_to_r
@@ -32,6 +33,7 @@ parts:
3233
- file: programme_information/advanced_regression_analysis_with_r
3334
- file: programme_information/working_with_data_in_r
3435
- file: programme_information/improve_your_r_code
36+
- file: programme_information/Introduction_to_Markdown_in_R
3537
- file: programme_information/unix
3638
sections:
3739
- file: programme_information/intro_to_unix
@@ -150,6 +152,15 @@ parts:
150152
- file: individual_modules/introduction_to_machine_learning/2_model_selection
151153
- file: individual_modules/introduction_to_machine_learning/3_pipeline_task
152154
- file: individual_modules/introduction_to_machine_learning/4_unsupervised_learning
155+
- file: individual_modules/section_landing_pages/markdown_with_python
156+
sections:
157+
- file: individual_modules/markdown_with_python/2-Motivation-and-Background
158+
- file: individual_modules/markdown_with_python/3-Markdown-Fundamentals
159+
- file: individual_modules/markdown_with_python/4-Markdown-Task-1
160+
- file: individual_modules/markdown_with_python/5-How-to-embed-Python-Code-in-Markdown
161+
- file: individual_modules/markdown_with_python/6-Export-the-Document
162+
- file: individual_modules/markdown_with_python/7-Markdown-Task-2
163+
- file: individual_modules/markdown_with_python/8-Further-Knowledge
153164
- file: course_homepages/R
154165
sections:
155166
- file: individual_modules/section_landing_pages/introduction_to_r
@@ -196,6 +207,16 @@ parts:
196207
- file: individual_modules/improve_your_r_code/data_table
197208
- file: individual_modules/improve_your_r_code/parallelisation
198209
- file: individual_modules/improve_your_r_code/rcpp
210+
- file: individual_modules/section_landing_pages/Introduction_to_Markdown_in_R
211+
sections:
212+
- file: individual_modules/Introduction_to_Markdown_in_R/Background_to_Markdown
213+
- file: individual_modules/Introduction_to_Markdown_in_R/Getting_Started_with_Markdown_in_R
214+
- file: individual_modules/Introduction_to_Markdown_in_R/RMarkdown_Components_Visual_Prelude
215+
- file: individual_modules/Introduction_to_Markdown_in_R/RMarkdown_Components_YAML_Header
216+
- file: individual_modules/Introduction_to_Markdown_in_R/RMarkdown_Components_Formatted_Text
217+
- file: individual_modules/Introduction_to_Markdown_in_R/RMarkdown_Components_Embedded_Code
218+
- file: individual_modules/Introduction_to_Markdown_in_R/Processing_RMarkdown_Files
219+
- file: individual_modules/Introduction_to_Markdown_in_R/Course_Outro
199220
- file: course_homepages/unix
200221
sections:
201222
- file: individual_modules/section_landing_pages/introduction_to_unix
@@ -235,10 +256,13 @@ parts:
235256
- file: individual_modules/introduction_to_hpc/exploiting_slurm
236257
- file: individual_modules/section_landing_pages/parallel_computing
237258
sections:
238-
- file: individual_modules/parallel_computing/hello_world
239-
- file: individual_modules/parallel_computing/simple_communication
240-
- file: individual_modules/parallel_computing/collective_comms
241-
- file: individual_modules/parallel_computing/parallel_fractal
259+
- file: individual_modules/parallel_computing/architecture_and_concurrency
260+
- file: individual_modules/parallel_computing/multithreading_io
261+
- file: individual_modules/parallel_computing/multiprocessing_fractal
262+
- file: individual_modules/parallel_computing/mpi_hello_world
263+
- file: individual_modules/parallel_computing/mpi_simple_communication
264+
- file: individual_modules/parallel_computing/mpi_collective_comms
265+
- file: individual_modules/parallel_computing/mpi_parallel_fractal
242266
- file: course_homepages/software_development
243267
sections:
244268
- file: individual_modules/section_landing_pages/software_development_best_practice
@@ -292,6 +316,7 @@ parts:
292316

293317
- caption: Join Us!
294318
chapters:
319+
- file: contributing/community
295320
- file: contributing/contributing
296321
- file: contributing/roles
297322
- file: contributing/contributing_guidelines

0 commit comments

Comments
 (0)