From d77d0020f6c8030c3fde55eee4240e57ebc212e6 Mon Sep 17 00:00:00 2001 From: Jon Vincentius Date: Mon, 18 Sep 2023 13:36:03 -0400 Subject: [PATCH 1/3] Updated README & Task 1 TODO --- README.md | 8 ++++---- src/DataTypes.java | 5 ++--- 2 files changed, 6 insertions(+), 7 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..0dca5c81 100644 --- a/src/DataTypes.java +++ b/src/DataTypes.java @@ -1,10 +1,9 @@ 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) { - - int s = 0; + // Error fix was changing s datatype from int to long + long s = 0L; // below is a "foreach" loop which iterates through numbers for (int x : numbers) { s += x; From 72b283ea9fa9c7cea0f1c62a6fa29673697598b0 Mon Sep 17 00:00:00 2001 From: Jon Vincentius Date: Mon, 18 Sep 2023 13:41:01 -0400 Subject: [PATCH 2/3] Completed Task 1 & Updated README --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 9830bda3..c053b961 100644 --- a/README.md +++ b/README.md @@ -39,23 +39,23 @@ 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` 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 b0bf86eeede1693a34d447cbae85e1f0836b665a Mon Sep 17 00:00:00 2001 From: Jon Vincentius Date: Sun, 24 Sep 2023 11:28:47 -0400 Subject: [PATCH 3/3] Finalised recipe.md --- recipe.md | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/recipe.md b/recipe.md index a8b51a4d..ae253bf9 100644 --- a/recipe.md +++ b/recipe.md @@ -4,9 +4,21 @@ - 2 cups all-purpose flour - 1 3/4 cups granulated sugar - 3/4 cup unsweetened cocoa powder -- ... +<<<<<<< HEAD +- 1 cup chocolate chips +- 1 tsp vanilla extract +- 1/2 tsp ground cinnamon ## 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. Add a tablespoon of instant coffee to the dry ingredients for a hint of mocha flavor. +4. Mix in a handful of chocolate chunks for extra indulgence. +5. In a separate bowl, beat the eggs and add them to the mixture. Stir until well combined. +6. Gradually add the milk and vegetable oil to the mixture, continuing to stir. +7. Line the bottom of the baking pan with parchment paper for easy cake removal. +8. Pour the batter into a greased and floured 9x13-inch baking pan. + +FINAL +======= +>>>>>>> origin/bob