From e57487f108c44cbb196a2324ca22d8617e387fad Mon Sep 17 00:00:00 2001 From: Jonathan Calver Date: Sun, 17 Sep 2023 12:47:41 -0400 Subject: [PATCH 1/4] 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 99eb48d0fa631268d72dcbfac2dc1255c59e43bf Mon Sep 17 00:00:00 2001 From: ceryanki Date: Mon, 16 Sep 2024 13:49:25 -0400 Subject: [PATCH 2/4] Fixed the Bug and removed the TODO line --- src/DataTypes.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/DataTypes.java b/src/DataTypes.java index 4f807c1f..40a84f28 100644 --- a/src/DataTypes.java +++ b/src/DataTypes.java @@ -1,12 +1,11 @@ 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) { + for (int x: numbers) { s += x; } return s; From bee296819e98f86ee34dd6659b386e64d60bd4ee Mon Sep 17 00:00:00 2001 From: ceryanki Date: Mon, 16 Sep 2024 13:53:36 -0400 Subject: [PATCH 3/4] Fixed the Bug and removed the TODO line --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8207214b..7163d395 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. From b7073f493f7444916ad0eaf4a5dee4448572c752 Mon Sep 17 00:00:00 2001 From: ceryanki Date: Mon, 16 Sep 2024 14:03:23 -0400 Subject: [PATCH 4/4] Deleted extra lines --- recipe.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe.md b/recipe.md index c43eefce..38a6dc17 100644 --- a/recipe.md +++ b/recipe.md @@ -6,12 +6,12 @@ - 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, 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.