From e57487f108c44cbb196a2324ca22d8617e387fad Mon Sep 17 00:00:00 2001 From: Jonathan Calver Date: Sun, 17 Sep 2023 12:47:41 -0400 Subject: [PATCH 1/7] 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 956814584371c5cd2336ac3786d97bb0fa5df247 Mon Sep 17 00:00:00 2001 From: Yoo Hyejin Date: Mon, 16 Sep 2024 15:36:12 -0400 Subject: [PATCH 2/7] datatypes_post fix --- src/DataTypes.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DataTypes.java b/src/DataTypes.java index 4f807c1f..b1bffd0f 100644 --- a/src/DataTypes.java +++ b/src/DataTypes.java @@ -1,10 +1,10 @@ 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; + long s = 0; // below is a "foreach" loop which iterates through numbers for (int x : numbers) { s += x; From a409c94cf597db00ccb2c8e2cbbf30305b9065cf Mon Sep 17 00:00:00 2001 From: yoohyeji Date: Mon, 16 Sep 2024 15:41:38 -0400 Subject: [PATCH 3/7] change in task_1 --- test/DataTypesTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/DataTypesTest.java b/test/DataTypesTest.java index 42b9ef96..be17d7cc 100644 --- a/test/DataTypesTest.java +++ b/test/DataTypesTest.java @@ -8,12 +8,16 @@ public class DataTypesTest { + public static void main(String[] args) { + largeSumTest(); + } + @Test(timeout = 1000) /** * Test that DataTypes.sum returns the correct value for * the sum from 1 to 1 million. */ - public void largeSumTest() { + public static void largeSumTest() { // You put an L at the end to indicate it is a long. // try removing the L and you'll see that you get an error From 55ab1127aa40ba8848c85a9fe9f50ff3e7249eb8 Mon Sep 17 00:00:00 2001 From: yoohyeji Date: Mon, 16 Sep 2024 15:44:10 -0400 Subject: [PATCH 4/7] change in task_1 --- test/DataTypesTest.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/test/DataTypesTest.java b/test/DataTypesTest.java index be17d7cc..405302c9 100644 --- a/test/DataTypesTest.java +++ b/test/DataTypesTest.java @@ -8,16 +8,13 @@ public class DataTypesTest { - public static void main(String[] args) { - largeSumTest(); - } @Test(timeout = 1000) /** * Test that DataTypes.sum returns the correct value for * the sum from 1 to 1 million. */ - public static void largeSumTest() { + public void largeSumTest() { // You put an L at the end to indicate it is a long. // try removing the L and you'll see that you get an error From 33722787d5db18f270f74dbede2a8cb4c7568df8 Mon Sep 17 00:00:00 2001 From: yoohyeji Date: Mon, 16 Sep 2024 16:02:25 -0400 Subject: [PATCH 5/7] change --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 8207214b..178dd3e4 100644 --- a/README.md +++ b/README.md @@ -24,22 +24,22 @@ 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-2024F-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 two branches you will use later 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, +- [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` From 836e631bc64f6b5e6f756f7bf81322cda1a7808d Mon Sep 17 00:00:00 2001 From: yoohyeji Date: Mon, 16 Sep 2024 16:08:39 -0400 Subject: [PATCH 6/7] push --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 178dd3e4..9cd5a81a 100644 --- a/README.md +++ b/README.md @@ -45,13 +45,13 @@ 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` From a051bda1c9ba6c74bdb8bf9ea16b0f8c53853c4d Mon Sep 17 00:00:00 2001 From: yoohyeji Date: Mon, 16 Sep 2024 16:26:01 -0400 Subject: [PATCH 7/7] change --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9cd5a81a..bff72102 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ You should now see the changes you had made are also in the `main` 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 the main branch is fine; no need to branch for this little step), then push your code. Check GitHub to ensure you can see your changes.