From d305d44b1f032790f0cc71b1c6ba72d7007c5ee1 Mon Sep 17 00:00:00 2001 From: mn0912 Date: Wed, 20 Sep 2023 23:27:56 -0400 Subject: [PATCH 1/3] Completed TO DO Task 1(Fixed error so it passes DataTypesTest) --- 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 3db72c6f106aa1bcda79007b9c4cfb85414ba505 Mon Sep 17 00:00:00 2001 From: mn0912 Date: Wed, 20 Sep 2023 23:29:17 -0400 Subject: [PATCH 2/3] Completed TO DO Task 1(Fixed error so it passes DataTypesTest) --- README.md | 8 ++++---- src/DataTypes.java | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 9e06d2e2..b1c6c1c0 100644 --- a/README.md +++ b/README.md @@ -24,19 +24,19 @@ 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. # 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 that you are now on the `task_1` branch. -- [ ] 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] Open the TODO tool window (`View -> Tool Windows -> TODO`) and click on the TASK 1 TODO listed. +- [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 those around you 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, 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 70aa9e314f0e0ea5e58ef9cd2765e40507e961cc Mon Sep 17 00:00:00 2001 From: mn0912 Date: Wed, 20 Sep 2023 23:33:13 -0400 Subject: [PATCH 3/3] Completed Task 1 --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b1c6c1c0..04692a7a 100644 --- a/README.md +++ b/README.md @@ -39,23 +39,23 @@ If you miss the lab and work on this after, you should use this URL though. - [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 those around you 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 checkout the main branch: - IntelliJ: `Git -> branches... -> main -> Checkout` - Terminal: `git checkout main` Note: everything we've done has been local to our repository and have not pushed anything yet. -- [ ] 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` You should now see the changes you had made are also 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 (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.