From e57487f108c44cbb196a2324ca22d8617e387fad Mon Sep 17 00:00:00 2001 From: Jonathan Calver Date: Sun, 17 Sep 2023 12:47:41 -0400 Subject: [PATCH 1/6] Alice's version of the recipe added --- recipe.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/recipe.md b/recipe.md index a8b51a4d..c43eefce 100644 --- a/recipe.md +++ b/recipe.md @@ -4,9 +4,16 @@ - 2 cups all-purpose flour - 1 3/4 cups granulated sugar - 3/4 cup unsweetened cocoa powder +- 1 cup chocolate chips +- 1 tsp vanilla extract - ... ## Instructions: 1. Preheat the oven to 350°F (175°C). -2. In a large bowl, whisk together the flour, sugar, and cocoa powder. -3. ... \ No newline at end of file +2. In a large bowl, whisk together the flour, sugar, cocoa powder, chocolate chips, and vanilla extract. +3. ... + +## Additional Directions by Alice: +4. In a separate bowl, beat the eggs and add them to the mixture. Stir until well combined. +5. Gradually add the milk and vegetable oil to the mixture, continuing to stir. +6. Pour the batter into a greased and floured 9x13-inch baking pan. From 58305fa12d7e988e7b00436ccae3a199cf46d05c Mon Sep 17 00:00:00 2001 From: Anish Roy Date: Thu, 23 May 2024 18:52:22 -0400 Subject: [PATCH 2/6] fixed bug in datatypes --- README.md | 8 ++++---- src/DataTypes.java | 2 +- test/DataTypesTest.java | 5 ++++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 9e06d2e2..9830bda3 100644 --- a/README.md +++ b/README.md @@ -24,19 +24,19 @@ can make pull requests to that repo during the Task 3 activity during the lab. During lab, you should not fork directly from https://github.com/CSC207-2023F-UofT/Lab2. If you miss the lab and work on this after, you should use this URL though. -- [ ] Make a fork of this repo and clone a local copy (as you did in Lab 1). +- [X] Make a fork of this repo and clone a local copy (as you did in Lab 1). - Important: make sure to uncheck the option to only fork the main branch, as the repo contains some branches you will use in this lab. # TASK 1: Your first branch -- [ ] Create and checkout a new branch called `task_1` using either IntelliJ or the Terminal: +- [X] Create and checkout a new branch called `task_1` using either IntelliJ or the Terminal: - IntelliJ: `Git -> New branch...` - Terminal: `git checkout -b task_1` - After, you can check `git status` or the Log tab of the Git tool window in IntelliJ to see that you are now on the `task_1` branch. -- [ ] Open the TODO tool window (`View -> Tool Windows -> TODO`) and click on the TASK 1 TODO listed. -- [ ] Complete the TASK 1 TODO and commit your changes to this file (checking off the +- [X] Open the TODO tool window (`View -> Tool Windows -> TODO`) and click on the TASK 1 TODO listed. +- [X] Complete the TASK 1 TODO and commit your changes to this file (checking off the completed items so far) and `DataTypes.java` (remove the word TODO and your bug fix). - talk to those around you or your TA, then see the hints at the bottom of the readme if you get stuck. - [ ] Now, we'll merge the `task_1` branch back into `main`. When merging, diff --git a/src/DataTypes.java b/src/DataTypes.java index 4f807c1f..eebcb595 100644 --- a/src/DataTypes.java +++ b/src/DataTypes.java @@ -4,7 +4,7 @@ public class DataTypes { // TODO TASK 1: fix this code so that it passes the test in DataTypesTest.java public static long sum(List numbers) { - int s = 0; + long s = 0; // below is a "foreach" loop which iterates through numbers for (int x : numbers) { s += x; diff --git a/test/DataTypesTest.java b/test/DataTypesTest.java index e53951fe..78a4fd46 100644 --- a/test/DataTypesTest.java +++ b/test/DataTypesTest.java @@ -26,4 +26,7 @@ public void largeSumTest() { } assertEquals("sum form 1 to 1 million should be " + x, x, DataTypes.sum(lst)); } -} \ No newline at end of file +} + + + From fde62d3cc65dc0aad7293fe488162c84fb3beabb Mon Sep 17 00:00:00 2001 From: Anish Roy Date: Thu, 23 May 2024 18:53:22 -0400 Subject: [PATCH 3/6] fixed bug in datatypes --- src/DataTypes.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/DataTypes.java b/src/DataTypes.java index eebcb595..7601f4dd 100644 --- a/src/DataTypes.java +++ b/src/DataTypes.java @@ -1,7 +1,6 @@ import java.util.List; public class DataTypes { - // TODO TASK 1: fix this code so that it passes the test in DataTypesTest.java public static long sum(List numbers) { long s = 0; From 1a3f3b957de6877d58297152e69fb3808ea366f0 Mon Sep 17 00:00:00 2001 From: Anish Roy Date: Thu, 23 May 2024 19:02:33 -0400 Subject: [PATCH 4/6] readme changes --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9830bda3..4e0c18fb 100644 --- a/README.md +++ b/README.md @@ -39,13 +39,13 @@ If you miss the lab and work on this after, you should use this URL though. - [X] Complete the TASK 1 TODO and commit your changes to this file (checking off the completed items so far) and `DataTypes.java` (remove the word TODO and your bug fix). - talk to those around you or your TA, then see the hints at the bottom of the readme if you get stuck. -- [ ] Now, we'll merge the `task_1` branch back into `main`. When merging, +- [X] Now, we'll merge the `task_1` branch back into `main`. When merging, you need to be currently on the branch you are trying to merge into, so we'll first checkout the main branch: - IntelliJ: `Git -> branches... -> main -> Checkout` - Terminal: `git checkout main` Note: everything we've done has been local to our repository and have not pushed anything yet. -- [ ] We are back on `main`, so we can now do the merge and complete our work! +- [X] We are back on `main`, so we can now do the merge and complete our work! - IntelliJ: `Git -> Merge... -> task_1 -> Merge` - Terminal: `git merge task_1` From 9d46a3f92406cc103a5219b6f88cc97c97faaa3f Mon Sep 17 00:00:00 2001 From: Anish Roy Date: Thu, 23 May 2024 19:06:30 -0400 Subject: [PATCH 5/6] readme changes --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4e0c18fb..c053b961 100644 --- a/README.md +++ b/README.md @@ -51,11 +51,11 @@ Note: everything we've done has been local to our repository and have not pushed You should now see the changes you had made are also in the `main` branch. -- [ ] Now, we'll want to clean up since we are done with our `task_1` branch. +- [X] Now, we'll want to clean up since we are done with our `task_1` branch. - IntelliJ: `Git -> branches... -> task_1 -> Delete` - Terminal: `git branch -d task_1` -- [ ] Last step, we'll push our changes to the remote repository to share our work! (As we did in Lab 1.) +- [X] Last step, we'll push our changes to the remote repository to share our work! (As we did in Lab 1.) - we suggest you check off this last item, commit that change (just right on main is fine; no need to branch for this little step), then push your code. Check GitHub to ensure you can see your changes. From 0c401e0d926265ea20fbc4c2bcfe7626ab0ebec4 Mon Sep 17 00:00:00 2001 From: Anish Roy Date: Thu, 23 May 2024 19:15:14 -0400 Subject: [PATCH 6/6] recipe changes --- README.md | 10 +++++----- recipe.md | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index c053b961..c5cc91dc 100644 --- a/README.md +++ b/README.md @@ -76,23 +76,23 @@ started working on the recipe in `recipe.md` together, and then each filled in t what they felt would make the most delicious cake! You'll notice that your repository already has two branches called `alice` and `bob`. -- [ ] Checkout the `alice` branch. -- [ ] Attempt to merge the `bob` branch into the `alice` branch using either IntelliJ or the Terminal. +- [X] Checkout the `alice` branch. +- [X] Attempt to merge the `bob` branch into the `alice` branch using either IntelliJ or the Terminal. - You will be prompted to resolve a merge conflict. To do this, you will need to pick and choose which parts of each recipe to keep. - Read what either `git` or `IntelliJ` tells you in order to complete the merge process. - If you do the merge through the Terminal, you will need to edit `recipe.md` to remove all of the merge conflict symbols which `git` has added to your file. Once done, you will need to `git add` the `recipe.md` file and `git commit` to finish the merge. -- [ ] Once the merge is complete, delete the `bob` branch. +- [X] Once the merge is complete, delete the `bob` branch. -- [ ] Finally, checkout the `main` branch and merge the `alice` branch in (as we did previously). +- [X] Finally, checkout the `main` branch and merge the `alice` branch in (as we did previously). Now, you are almost ready to share your recipe with the remote! # TASK 3 -- [ ] Checkout a new branch called `task_3`. +- [X] Checkout a new branch called `task_3`. - [ ] Commit any changes that you want to `recipe.md` to improve the recipe. - [ ] While still on the `task_3` branch, push your code to your remote repository on GitHub. - [ ] Go to GitHub and you will see an option to make a pull request to the original repo. Make diff --git a/recipe.md b/recipe.md index c43eefce..e3037839 100644 --- a/recipe.md +++ b/recipe.md @@ -1,15 +1,15 @@ # Delicious Chocolate Cake Recipe ## Ingredients: -- 2 cups all-purpose flour -- 1 3/4 cups granulated sugar -- 3/4 cup unsweetened cocoa powder -- 1 cup chocolate chips -- 1 tsp vanilla extract +- 100 cups all-purpose flour +- 200 3/4 cups granulated sugar +- 2948 cup unsweetened cocoa powder +- 32954 cup chocolate chips +- 9843 tsp vanilla extract - ... ## Instructions: -1. Preheat the oven to 350°F (175°C). +1. Preheat the oven to 1000°F (175°C). 2. In a large bowl, whisk together the flour, sugar, cocoa powder, chocolate chips, and vanilla extract. 3. ...