deploy: 2dc3af3

UBC-CS · Feb 11, 2025 · 9ba735e · 9ba735e
1 parent 9461f01
commit 9ba735e
Show file tree

Hide file tree

Showing 62 changed files with 289 additions and 316 deletions.
diff --git a/_sources/notes/week05/class5B.md b/_sources/notes/week05/class5B.md
@@ -1,17 +1,20 @@
 # Class Meeting 5B
 
-Below are the slides from today's class embedded.
-Feel free to download them to keep them locally, or leave them archived here and just bookmark them.
-We will leave the website open even after the course is over for a reasonable number of years.
+There were no slides for today's lecture.  
+
+In [Class Activity 5B](https://us.prairielearn.com/pl/course_instance/172874/assessment/2495518), we converted the Hot-100 data into a suitable form (a list of dictionaries) for it to be loaded it into Pandas, and then we explored various manipulations we can perform using Pandas powerful (if sometimes obscure) overloading of the `[]` (square brackets) operator.  We also touched briefly on Python's [formatted string literals](https://docs.python.org/3/tutorial/inputoutput.html#tut-f-strings) (also commonly called "f-strings").
 
 <div>
-<iframe src="../../Lec10_Plotting_DataFrames.pdf" width="100%" height="600px" frameBorder="0"> </iframe>
+<iframe src="../../LecNoSlides.pdf" width="100%" height="600px" frameBorder="0"> </iframe>
 </div>
 
+<!-- 
 [Download the Slides from today](https://github.com/ubc-cs/cpsc203/raw/main/files/Lec10_Plotting_DataFrames.pdf)
+-->
 
 ## Links for today
 - [LOTS More on Pandas](https://firas.moosvi.com/courses/data301/2022_WT2/notes/week05/Class5A/Class5A.html) (courtesy of Dr. Moosvi's former DATA 301 course at UBC-O).
+- An [f-string tutorial](https://www.datacamp.com/tutorial/python-f-string) if you want to use some of the more powerful features.
 
 <!--
 ## Important links for today:
@@ -20,7 +23,3 @@ We will leave the website open even after the course is over for a reasonable nu
 - [PrairieLearn](https://canvas.ubc.ca/courses/130127/external_tools/48751)
 - [Markdown Tutorial](https://commonmark.org/help/tutorial/)
 -->
-
-## Acknowledgements
-
-Slides for {{ COURSE_CODE }} were developed and created by [Dr. Cinda Heeren](https://www.cs.ubc.ca/people/cinda-heeren). The current iteration of the course resulted in minor adaptations and updates, but by in large, full credit of these slides belongs to Dr. Cinda Heeren.
diff --git a/_sources/notes/week06/class6A.md b/_sources/notes/week06/class6A.md
@@ -1,92 +1,9 @@
 # Class Meeting 6A
 
-Below are the slides from today's class embedded.
-Feel free to download them to keep them locally, or leave them archived here and just bookmark them.
-We will leave the website open even after the course is over for a reasonable number of years.
+There were no slides for today's lecture.  
 
-Today in class we will be doing a few demos of practical uses of git and version control.
-For a good experience, you should come to class with your group mates, and sit close together.
+We continued our exploration of Pandas in [Class Activity 5B](https://us.prairielearn.com/pl/course_instance/172874/assessment/2495518).
 
 <div>
-<iframe src="../../Lec11_Git_VersionControl.pdf" width="100%" height="600px" frameBorder="0"> </iframe>
+<iframe src="../../LecNoSlides.pdf" width="100%" height="600px" frameBorder="0"> </iframe>
 </div>
-
-[Download the Slides from today](https://github.com/ubc-cs/cpsc203/raw/main/files/Lec11_Git_VersionControl.pdf)
-
-
-## Version Control with Git
-
-<img src="images/git.jpeg" width=30%>
-
-- Why git? (3 mins)
-- The GitHub flow (5 mins)
-- Introduction to Branches and Pull Requests (10 mins)
-- Guided Activity 1: Intro to Git and GitHub (25 mins)
-- Guided Activity 2: Code Reviews (10 mins)
-- Git Summary and Review (15 mins)
-
-### Why Git
-
-<img src="http://www.phdcomics.com/comics/archive/phd101212s.gif">
-
-### What is Git?
-
-<img src="https://www.nobledesktop.com/image/blog/git-branches-merge.png">
-
-Image Source: [Noble Desktop](https://www.nobledesktop.com/blog/what-is-git-and-why-should-you-use-it).
-
-## Learn Git Branching
-
-<img src="images/learn_git_branching.png">
-
-## Request for Volunteers !
-
-- You don't need to have any prior experience, nor do you have to be a computer pro.
-- Probably will just ask you to share your screen and follow directions.
-- I'll walk you through what you have to type and click and hopefully it's illustrative what needs to be done.
-- You don't need to be a computer or git expert!
-
-
-## Guided Activity 1: Intro to Git and GitHub
-
-You will need to get into a group of 3 for this activity, and it would be best if you all sat together.
-
-- Contributor 1
-- Contributor 2
-- Contributor 3
-
-### Tasks:
-
-- Get into groups of 3
-- Accept a [**group** GitHub Classroom assignment](https://classroom.github.com/a/-GA1rFkW).
-- Clone the repo locally using the Terminal.
-- Open the repo in VS Code.
-- Contributor 1,2,3 all independently make changes to fix their functions in VS Code
-- Contributor 1,2,3 all commit to their repos BUT DO NOT PUSH!
-
-## Guided Activity 2: Code Reviews
-
-We'll now do a demo on how to submit a Pull Request, and do a code review.
-
-
-## Useful Git Commands
-
-Here are some command sequences that might be useful:
-
-- `git status`
-- `git clone ...`
-- `git add .` or `git add -A`
-- `git commit -m`
-- `git switch -c 'person1'`
-- `git switch -c 'person2'`
-- `git add`, `git commit`, `git push`
-
-## Important links for today:
-
-- [GitHub Guide](https://github.com/git-guides)
-- [Git Cheatsheet](https://enterprise.github.com/downloads/en/github-flow-cheatsheet.pdf)
-- [LearnGitBranching](https://https://learngitbranching.js.org)
-
-## Acknowledgements
-
-Slides for {{ COURSE_CODE }} were developed and created by [Dr. Cinda Heeren](https://www.cs.ubc.ca/people/cinda-heeren). The current iteration of the course resulted in minor adaptations and updates, but by in large, full credit of these slides belongs to Dr. Cinda Heeren.
diff --git a/_sources/notes/week06/class6B.md b/_sources/notes/week06/class6B.md
@@ -1,7 +1,91 @@
 # Class Meeting 6B
 
+There were no slides for today's lecture.  
 
-## Optional links for today
+Today we practiced a basic git workflow:
+- Cloning a github repo.
+- Multiple local edits with commits.
+- Reviewing and merging pull requests.
+
+<div>
+<iframe src="../../LecNoSlides.pdf" width="100%" height="600px" frameBorder="0"> </iframe>
+</div>
+
+<!-- 
+[Download the Slides from today](https://github.com/ubc-cs/cpsc203/raw/main/files/Lec10_Plotting_DataFrames.pdf)
+-->
+
+
+## Version Control with Git
+
+<img src="images/git.jpeg" width=30%>
+
+- Why git? (3 mins)
+- The GitHub flow (5 mins)
+- Introduction to Branches and Pull Requests (10 mins)
+- Guided Activity 1: Intro to Git and GitHub (25 mins)
+- Guided Activity 2: Code Reviews (10 mins)
+- Git Summary and Review (15 mins)
+
+### Why Git
+
+<img src="http://www.phdcomics.com/comics/archive/phd101212s.gif">
+
+### What is Git?
+
+<img src="https://www.nobledesktop.com/image/blog/git-branches-merge.png">
+
+Image Source: [Noble Desktop](https://www.nobledesktop.com/blog/what-is-git-and-why-should-you-use-it).
+
+## Learn Git Branching
+
+<img src="images/learn_git_branching.png">
+
+
+## Guided Activity 1: Intro to Git and GitHub
+
+You will need to get into a group of 3 for this activity, and it would be best if you all sat together.
+
+- Contributor 1
+- Contributor 2
+- Contributor 3
+
+### Tasks:
+Tasks to be completed by all members unless otherwise specified.
+
+- Get into groups of 3.
+- *Contributor 1 only*: Create a new repository from the [Class Activity 6B]() template repository.
+  - Follow the link.
+  - Click on `Use this template`.
+  - Choose yourself as the owner.
+  - Create a new repository name.
+  - Select *Public* repository (not Private).
+- Clone the new repository onto local machines (using the terminal).
+- Open the local repo in VS Code.
+- Independently make changes to `functions.py` to fix *one* of the functions (based on which contributor you are) in VS Code.
+- Commit changes to **local** repos.  **Do not push!!**
+## Guided Activity 2: Code Reviews
+
+We'll now do a demo on how to submit a Pull Request, and do a code review.
+
+
+## Useful Git Commands
+
+Here are some command sequences that might be useful:
+
+- `git status`
+- `git clone ...`
+- `git add .` or `git add -A`
+- `git commit -m`
+- `git switch -c 'person1'`
+- `git switch -c 'person2'`
+- `git add`, `git commit`, `git push`
+
+## Links for today:
+
+- [GitHub Guide](https://github.com/git-guides)
+- [Git Cheatsheet](https://enterprise.github.com/downloads/en/github-flow-cheatsheet.pdf)
+- [LearnGitBranching](https://https://learngitbranching.js.org)
 
 <!--
 ## Important links for today:

diff --git a/_sources/notes/week06/videos.md b/_sources/notes/week06/videos.md
@@ -21,9 +21,12 @@ In the sidebar on the right, you can use the checklists to keep track of what's
 ````
 ## Required Videos
 
+<!-- We ended up doing git on Thursday, so it was not so critical to watch these before Tuesday.
 ```{attention}
 To get the most benefit from class on Tuesday, ou will definitely need to have watched these videos BEFORE class on Tuesday!
 ```
+-->
+
 
 ```{dropdown} Why Use Git?
     :class-container: sd-shadow-lg

diff --git a/about/accommodations.html b/about/accommodations.html
@@ -36,9 +36,9 @@
     <link rel="stylesheet" type="text/css" href="../_static/mystnb.4510f1fc1dee50b3e5859aac5469c37c29e427902b24a333a5f9fcb2f0b3ac41.css" />
     <link rel="stylesheet" type="text/css" href="../_static/sphinx-thebe.css" />
     <link rel="stylesheet" type="text/css" href="../_static/sphinx-design.5ea377869091fd0449014c60fc090103.min.css" />
+    <link rel="stylesheet" type="text/css" href="../_static/extra.css" />
     <link rel="stylesheet" type="text/css" href="../_static/custom_layouts.css" />
     <link rel="stylesheet" type="text/css" href="../_static/pdf_print.css" />
-    <link rel="stylesheet" type="text/css" href="../_static/extra.css" />
 
   <!-- Pre-loaded scripts that we'll load fully later -->
   <link rel="preload" as="script" href="../_static/scripts/bootstrap.js?digest=dfe6caa3a7d634c4db9b" />

diff --git a/about/course_schedule.html b/about/course_schedule.html
@@ -36,9 +36,9 @@
     <link rel="stylesheet" type="text/css" href="../_static/mystnb.4510f1fc1dee50b3e5859aac5469c37c29e427902b24a333a5f9fcb2f0b3ac41.css" />
     <link rel="stylesheet" type="text/css" href="../_static/sphinx-thebe.css" />
     <link rel="stylesheet" type="text/css" href="../_static/sphinx-design.5ea377869091fd0449014c60fc090103.min.css" />
+    <link rel="stylesheet" type="text/css" href="../_static/extra.css" />
     <link rel="stylesheet" type="text/css" href="../_static/custom_layouts.css" />
     <link rel="stylesheet" type="text/css" href="../_static/pdf_print.css" />
-    <link rel="stylesheet" type="text/css" href="../_static/extra.css" />
 
   <!-- Pre-loaded scripts that we'll load fully later -->
   <link rel="preload" as="script" href="../_static/scripts/bootstrap.js?digest=dfe6caa3a7d634c4db9b" />

diff --git a/about/doing_well.html b/about/doing_well.html
@@ -36,9 +36,9 @@
     <link rel="stylesheet" type="text/css" href="../_static/mystnb.4510f1fc1dee50b3e5859aac5469c37c29e427902b24a333a5f9fcb2f0b3ac41.css" />
     <link rel="stylesheet" type="text/css" href="../_static/sphinx-thebe.css" />
     <link rel="stylesheet" type="text/css" href="../_static/sphinx-design.5ea377869091fd0449014c60fc090103.min.css" />
+    <link rel="stylesheet" type="text/css" href="../_static/extra.css" />
     <link rel="stylesheet" type="text/css" href="../_static/custom_layouts.css" />
     <link rel="stylesheet" type="text/css" href="../_static/pdf_print.css" />
-    <link rel="stylesheet" type="text/css" href="../_static/extra.css" />
 
   <!-- Pre-loaded scripts that we'll load fully later -->
   <link rel="preload" as="script" href="../_static/scripts/bootstrap.js?digest=dfe6caa3a7d634c4db9b" />

diff --git a/about/faq.html b/about/faq.html
@@ -36,9 +36,9 @@
     <link rel="stylesheet" type="text/css" href="../_static/mystnb.4510f1fc1dee50b3e5859aac5469c37c29e427902b24a333a5f9fcb2f0b3ac41.css" />
     <link rel="stylesheet" type="text/css" href="../_static/sphinx-thebe.css" />
     <link rel="stylesheet" type="text/css" href="../_static/sphinx-design.5ea377869091fd0449014c60fc090103.min.css" />
+    <link rel="stylesheet" type="text/css" href="../_static/extra.css" />
     <link rel="stylesheet" type="text/css" href="../_static/custom_layouts.css" />
     <link rel="stylesheet" type="text/css" href="../_static/pdf_print.css" />
-    <link rel="stylesheet" type="text/css" href="../_static/extra.css" />
 
   <!-- Pre-loaded scripts that we'll load fully later -->
   <link rel="preload" as="script" href="../_static/scripts/bootstrap.js?digest=dfe6caa3a7d634c4db9b" />

diff --git a/about/syllabus.html b/about/syllabus.html
@@ -36,9 +36,9 @@
     <link rel="stylesheet" type="text/css" href="../_static/mystnb.4510f1fc1dee50b3e5859aac5469c37c29e427902b24a333a5f9fcb2f0b3ac41.css" />
     <link rel="stylesheet" type="text/css" href="../_static/sphinx-thebe.css" />
     <link rel="stylesheet" type="text/css" href="../_static/sphinx-design.5ea377869091fd0449014c60fc090103.min.css" />
+    <link rel="stylesheet" type="text/css" href="../_static/extra.css" />
     <link rel="stylesheet" type="text/css" href="../_static/custom_layouts.css" />
     <link rel="stylesheet" type="text/css" href="../_static/pdf_print.css" />
-    <link rel="stylesheet" type="text/css" href="../_static/extra.css" />
 
   <!-- Pre-loaded scripts that we'll load fully later -->
   <link rel="preload" as="script" href="../_static/scripts/bootstrap.js?digest=dfe6caa3a7d634c4db9b" />

diff --git a/about/unsyllabus.html b/about/unsyllabus.html
@@ -36,9 +36,9 @@
     <link rel="stylesheet" type="text/css" href="../_static/mystnb.4510f1fc1dee50b3e5859aac5469c37c29e427902b24a333a5f9fcb2f0b3ac41.css" />
     <link rel="stylesheet" type="text/css" href="../_static/sphinx-thebe.css" />
     <link rel="stylesheet" type="text/css" href="../_static/sphinx-design.5ea377869091fd0449014c60fc090103.min.css" />
+    <link rel="stylesheet" type="text/css" href="../_static/extra.css" />
     <link rel="stylesheet" type="text/css" href="../_static/custom_layouts.css" />
     <link rel="stylesheet" type="text/css" href="../_static/pdf_print.css" />
-    <link rel="stylesheet" type="text/css" href="../_static/extra.css" />
 
   <!-- Pre-loaded scripts that we'll load fully later -->
   <link rel="preload" as="script" href="../_static/scripts/bootstrap.js?digest=dfe6caa3a7d634c4db9b" />

diff --git a/genindex.html b/genindex.html
@@ -35,9 +35,9 @@
     <link rel="stylesheet" type="text/css" href="_static/mystnb.4510f1fc1dee50b3e5859aac5469c37c29e427902b24a333a5f9fcb2f0b3ac41.css" />
     <link rel="stylesheet" type="text/css" href="_static/sphinx-thebe.css" />
     <link rel="stylesheet" type="text/css" href="_static/sphinx-design.5ea377869091fd0449014c60fc090103.min.css" />
+    <link rel="stylesheet" type="text/css" href="_static/extra.css" />
     <link rel="stylesheet" type="text/css" href="_static/custom_layouts.css" />
     <link rel="stylesheet" type="text/css" href="_static/pdf_print.css" />
-    <link rel="stylesheet" type="text/css" href="_static/extra.css" />
 
   <!-- Pre-loaded scripts that we'll load fully later -->
   <link rel="preload" as="script" href="_static/scripts/bootstrap.js?digest=dfe6caa3a7d634c4db9b" />

diff --git a/notes/setup/install_macOS.html b/notes/setup/install_macOS.html
@@ -36,9 +36,9 @@
     <link rel="stylesheet" type="text/css" href="../../_static/mystnb.4510f1fc1dee50b3e5859aac5469c37c29e427902b24a333a5f9fcb2f0b3ac41.css" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinx-thebe.css" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinx-design.5ea377869091fd0449014c60fc090103.min.css" />
+    <link rel="stylesheet" type="text/css" href="../../_static/extra.css" />
     <link rel="stylesheet" type="text/css" href="../../_static/custom_layouts.css" />
     <link rel="stylesheet" type="text/css" href="../../_static/pdf_print.css" />
-    <link rel="stylesheet" type="text/css" href="../../_static/extra.css" />
 
   <!-- Pre-loaded scripts that we'll load fully later -->
   <link rel="preload" as="script" href="../../_static/scripts/bootstrap.js?digest=dfe6caa3a7d634c4db9b" />

diff --git a/notes/setup/install_windows.html b/notes/setup/install_windows.html
@@ -36,9 +36,9 @@
     <link rel="stylesheet" type="text/css" href="../../_static/mystnb.4510f1fc1dee50b3e5859aac5469c37c29e427902b24a333a5f9fcb2f0b3ac41.css" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinx-thebe.css" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinx-design.5ea377869091fd0449014c60fc090103.min.css" />
+    <link rel="stylesheet" type="text/css" href="../../_static/extra.css" />
     <link rel="stylesheet" type="text/css" href="../../_static/custom_layouts.css" />
     <link rel="stylesheet" type="text/css" href="../../_static/pdf_print.css" />
-    <link rel="stylesheet" type="text/css" href="../../_static/extra.css" />
 
   <!-- Pre-loaded scripts that we'll load fully later -->
   <link rel="preload" as="script" href="../../_static/scripts/bootstrap.js?digest=dfe6caa3a7d634c4db9b" />

diff --git a/notes/setup/stack.html b/notes/setup/stack.html
@@ -36,9 +36,9 @@
     <link rel="stylesheet" type="text/css" href="../../_static/mystnb.4510f1fc1dee50b3e5859aac5469c37c29e427902b24a333a5f9fcb2f0b3ac41.css" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinx-thebe.css" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinx-design.5ea377869091fd0449014c60fc090103.min.css" />
+    <link rel="stylesheet" type="text/css" href="../../_static/extra.css" />
     <link rel="stylesheet" type="text/css" href="../../_static/custom_layouts.css" />
     <link rel="stylesheet" type="text/css" href="../../_static/pdf_print.css" />
-    <link rel="stylesheet" type="text/css" href="../../_static/extra.css" />
 
   <!-- Pre-loaded scripts that we'll load fully later -->
   <link rel="preload" as="script" href="../../_static/scripts/bootstrap.js?digest=dfe6caa3a7d634c4db9b" />

diff --git a/notes/week01/class1A.html b/notes/week01/class1A.html
@@ -36,9 +36,9 @@
     <link rel="stylesheet" type="text/css" href="../../_static/mystnb.4510f1fc1dee50b3e5859aac5469c37c29e427902b24a333a5f9fcb2f0b3ac41.css" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinx-thebe.css" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinx-design.5ea377869091fd0449014c60fc090103.min.css" />
+    <link rel="stylesheet" type="text/css" href="../../_static/extra.css" />
     <link rel="stylesheet" type="text/css" href="../../_static/custom_layouts.css" />
     <link rel="stylesheet" type="text/css" href="../../_static/pdf_print.css" />
-    <link rel="stylesheet" type="text/css" href="../../_static/extra.css" />
 
   <!-- Pre-loaded scripts that we'll load fully later -->
   <link rel="preload" as="script" href="../../_static/scripts/bootstrap.js?digest=dfe6caa3a7d634c4db9b" />

diff --git a/notes/week01/class1B.html b/notes/week01/class1B.html
@@ -36,9 +36,9 @@
     <link rel="stylesheet" type="text/css" href="../../_static/mystnb.4510f1fc1dee50b3e5859aac5469c37c29e427902b24a333a5f9fcb2f0b3ac41.css" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinx-thebe.css" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinx-design.5ea377869091fd0449014c60fc090103.min.css" />
+    <link rel="stylesheet" type="text/css" href="../../_static/extra.css" />
     <link rel="stylesheet" type="text/css" href="../../_static/custom_layouts.css" />
     <link rel="stylesheet" type="text/css" href="../../_static/pdf_print.css" />
-    <link rel="stylesheet" type="text/css" href="../../_static/extra.css" />
 
   <!-- Pre-loaded scripts that we'll load fully later -->
   <link rel="preload" as="script" href="../../_static/scripts/bootstrap.js?digest=dfe6caa3a7d634c4db9b" />

diff --git a/notes/week01/week01_summary.html b/notes/week01/week01_summary.html
@@ -36,9 +36,9 @@
     <link rel="stylesheet" type="text/css" href="../../_static/mystnb.4510f1fc1dee50b3e5859aac5469c37c29e427902b24a333a5f9fcb2f0b3ac41.css" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinx-thebe.css" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinx-design.5ea377869091fd0449014c60fc090103.min.css" />
+    <link rel="stylesheet" type="text/css" href="../../_static/extra.css" />
     <link rel="stylesheet" type="text/css" href="../../_static/custom_layouts.css" />
     <link rel="stylesheet" type="text/css" href="../../_static/pdf_print.css" />
-    <link rel="stylesheet" type="text/css" href="../../_static/extra.css" />
 
   <!-- Pre-loaded scripts that we'll load fully later -->
   <link rel="preload" as="script" href="../../_static/scripts/bootstrap.js?digest=dfe6caa3a7d634c4db9b" />