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 eaf2da02566811a03261ea0bee8435ea9d02506e Mon Sep 17 00:00:00 2001 From: erichu Date: Mon, 16 Sep 2024 13:38:54 -0400 Subject: [PATCH 3/5] fixed --- src/DataTypes.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/DataTypes.java b/src/DataTypes.java index 4f807c1f..9520abd6 100644 --- a/src/DataTypes.java +++ b/src/DataTypes.java @@ -4,11 +4,12 @@ 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; + for (Integer number : numbers) { + s += number; } + return s; } } From c8c0d83091893e653ef3a845bccf0fc316749f0c Mon Sep 17 00:00:00 2001 From: erichu Date: Mon, 16 Sep 2024 14:07:52 -0400 Subject: [PATCH 4/5] refactored to extract helper method --- src/DataTypes.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/DataTypes.java b/src/DataTypes.java index 9520abd6..40493d41 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 5ee69bcd253ee05bab3bfd41fae52b324c664da1 Mon Sep 17 00:00:00 2001 From: erichu Date: Mon, 16 Sep 2024 14:35:28 -0400 Subject: [PATCH 5/5] Fixed2 --- .idea/.gitignore | 8 ++++++++ .idea/vcs.xml | 4 ++++ 2 files changed, 12 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..13566b81 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..d843f340 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file