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 3cecf82e9439087315771e981c8551ea3944c0e2 Mon Sep 17 00:00:00 2001 From: JohnZHANGFZ Date: Mon, 18 Sep 2023 11:50:01 -0400 Subject: [PATCH 2/7] finish TODO --- src/DataTypes.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/DataTypes.java b/src/DataTypes.java index 4f807c1f..6f7432b9 100644 --- a/src/DataTypes.java +++ b/src/DataTypes.java @@ -1,13 +1,13 @@ 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 = 0L; // below is a "foreach" loop which iterates through numbers - for (int x : numbers) { - s += x; + for (int i = 0; i <= 1_000_000-1; i++) { + + s += numbers.get(i); } return s; } From 54d932032b60ac7f60198e4b085fe050cbcebe9b Mon Sep 17 00:00:00 2001 From: JohnZHANGFZ Date: Mon, 18 Sep 2023 11:53:23 -0400 Subject: [PATCH 3/7] just check --- .idea/.gitignore | 8 ++++++++ .idea/misc.xml | 6 ++++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ Lab2.iml | 22 ++++++++++++++++++++++ 5 files changed, 50 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 Lab2.iml 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/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..9aadbe3a --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..dd47d373 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Lab2.iml b/Lab2.iml new file mode 100644 index 00000000..03a7b649 --- /dev/null +++ b/Lab2.iml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 147370e060fb166f47cb8fb8488a8f9bbe0fc4fa Mon Sep 17 00:00:00 2001 From: JohnZHANGFZ Date: Mon, 18 Sep 2023 12:16:04 -0400 Subject: [PATCH 4/7] merge from bob branch --- recipe.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/recipe.md b/recipe.md index c43eefce..0167910c 100644 --- a/recipe.md +++ b/recipe.md @@ -4,15 +4,22 @@ - 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 +- 1/2 tsp ground cinnamon - ... ## 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. 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 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. + + ## 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. From 174297c632e8d54a7051a61bd15c01b0076d63db Mon Sep 17 00:00:00 2001 From: Fangzheng Zhang <101146860+JohnZHANGFZ@users.noreply.github.com> Date: Mon, 18 Sep 2023 12:31:21 -0400 Subject: [PATCH 5/7] Delete .idea directory --- .idea/.gitignore | 8 -------- .idea/misc.xml | 6 ------ .idea/modules.xml | 8 -------- .idea/vcs.xml | 6 ------ 4 files changed, 28 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 13566b81..00000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# 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/misc.xml b/.idea/misc.xml deleted file mode 100644 index 9aadbe3a..00000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index dd47d373..00000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1ddf..00000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From c3762d29487790836c692d9d93cbd86f6e8fcab5 Mon Sep 17 00:00:00 2001 From: Fangzheng Zhang <101146860+JohnZHANGFZ@users.noreply.github.com> Date: Mon, 18 Sep 2023 12:39:09 -0400 Subject: [PATCH 6/7] Delete Lab2.iml --- Lab2.iml | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 Lab2.iml diff --git a/Lab2.iml b/Lab2.iml deleted file mode 100644 index 03a7b649..00000000 --- a/Lab2.iml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 089e3cbae682ee4e1a8a7e2f518a62646c205dcd Mon Sep 17 00:00:00 2001 From: JohnZHANGFZ Date: Mon, 18 Sep 2023 12:44:05 -0400 Subject: [PATCH 7/7] change for task 3 --- recipe.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe.md b/recipe.md index 0167910c..9acc9a91 100644 --- a/recipe.md +++ b/recipe.md @@ -24,3 +24,5 @@ 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. + +this is the change for task_3