diff --git a/README.md b/README.md index 49ad8cf6..9e1c450f 100644 --- a/README.md +++ b/README.md @@ -25,14 +25,14 @@ Your TA will share a different URL for you to fork from, so that you can make pull requests to that repo during Task 3 of the lab. If you miss the lab and work on this after, you can 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 two branches you will use later in this lab. # TASK 1: Your first branch -- [ ] Create and checkout a new branch called `task_1` using either IntelliJ or the Terminal: +- [X] Create and checkout a new branch called `task_1` using either IntelliJ or the Terminal: - IntelliJ: `Git -> New branch...` - Terminal: `git checkout -b task_1` - After, you can check `git status` or the Log tab of the Git tool window in IntelliJ to see @@ -40,17 +40,17 @@ If you miss the lab and work on this after, you can use this URL though. --- -- [ ] Open the TODO tool window (`View -> Tool Windows -> TODO`) and click on the TASK 1 TODO listed. +- [X] Open the TODO tool window (`View -> Tool Windows -> TODO`) and click on the TASK 1 TODO listed. --- -- [ ] Complete the TASK 1 TODO and commit your changes to this file (checking off the +- [X] Complete the TASK 1 TODO and commit your changes to this file (checking off the completed items so far) and `DataTypes.java` (remove the word TODO and your bug fix). - talk to your team or your TA, then see the hints at the bottom of the readme if you get stuck. --- -- [ ] Now, we'll merge the `task_1` branch back into `main`. When merging, +- [X] Now, we'll merge the `task_1` branch back into `main`. When merging, you need to be currently on the branch you are trying to merge into, so we'll first check out the main branch: - IntelliJ: `Git -> branches... -> main -> Checkout` @@ -59,7 +59,7 @@ branch: --- -- [ ] We are back on `main`, so we can now do the merge and complete our work! +- [X] We are back on `main`, so we can now do the merge and complete our work! - IntelliJ: `Git -> Merge... -> task_1 -> Merge` - Terminal: `git merge task_1` @@ -67,13 +67,13 @@ You should now see the changes that you made are now in the `main` branch. --- -- [ ] Now, we'll want to clean up since we are done with our `task_1` branch. +- [X] Now, we'll want to clean up since we are done with our `task_1` 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, and then push your code. Check GitHub to ensure you can see your changes. diff --git a/recipe.md b/recipe.md index a8b51a4d..8e62e2a7 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. \ No newline at end of file diff --git a/src/DataTypes.java b/src/DataTypes.java index 12c0618e..66c0dc4d 100644 --- a/src/DataTypes.java +++ b/src/DataTypes.java @@ -1,7 +1,7 @@ public class DataTypes { // TODO TASK 1: fix this code so that it passes the test in DataTypesTest.java public static long sum(int[] numbers) { - int s = 0; // variable to accumulate the sum in! + long s = 0; // variable to accumulate the sum in! // below is a "foreach" loop which iterates through numbers for (int x : numbers) { s += x;