Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Zhong ming saveload branch #137

Open
wants to merge 509 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
509 commits
Select commit Hold shift + click to select a range
0e62e65
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T14-4/tp …
snowbanana12345 Oct 27, 2020
b55f6f0
Merge pull request #56 from AY2021S1-CS2113-T14-4/FoodList-Date-Branch
0xEljh Oct 27, 2020
84c6fe5
add retrieval methods for portion and date
0xEljh Oct 27, 2020
0f77f9f
updated with new person format
Oct 27, 2020
726d094
add Junit test for PersonSaveLoadManager
snowbanana12345 Oct 27, 2020
d080a33
fix check style
snowbanana12345 Oct 27, 2020
a8d5cde
t push origin masterMerge branch 'yuqiaoluolong-branch-2-calculatorv2'
Oct 27, 2020
03fcd8a
Relaxed date filter test for robustness
0xEljh Oct 27, 2020
a64c0f7
fix check style
snowbanana12345 Oct 27, 2020
23977b8
Add methods without recalculated food
HengFuYuen Oct 27, 2020
0de4f41
Merge pull request #58 from snowbanana12345/Zhong-ming-saveload-branch
snowbanana12345 Oct 27, 2020
91c8987
Merge branch 'master' into Zhong-ming-Branch-DataBase
snowbanana12345 Oct 27, 2020
87aa8c7
resolved name violation
Oct 27, 2020
55d5b07
copy paste
snowbanana12345 Oct 27, 2020
e913e66
Merge branch 'Zhong-ming-Branch-DataBase' of https://github.com/snowb…
snowbanana12345 Oct 27, 2020
3f63e1d
Fix checkstyle error
HengFuYuen Oct 27, 2020
fd551f5
Merge pull request #71 from yuqiaoluolong/branch-2-calculatorv2
yuqiaoluolong Oct 27, 2020
30bdbbe
Merge branch 'master' into MoreUserGuide
HengFuYuen Oct 27, 2020
cac4434
Merge branch 'master' into UpdateUi
HengFuYuen Oct 27, 2020
69eb966
Merge pull request #77 from HengFuYuen/MoreUserGuide
HengFuYuen Oct 27, 2020
e79f4f5
Merge branch 'master' into UpdateUi
HengFuYuen Oct 27, 2020
c67155b
Merge branch 'master' into DeveloperGuide
HengFuYuen Oct 27, 2020
093a593
fix bug
snowbanana12345 Oct 28, 2020
9288a11
Merge pull request #86 from snowbanana12345/Zhong-ming-Branch-DataBase
snowbanana12345 Oct 28, 2020
232aa92
Merge branch 'master' into MainBranch
tikimonarch Oct 28, 2020
5c8ad97
UML diagram
snowbanana12345 Oct 28, 2020
3af6408
Delete Duke.java
tikimonarch Oct 28, 2020
1e1c7ee
Merge pull request #76 from tikimonarch/MainBranch
tikimonarch Oct 28, 2020
5b73b91
architecture diaghram
snowbanana12345 Oct 28, 2020
427c846
Merge branch 'master' into UpdateUi
HengFuYuen Oct 28, 2020
d8c8d9f
finished words
snowbanana12345 Oct 28, 2020
08b941b
draw UML diaghrams
snowbanana12345 Oct 28, 2020
59643b9
complete DG
snowbanana12345 Oct 28, 2020
63f6a85
diaghrams
snowbanana12345 Oct 28, 2020
a602154
complete architecture
snowbanana12345 Oct 28, 2020
4305f30
Merge branch 'Zhong-Ming_Branch' of https://github.com/snowbanana1234…
snowbanana12345 Oct 28, 2020
f80517d
Merge branch 'Zhong-ming-saveload-branch' into Zhong-Ming-DG-Branch
snowbanana12345 Oct 28, 2020
a8fc02a
Merge pull request #9 from snowbanana12345/Zhong-Ming-DG-Branch
snowbanana12345 Oct 28, 2020
d1e0651
manually moved UML diaghrams and DG over to this branch
snowbanana12345 Oct 28, 2020
0434de7
Merge branch 'Zhong-ming-saveload-branch' of https://github.com/snowb…
snowbanana12345 Oct 28, 2020
7cd69c4
rename folders
snowbanana12345 Oct 28, 2020
e8cde0b
add save load feature part into developerGuide.md
snowbanana12345 Oct 28, 2020
4a09f85
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T14-4/tp
snowbanana12345 Oct 28, 2020
1203e54
Merge pull request #89 from HengFuYuen/UpdateUi
HengFuYuen Oct 28, 2020
a33270c
Merge pull request #87 from AY2021S1-CS2113-T14-4/FoodList-Date-Branch
HengFuYuen Oct 28, 2020
1ce4948
Command recommend and editinfo
tikimonarch Oct 28, 2020
64a8b45
Merge branch 'master' into MainBranch
tikimonarch Oct 28, 2020
9f088b8
Update Parser.java
tikimonarch Oct 28, 2020
4b8ad59
Merge pull request #90 from snowbanana12345/Zhong-ming-saveload-branch
snowbanana12345 Oct 28, 2020
cbfac91
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T14-4/tp
snowbanana12345 Oct 28, 2020
088746b
Update help command output
HengFuYuen Oct 28, 2020
81a6782
Add Ui component
HengFuYuen Oct 28, 2020
79ab1d0
Add UML diagrams
HengFuYuen Oct 28, 2020
71a95dd
Add enter user information feature
HengFuYuen Oct 28, 2020
5fd07fe
Update target user
HengFuYuen Oct 28, 2020
ab9aa11
Update non functional requirements
HengFuYuen Oct 28, 2020
465d6bb
Update glossary
HengFuYuen Oct 28, 2020
a52a922
Change minor formatting
HengFuYuen Oct 28, 2020
fbabae0
Improve markdown code quality
HengFuYuen Oct 28, 2020
bc695d9
Add table of contents
HengFuYuen Oct 28, 2020
630ef09
Merge pull request #91 from HengFuYuen/UpdateHelp
0xEljh Oct 28, 2020
c61e726
Merge pull request #94 from HengFuYuen/DeveloperAndUserGuide
HengFuYuen Oct 28, 2020
c1bd39b
Update diagrams and links
HengFuYuen Oct 28, 2020
f9b1aa7
Merge pull request #97 from HengFuYuen/UpdateDiagramsAndLinks
HengFuYuen Oct 28, 2020
5fd1b03
Merge branch 'master' into UpdateDiagrams
HengFuYuen Oct 28, 2020
0b8c6c0
Update file names
HengFuYuen Oct 28, 2020
4455a95
Merge pull request #100 from HengFuYuen/UpdateDiagrams
HengFuYuen Oct 28, 2020
d0ce853
Set theme jekyll-theme-architect
HengFuYuen Oct 28, 2020
8024fdb
Remove static referencing
0xEljh Oct 28, 2020
1a58bc1
Delete Food.java in Test
0xEljh Oct 28, 2020
99f7e94
Add dataSuccessfullySavedMessage method
HengFuYuen Oct 28, 2020
61c0f21
add toString version of datetime support methods
0xEljh Oct 28, 2020
097fb48
Merge pull request #103 from AY2021S1-CS2113-T14-4/clean-up-branch
HengFuYuen Oct 28, 2020
3ab299d
Feature Updates
tikimonarch Oct 28, 2020
542af1e
Merge pull request #102 from HengFuYuen/Ui-SaveDataMessage
HengFuYuen Oct 28, 2020
094e04c
Merge branch 'master' into MainBranch
tikimonarch Oct 28, 2020
ad19185
Merge branch 'master' into MainBranch
tikimonarch Oct 28, 2020
ad5424d
Database Printing
tikimonarch Oct 28, 2020
a13a658
Update ExitCommand.java
tikimonarch Oct 28, 2020
44da506
Merge pull request #104 from tikimonarch/MainBranch
HengFuYuen Oct 29, 2020
60fc25c
Add case where gender is male
HengFuYuen Oct 29, 2020
942beec
Merge pull request #105 from HengFuYuen/IncludeMale
HengFuYuen Oct 29, 2020
e563a49
Bug Fixes
tikimonarch Oct 29, 2020
7348828
Merge pull request #106 from tikimonarch/MainBranch
HengFuYuen Oct 29, 2020
917c550
Update help command message
HengFuYuen Oct 29, 2020
9cd464d
Merge pull request #107 from HengFuYuen/Ui-EditDatabase
HengFuYuen Oct 29, 2020
b7ba81b
add addFoodAtDateTime
0xEljh Oct 29, 2020
3ccd03e
Merge pull request #108 from AY2021S1-CS2113-T14-4/clean-up-branch
tikimonarch Oct 29, 2020
5c97f79
Put Examples of Usage for adding controling food items into the User …
snowbanana12345 Oct 29, 2020
6fea1da
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T14-4/tp
snowbanana12345 Oct 29, 2020
0e12c98
Add examples of usage to UserGuide section
snowbanana12345 Oct 29, 2020
cd4ea6d
minor fixes
snowbanana12345 Oct 29, 2020
920359e
Merge pull request #109 from snowbanana12345/Zhong-Ming-UserGuide-Branch
tikimonarch Oct 29, 2020
ae409f5
Update UserGuide.md
tikimonarch Oct 29, 2020
9b0e2fa
Merge branch 'master' into MainBranch
tikimonarch Oct 29, 2020
88b3a5a
Merge pull request #110 from tikimonarch/MainBranch
HengFuYuen Oct 29, 2020
4e99bb8
Add command with date time
tikimonarch Oct 29, 2020
1ebb527
Merge pull request #111 from tikimonarch/MainBranch
HengFuYuen Oct 29, 2020
8c2a702
Future date exception
tikimonarch Oct 29, 2020
15f3458
Update _config.yml
HengFuYuen Oct 29, 2020
9d358bd
Merge pull request #112 from tikimonarch/MainBranch
HengFuYuen Oct 29, 2020
48c9fd4
Fix major formatting issues
HengFuYuen Oct 29, 2020
d8d5210
Merge pull request #113 from HengFuYuen/UpdateGuide
HengFuYuen Oct 29, 2020
a66165b
Fix formatting
HengFuYuen Oct 29, 2020
d291a52
Merge pull request #114 from HengFuYuen/Guide
HengFuYuen Oct 29, 2020
6d4887b
Update UserGuide.md
tikimonarch Oct 30, 2020
e4da4f8
Merge pull request #115 from tikimonarch/MainBranch
HengFuYuen Oct 30, 2020
840662b
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T14-4/tp
Oct 31, 2020
acd0a80
Added a CalculatorData class to take in a FoodList and return informa…
Oct 31, 2020
6e1ceaa
added update method in Calculator class.
Oct 31, 2020
f549137
added the setCalculator method
Oct 31, 2020
65019bc
Added the initialization of data.
Oct 31, 2020
6fe80a6
add dated string representation
0xEljh Nov 2, 2020
25673fd
FoodListTest improvements
0xEljh Nov 2, 2020
66c5791
Remove unused imports
0xEljh Nov 2, 2020
7234e20
Rename ActivityLevel to FitnessLevel
HengFuYuen Nov 4, 2020
17274eb
Add logging for Person class
HengFuYuen Nov 4, 2020
e6c036d
edit data base
snowbanana12345 Nov 4, 2020
60728b8
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T14-4/tp …
snowbanana12345 Nov 4, 2020
0ad3d53
update data base
snowbanana12345 Nov 4, 2020
dc7ebe4
change activity level to fitness level in person class
snowbanana12345 Nov 4, 2020
c59c1a8
Merge pull request #164 from HengFuYuen/PersonAndFitness
HengFuYuen Nov 4, 2020
c8483a4
Merge branch 'master' into clean-up-branch
HengFuYuen Nov 4, 2020
2c118e1
Merge pull request #163 from AY2021S1-CS2113-T14-4/clean-up-branch
HengFuYuen Nov 4, 2020
dffa920
Exceptions
tikimonarch Nov 4, 2020
afbbf0c
Bug fixes
tikimonarch Nov 4, 2020
37462a0
Add fixed
tikimonarch Nov 4, 2020
32f8183
Refactor Ui and add logging
HengFuYuen Nov 4, 2020
d6b7f35
Change global variable to local
HengFuYuen Nov 4, 2020
62dce5a
Add new line at the end of the file
HengFuYuen Nov 4, 2020
42b5919
Update JavaDoc comments
HengFuYuen Nov 4, 2020
8724ea3
Update I/O testing
HengFuYuen Nov 4, 2020
1cdce4e
Update InputChecker.java
tikimonarch Nov 4, 2020
f1d1c38
Improved exception catching
tikimonarch Nov 4, 2020
743ecb0
Improved option detection
tikimonarch Nov 4, 2020
53afb25
Updated error message
tikimonarch Nov 5, 2020
745ddfc
Merge pull request #169 from HengFuYuen/PersonLogging
HengFuYuen Nov 5, 2020
c983477
Improved command exception
tikimonarch Nov 5, 2020
061c9cd
Fixed End Time
tikimonarch Nov 5, 2020
a45623c
Merge pull request #166 from tikimonarch/MainBranch
tikimonarch Nov 5, 2020
15f18ab
Update README.md
HengFuYuen Nov 6, 2020
b28ede1
Delete DukeTest.java
HengFuYuen Nov 6, 2020
c1753f0
Update JavaDoc comments
HengFuYuen Nov 6, 2020
6c08533
Add MainLogger.java
HengFuYuen Nov 6, 2020
7bfcd39
Add logging for Ui.java
HengFuYuen Nov 6, 2020
2dec832
Add logging for UiHelper.java
HengFuYuen Nov 6, 2020
01af9a0
Use MainLogger for UiInput.java
HengFuYuen Nov 6, 2020
cc7390f
Add logging for UiMessage.java
HengFuYuen Nov 6, 2020
09de15b
Make UiOutput package private
HengFuYuen Nov 6, 2020
db46957
Make method package private
HengFuYuen Nov 6, 2020
1c08701
Update JUnit tests for UiHelper
HengFuYuen Nov 6, 2020
465946d
Add JUnit tests for UiInput
HengFuYuen Nov 6, 2020
4ae9b84
Merge branch 'master' into UiChanges
HengFuYuen Nov 6, 2020
7378bca
Merge pull request #170 from HengFuYuen/UiChanges
HengFuYuen Nov 6, 2020
f70f054
Use MainLogger for logging
HengFuYuen Nov 6, 2020
36aafbd
add resource to test folder
snowbanana12345 Nov 7, 2020
3787888
fix check style
snowbanana12345 Nov 7, 2020
a7e73e4
Add attribution
HengFuYuen Nov 7, 2020
6b90cfd
Add assertions for MainLogger
HengFuYuen Nov 7, 2020
ac38fd8
Add JavaDoc comments for MainLogger
HengFuYuen Nov 7, 2020
6fc3120
Update AboutUs.md
HengFuYuen Nov 7, 2020
ab173f6
Add PPP
HengFuYuen Nov 7, 2020
5b1e1a8
Update introduction
HengFuYuen Nov 7, 2020
2b16f06
Update quick start
HengFuYuen Nov 7, 2020
7a46f6c
Add notes and warnings to features section
HengFuYuen Nov 7, 2020
0bf41b7
Update name command feature
HengFuYuen Nov 7, 2020
66cee4c
Update name command feature
HengFuYuen Nov 7, 2020
49c8a11
Update info command feature
HengFuYuen Nov 7, 2020
f7d1d12
Update editinfo command feature
HengFuYuen Nov 7, 2020
a508052
Update minor formatting issues
HengFuYuen Nov 7, 2020
2863695
Update command summary
HengFuYuen Nov 7, 2020
faba5e1
Update image
HengFuYuen Nov 7, 2020
43dee1c
Update code quality
HengFuYuen Nov 7, 2020
9902676
Changed get... methods in CalculatorData class to getPortioned... met…
Nov 7, 2020
221662a
implement and test search food by index function in data base
snowbanana12345 Nov 7, 2020
f2cc9e0
Exception Bug Fixes
tikimonarch Nov 7, 2020
30b2195
passed check style
snowbanana12345 Nov 7, 2020
03e0bee
fix check style
snowbanana12345 Nov 7, 2020
a3aa572
no message
snowbanana12345 Nov 7, 2020
3084624
fix test check style
snowbanana12345 Nov 7, 2020
e787bb9
Merge branch 'master' into MainBranch
tikimonarch Nov 7, 2020
b34cf34
Merge pull request #179 from tikimonarch/MainBranch
tikimonarch Nov 7, 2020
0d362e4
Change preposition
HengFuYuen Nov 7, 2020
73c080b
start implementing FoodPortionDateSaveLoadManager
snowbanana12345 Nov 7, 2020
94958ed
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T14-4/tp …
snowbanana12345 Nov 7, 2020
d3279c8
Merge branch 'master' into branch-3-changes
yuqiaoluolong Nov 7, 2020
539b522
Merge pull request #162 from yuqiaoluolong/branch-3-changes
yuqiaoluolong Nov 7, 2020
b46c5a7
Changed the the ActivityLevel to FitnessLevel
Nov 7, 2020
2d7028f
Changed the input attributes in the calculate... methods in Calculate…
Nov 7, 2020
dd5eba7
Merge pull request #180 from yuqiaoluolong/branch-4-changes
HengFuYuen Nov 7, 2020
3e0700d
add support for missing food details
0xEljh Nov 7, 2020
58d9636
move StringFormatter to utils package
0xEljh Nov 7, 2020
8e626aa
relax FoodListTest
0xEljh Nov 7, 2020
edc6f03
Remove unused dependencies
0xEljh Nov 7, 2020
a698e60
Update notes and warnings under Feature section
HengFuYuen Nov 7, 2020
b2a21e8
Elaborate on valid inputs for user name
HengFuYuen Nov 7, 2020
95c6471
Combine notes and warning section
HengFuYuen Nov 7, 2020
3dd4740
Merge pull request #173 from HengFuYuen/UpdatePersonLogging
HengFuYuen Nov 8, 2020
ff288ae
Merge branch 'master' into AboutUs-PPP
HengFuYuen Nov 8, 2020
ee8d466
implement 2nd layer of setters and getters
snowbanana12345 Nov 8, 2020
bb91199
add basic functionality test for FoodPortionSaveLoadManager
snowbanana12345 Nov 8, 2020
9fcdda3
Merge branch 'master' of https://github.com/AY2021S1-CS2113-T14-4/tp …
snowbanana12345 Nov 8, 2020
5376ca3
implement and test save loading food list
snowbanana12345 Nov 8, 2020
dd44a64
pass check style
snowbanana12345 Nov 8, 2020
9485a2c
copy resources over to test
snowbanana12345 Nov 8, 2020
0dd2a80
Merge pull request #185 from snowbanana12345/Zhong-ming-Branch-DataBase
snowbanana12345 Nov 8, 2020
30ca0ff
Merge pull request #171 from HengFuYuen/README
HengFuYuen Nov 8, 2020
c472680
Merge pull request #178 from HengFuYuen/UpdateUserGuide
HengFuYuen Nov 8, 2020
33c335f
Fix icon
HengFuYuen Nov 8, 2020
518101e
Improve formatting
HengFuYuen Nov 8, 2020
9a91757
Added the minimum and maximum caps for recommended calorie intake.
Nov 8, 2020
e579218
Merge pull request #190 from HengFuYuen/UserGuideUpdate
HengFuYuen Nov 8, 2020
9ce73db
Merge pull request #188 from HengFuYuen/UpdateReadMe
HengFuYuen Nov 8, 2020
5f27da9
add sort
0xEljh Nov 8, 2020
b73c61e
Merge pull request #183 from AY2021S1-CS2113-T14-4/FoodList-Optional-…
0xEljh Nov 8, 2020
3fa460e
Created a testing method corresponding to the added caps.
Nov 8, 2020
e89793f
refactored the calculateRecommendation to improve the code quality.
Nov 8, 2020
4421ccd
Merge pull request #192 from AY2021S1-CS2113-T14-4/FoodList-Optional-…
HengFuYuen Nov 8, 2020
3792450
Changed the weight used in calculateRecommendation method from origin…
Nov 8, 2020
a71c91f
change the activity stuff to fitness...
Nov 8, 2020
a77bcdd
activity to fitness
Nov 8, 2020
9d2c93c
Changed some numbers accordingly.
Nov 8, 2020
c3f99b3
Merge pull request #191 from yuqiaoluolong/branch-5-cap
yuqiaoluolong Nov 8, 2020
b6d8e95
Update the Ui component description
HengFuYuen Nov 8, 2020
d47e868
Update Ui component diagram
HengFuYuen Nov 8, 2020
f021e0d
Merge branch 'master' into DeveloperGuide
HengFuYuen Nov 8, 2020
be3b213
Update enter user information feature description
HengFuYuen Nov 8, 2020
2af801f
Update enter user information feature diagrams
HengFuYuen Nov 8, 2020
b74db1a
Update user stories related to Person class
HengFuYuen Nov 8, 2020
27fbc63
Update non-functional requirements
HengFuYuen Nov 8, 2020
251c0de
Update glossary
HengFuYuen Nov 8, 2020
9375397
Update target user profile and value preposition
HengFuYuen Nov 8, 2020
a0d6cc4
Update feature description
HengFuYuen Nov 8, 2020
9305e77
Update edit user info feature
HengFuYuen Nov 8, 2020
ee18b71
Rename files to remove spacing
HengFuYuen Nov 8, 2020
f64c7b9
Update edit user information feature
HengFuYuen Nov 9, 2020
f5431a5
Update view user information feature
HengFuYuen Nov 9, 2020
cfe39f2
Update instructions for manual testing
HengFuYuen Nov 9, 2020
3a0d247
Update _config.yml
HengFuYuen Nov 9, 2020
29d1cd3
Update HelpCommand display for user guide
HengFuYuen Nov 9, 2020
06dd83d
Merge pull request #194 from HengFuYuen/DeveloperGuide
HengFuYuen Nov 9, 2020
3c4fa91
Merge branch 'master' into AboutUs-PPP
HengFuYuen Nov 9, 2020
374ac75
Fix code snippet formatting with image
HengFuYuen Nov 9, 2020
6f21a7c
Improve code quality
HengFuYuen Nov 9, 2020
9670687
Update multiplicities in the diagram
HengFuYuen Nov 9, 2020
0eac807
Add hengfuyuen.md
HengFuYuen Nov 9, 2020
cb3c081
Merge pull request #176 from HengFuYuen/AboutUs-PPP
HengFuYuen Nov 9, 2020
563c8fd
Update AboutUs.md
HengFuYuen Nov 9, 2020
7e2b8f4
Merge pull request #198 from HengFuYuen/AboutUs
HengFuYuen Nov 9, 2020
e746402
Merge branch 'master' into Zhong-ming-saveload-branch
snowbanana12345 Nov 9, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
copy paste
snowbanana12345 committed Oct 27, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 55d5b07434f811b9653d791960030a438a06329f
20 changes: 17 additions & 3 deletions src/test/java/seedu/dietbook/food/FoodTest.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,25 @@
package seedu.dietbook.food;


import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.assertEquals;


class FoodTest {
private Food testFood;

public static void main(String[] args) {
Food food = new Food("Kobe Beef", 480,50,40,30);
System.out.println(food);
@BeforeEach
public void setUp() {
testFood = new Food("Kobe Beef", 480,50,40,30);
}

@Test
public void footTest() {
assertEquals(480, testFood.getCalorie());
assertEquals(50, testFood.getCarbohydrate());
assertEquals(40, testFood.getProtein());
assertEquals(30, testFood.getFat());
}
}