diff --git a/README.md b/README.md index 9e06d2e2..e82a6eb3 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ 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-2023F-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 some branches you will use in this lab. @@ -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 main is fine; no need to branch for this little step), then push your code. Check GitHub to ensure you can see your changes. diff --git a/recipe.md b/recipe.md index a8b51a4d..9cb8a865 100644 --- a/recipe.md +++ b/recipe.md @@ -4,9 +4,24 @@ - 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 +- 3 cups of MSG - ... ## 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 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. + +## Additional Directions by Bob: +7. Add a tablespoon of instant coffee to the dry ingredients for a hint of mocha flavor. +8. Mix in a handful of chocolate chunks for extra indulgence. +9. Line the bottom of the baking pan with parchment paper for easy cake removal. + diff --git a/src/DataTypes.java b/src/DataTypes.java index 4f807c1f..961bfd88 100644 --- a/src/DataTypes.java +++ b/src/DataTypes.java @@ -1,10 +1,9 @@ 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;