Skip to content

Commit b7ee9d4

Browse files
Merge branch 'main' into new_course_check_list
2 parents 229a3c5 + 1618bd6 commit b7ee9d4

File tree

119 files changed

+21841
-2674
lines changed

Some content is hidden

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

119 files changed

+21841
-2674
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
.DS_Store
22
.ipynb_checkpoints/
3-
individual_modules/introduction_to_machine_learning/datasets
3+
individual_modules/introduction_to_machine_learning/datasets
4+
_build/

_config.yml

Lines changed: 6 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.
@@ -77,11 +80,14 @@ execute:
7780
- 'individual_modules/introduction_to_julia/arrays_and_matrices.ipynb'
7881
- 'individual_modules/introduction_to_julia/control_flow.ipynb'
7982
- 'individual_modules/introduction_to_julia/functions.ipynb'
83+
- 'individual_modules/introduction_to_julia/implemented_game_of_life.ipynb'
8084
- 'individual_modules/introduction_to_julia/introduction_to_julia.ipynb'
8185
- 'individual_modules/introduction_to_julia/io.ipynb'
86+
- 'individual_modules/introduction_to_julia/multi_file_project.ipynb'
8287
- 'individual_modules/introduction_to_julia/operations.ipynb'
8388
- 'individual_modules/introduction_to_julia/package_management.ipynb'
8489
- 'individual_modules/introduction_to_julia/performant_code.ipynb'
90+
- 'individual_modules/introduction_to_julia/project_game_of_life.ipynb'
8591
- 'individual_modules/introduction_to_julia/variables.ipynb'
8692
- 'individual_modules/introduction_to_julia/visualisation.ipynb'
8793
- 'individual_modules/improve_your_r_code/introduction.ipynb'

_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_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": "#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"}, {"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: Python for Data Analysis"}, {"color": "#FFD700", "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": "#FFD700", "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: 22 additions & 5 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
@@ -114,8 +115,11 @@ parts:
114115
- file: individual_modules/introduction_to_julia/arrays_and_matrices
115116
- file: individual_modules/introduction_to_julia/io
116117
- file: individual_modules/introduction_to_julia/package_management
117-
- file: individual_modules/introduction_to_julia/visualisation
118118
- file: individual_modules/introduction_to_julia/performant_code
119+
- file: individual_modules/introduction_to_julia/project_game_of_life
120+
- file: individual_modules/introduction_to_julia/implemented_game_of_life
121+
- file: individual_modules/introduction_to_julia/visualisation
122+
- file: individual_modules/introduction_to_julia/multi_file_project
119123
- file: course_homepages/python
120124
sections:
121125
- file: individual_modules/section_landing_pages/introduction_to_python
@@ -148,6 +152,15 @@ parts:
148152
- file: individual_modules/introduction_to_machine_learning/2_model_selection
149153
- file: individual_modules/introduction_to_machine_learning/3_pipeline_task
150154
- 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
151164
- file: course_homepages/R
152165
sections:
153166
- file: individual_modules/section_landing_pages/introduction_to_r
@@ -243,10 +256,13 @@ parts:
243256
- file: individual_modules/introduction_to_hpc/exploiting_slurm
244257
- file: individual_modules/section_landing_pages/parallel_computing
245258
sections:
246-
- file: individual_modules/parallel_computing/hello_world
247-
- file: individual_modules/parallel_computing/simple_communication
248-
- file: individual_modules/parallel_computing/collective_comms
249-
- 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_cpu
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
250266
- file: course_homepages/software_development
251267
sections:
252268
- file: individual_modules/section_landing_pages/software_development_best_practice
@@ -300,6 +316,7 @@ parts:
300316

301317
- caption: Join Us!
302318
chapters:
319+
- file: contributing/community
303320
- file: contributing/new_course_checklist_timeline
304321
- file: contributing/contributing
305322
- file: contributing/roles

0 commit comments

Comments
 (0)