From e57487f108c44cbb196a2324ca22d8617e387fad Mon Sep 17 00:00:00 2001 From: Jonathan Calver Date: Sun, 17 Sep 2023 12:47:41 -0400 Subject: [PATCH 1/5] 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 dafb6611c1aa15099729be2c26d23a525a4c6388 Mon Sep 17 00:00:00 2001 From: Jonathan Calver Date: Sun, 17 Sep 2023 12:48:41 -0400 Subject: [PATCH 2/5] Bob's version of the cake recipe added. --- recipe.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/recipe.md b/recipe.md index a8b51a4d..ea014023 100644 --- a/recipe.md +++ b/recipe.md @@ -4,9 +4,15 @@ - 2 cups all-purpose flour - 1 3/4 cups granulated sugar - 3/4 cup unsweetened cocoa powder +- 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 +1. Preheat the oven to 375°F (190°C). +2. In a large bowl, whisk together the flour, sugar, cocoa powder, and ground cinnamon. +3. ... + +## Additional Directions by Bob: +4. Add a tablespoon of instant coffee to the dry ingredients for a hint of mocha flavor. +5. Mix in a handful of chocolate chunks for extra indulgence. +6. Line the bottom of the baking pan with parchment paper for easy cake removal. From 6defff95bc27e9aecc47c7feaf1e1bf122c51b94 Mon Sep 17 00:00:00 2001 From: RoyIL Date: Mon, 18 Sep 2023 11:50:18 -0400 Subject: [PATCH 3/5] Fixed long bug --- src/DataTypes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; From 9220a37d99a7f415a80912ef8589fb2e147709f2 Mon Sep 17 00:00:00 2001 From: RoyIL Date: Mon, 18 Sep 2023 11:50:59 -0400 Subject: [PATCH 4/5] Remove TODO --- 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 def4d10ed595583dcd5b839c9c8fba5704e7a26f Mon Sep 17 00:00:00 2001 From: RoyIL Date: Mon, 18 Sep 2023 12:12:21 -0400 Subject: [PATCH 5/5] Improved recipe --- recipe.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe.md b/recipe.md index 15e9a89b..ef3cf72c 100644 --- a/recipe.md +++ b/recipe.md @@ -5,12 +5,12 @@ - 1 3/4 cups granulated sugar - 3/4 cup unsweetened cocoa powder - 1/2 tsp ground cinnamon -- ... +- 1/2 tbsp chocolate chips ## Instructions: 1. Preheat the oven to 375°F (190°C). -2. In a large bowl, whisk together the flour, sugar, cocoa powder, and ground cinnamon. -3. ... +2. In a large bowl, whisk together the flour, sugar, cocoa powder, ground cinnamon, and the chocolate chips. + ## Additional Directions by Bob: 4. Add a tablespoon of instant coffee to the dry ingredients for a hint of mocha flavor.