changes in calculator #162
Conversation
The calculator version2 brunch enables calculation of recommended calorie intake and food nutritions from food with time in a specific time range.
* 'master' of https://github.com/AY2021S1-CS2113-T14-4/tp: (82 commits) Update UserGuide.md Fix formatting Fix major formatting issues Update _config.yml Future date exception Add command with date time Update UserGuide.md minor fixes Add examples of usage to UserGuide section Put Examples of Usage for adding controling food items into the User Guide add addFoodAtDateTime Update help command message Bug Fixes Add case where gender is male Update ExitCommand.java Database Printing Feature Updates add toString version of datetime support methods Add dataSuccessfullySavedMessage method Delete Food.java in Test ...
…tion needed to calculate to Calculator class. Added the initialization of CalculatorData class in manager. Deleted setCalculator method in manager. Changed the inputs of methods related with calculator in CalculateCommand class.
| } | ||
|
|
||
| public List<Integer> getTotalCalorie() { | ||
| this.foods = list.getFoods(); |
There was a problem hiding this comment.
I suspect that the method called should be getPortionedFoods()
getFoods() does not take into consideration the portion size provided by the user and it seems that you did not get and handle the portion sizes separately. Using getPortionedFoods() will return a food item with scaled nutrional values (different from the item the user entered)
| } | ||
|
|
||
| public List<Integer> getTotalCalorie(LocalDateTime startTime) { | ||
| this.foods = list.getFoodsAfterDateTime(startTime); |
There was a problem hiding this comment.
Similar to the other comment. I suspect that this should be getPortionedFoodsAfterDateTime().
These apply throughout similar methods in this class.
| foodList.add(new Food("bao", 290, 0, 16, 0)); | ||
| Calculator calculator = new Calculator(foodList); | ||
| FoodList foodList = new FoodList(); | ||
| foodList.addFood(1, new Food("chicken rice", 666, 55, 30, 0)); |
There was a problem hiding this comment.
Consider adding tests with portion size >1. This would have caught the potential issue raised in earlier comments about portion sizing.
There was a problem hiding this comment.
OK, I changed the corresponding methods.
Added a CalculatorData class to take in a FoodList and return information needed to calculate to Calculator class.
Added the initialization of CalculatorData class in manager.
Deleted setCalculator method in manager.
Changed the inputs of methods related with calculator in CalculateCommand class.
To update calculator now, need to:
data.inputData(foodList);
calculator.update(data);