Merge pull request nus-cs2103-AY2021S1#84 from patricktan6/branch-ViewBmi

Added view bmi

Author: iqbxl

src/main/java/seedu/address/logic/commands/AddHeightCommand.java

@@ -12,19 +12,19 @@ public class AddHeightCommand extends Command {
     public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds user's height to fitNUS. "
             + "Parameters: "
             + PREFIX_HEIGHT + "HEIGHT "
-            + "...\n"
+            + "\n"
             + "Example: " + COMMAND_WORD + " "
             + PREFIX_HEIGHT + "170 ";
 
-    public static final String MESSAGE_SUCCESS = "Height added: %d cm";
+    public static final String MESSAGE_SUCCESS = "Height added: %.2f cm";
     public static final String MESSAGE_INVALID_HEIGHT = "This is not a valid height";
 
-    private final int height;
+    private final double height;
 
     /**
-     * Creates an ExerciseAddCommand to add the specified {@code Exercise}
+     * Creates an AddHeightCommand to add the specified height in centimetres.
      */
-    public AddHeightCommand(int height) {
+    public AddHeightCommand(double height) {
         requireNonNull(height);
         this.height = height;
     }

src/main/java/seedu/address/logic/commands/AddWeightCommand.java

@@ -12,19 +12,19 @@ public class AddWeightCommand extends Command {
     public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds user's weight to fitNUS. "
             + "Parameters: "
             + PREFIX_WEIGHT + "WEIGHT "
-            + "...\n"
+            + "\n"
             + "Example: " + COMMAND_WORD + " "
             + PREFIX_WEIGHT + "72 ";
 
-    public static final String MESSAGE_SUCCESS = "Weight added: %d kg";
+    public static final String MESSAGE_SUCCESS = "Weight added: %.2f kg";
     public static final String MESSAGE_INVALID_WEIGHT = "This is not a valid weight";
 
-    private final int weight;
+    private final double weight;
 
     /**
-     * Creates an ExerciseAddCommand to add the specified {@code Exercise}
+     * Creates an AddWeightCommand to add the specified weight in kilograms.
      */
-    public AddWeightCommand(int weight) {
+    public AddWeightCommand(double weight) {
         requireNonNull(weight);
         this.weight = weight;
     }

src/main/java/seedu/address/logic/commands/BmiCommand.java

@@ -0,0 +1,41 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+
+public class BmiCommand extends Command {
+    public static final String COMMAND_WORD = "bmi";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Views the user's BMI. "
+            + "\n"
+            + "Example: " + COMMAND_WORD;
+
+    public static final String MESSAGE_SUCCESS = "Your BMI is %.2f.";
+    public static final String MESSAGE_INVALID_BMI = "Your BMI is not available. "
+            + "Please make sure that you have updated your height and weight.";
+
+    /**
+     * Creates a BmiCommand to get the BMI Index.
+     */
+    public BmiCommand() {
+    }
+
+    @Override
+    public CommandResult execute(Model model) throws CommandException {
+        requireNonNull(model);
+
+        double bmi = model.getBmi();
+        if (Double.isNaN(bmi)) {
+            throw new CommandException(MESSAGE_INVALID_BMI);
+        }
+        return new CommandResult(String.format(MESSAGE_SUCCESS, bmi));
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this; // short circuit if same object
+    }
+
+}

src/main/java/seedu/address/logic/parser/AddHeightCommandParser.java

@@ -25,7 +25,7 @@ public AddHeightCommand parse(String args) throws ParseException {
             throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddHeightCommand.MESSAGE_USAGE));
         }
 
-        int height = ParserUtil.parseHeight(argMultimap.getValue(PREFIX_HEIGHT).get());
+        double height = ParserUtil.parseHeight(argMultimap.getValue(PREFIX_HEIGHT).get());
 
         return new AddHeightCommand(height);
     }

src/main/java/seedu/address/logic/parser/AddWeightCommandParser.java

@@ -25,7 +25,7 @@ public AddWeightCommand parse(String args) throws ParseException {
             throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddWeightCommand.MESSAGE_USAGE));
         }
 
-        int weight = ParserUtil.parseHeight(argMultimap.getValue(PREFIX_WEIGHT).get());
+        double weight = ParserUtil.parseWeight(argMultimap.getValue(PREFIX_WEIGHT).get());
 
         return new AddWeightCommand(weight);
     }

src/main/java/seedu/address/logic/parser/AddressBookParser.java

@@ -9,6 +9,7 @@
 import seedu.address.logic.commands.AddCommand;
 import seedu.address.logic.commands.AddHeightCommand;
 import seedu.address.logic.commands.AddWeightCommand;
+import seedu.address.logic.commands.BmiCommand;
 import seedu.address.logic.commands.ClearCommand;
 import seedu.address.logic.commands.Command;
 import seedu.address.logic.commands.DeleteCommand;
@@ -156,6 +157,9 @@ public Command parseCommand(String userInput) throws ParseException {
         case AddWeightCommand.COMMAND_WORD:
             return new AddWeightCommandParser().parse(arguments);
 
+        case BmiCommand.COMMAND_WORD:
+            return new BmiCommand();
+
         case RoutineDeleteExerciseCommand.COMMAND_WORD:
             return new RoutineDeleteExerciseCommandParser().parse(arguments);
 

src/main/java/seedu/address/logic/parser/ParserUtil.java

@@ -173,19 +173,19 @@ public static Set<Tag> parseTags(Collection<String> tags) throws ParseException
     /**
      * Parses {@code String height} into a {@code int}.
      */
-    public static int parseHeight(String height) {
+    public static double parseHeight(String height) {
         requireNonNull(height);
         String trimmedHeight = height.trim();
-        return Integer.parseInt(trimmedHeight);
+        return Double.parseDouble(trimmedHeight);
     }
 
     /**
      * Parses {@code String weight} into a {@code int}.
      */
-    public static int parseWeight(String weight) {
+    public static double parseWeight(String weight) {
         requireNonNull(weight);
         String trimmedWeight = weight.trim();
-        return Integer.parseInt(trimmedWeight);
+        return Double.parseDouble(trimmedWeight);
     }
 
 }

src/main/java/seedu/address/model/AddressBook.java

@@ -26,8 +26,8 @@ public class AddressBook implements ReadOnlyAddressBook {
     private final UniqueExerciseList exercises;
     private final UniqueRoutineList routines;
     private final UniqueLessonList lessons;
-    private int height;
-    private int weight;
+    private double height = Double.NaN;
+    private double weight = Double.NaN;
     private final Timetable timetable;
 
     /*
@@ -58,16 +58,26 @@ public AddressBook(ReadOnlyAddressBook toBeCopied) {
 
     //// user-level operations
 
-    public void addHeight(int height) {
+    /**
+     * Adds the height of the user.
+     *
+     * @param height the height of the user.
+     */
+    public void addHeight(double height) {
         this.height = height;
     }
 
-    public void addWeight(int weight) {
+    /**
+     * Adds the weight of the user.
+     *
+     * @param weight the weight of the user.
+     */
+    public void addWeight(double weight) {
         this.weight = weight;
     }
 
     public double getBmi() {
-        return weight / Math.pow((height / 100.0), 2);
+        return this.weight / Math.pow((this.height / 100.0), 2);
     }
 
     //// list overwrite operations
@@ -123,6 +133,8 @@ public void resetData(ReadOnlyAddressBook newData) {
         setLessons(newData.getLessonList());
         setRoutines(newData.getRoutineList());
         setSlots(newData.getSlotList());
+        addHeight(newData.getHeight());
+        addWeight(newData.getWeight());
     }
 
     //// person-level operations
@@ -161,6 +173,7 @@ public boolean hasLesson(Lesson lesson) {
 
     /**
      * Returns true if the slot is already occupied in the timetable.
+     *
      * @param slot The slot to be checked.
      * @return true if the slot is already occupied in the timetable.
      */
@@ -171,6 +184,7 @@ public boolean hasSlot(Slot slot) {
 
     /**
      * Returns true if the slot has overlapping duration with another slot in the timetable.
+     *
      * @param slot The slot to be checked.
      * @return true if the slot has overlapping duration with another slot in the timetable.
      */
@@ -318,6 +332,16 @@ public ObservableList<Slot> getSlotList() {
         return timetable.getSlotList();
     }
 
+    @Override
+    public double getHeight() {
+        return height;
+    }
+
+    @Override
+    public double getWeight() {
+        return weight;
+    }
+
     @Override
     public boolean equals(Object other) {
         return other == this // short circuit if same object
@@ -367,6 +391,7 @@ public void addExerciseToRoutine(Routine r, Exercise e) {
 
     /**
      * Adds a Slot to the Timetable in fitNUS.
+     *
      * @param slot The slot to be added.
      */
     public void addSlotToTimetable(Slot slot) {
@@ -375,6 +400,7 @@ public void addSlotToTimetable(Slot slot) {
 
     /**
      * Retrieves the Lesson object from UniqueLessonList that the user specified.
+     *
      * @param lesson Lesson object that the user wants.
      * @return Lesson object that exists within fitNUS that the user is looking for.
      */
@@ -384,6 +410,7 @@ public Lesson retrieveLesson(Lesson lesson) {
 
     /**
      * Retrieves the Routine object from UniqueRoutineList that the user specified.
+     *
      * @param routine Routine object that the user wants.
      * @return Routine object that exists within fitNUS that the user is looking for.
      */

src/main/java/seedu/address/model/Model.java

@@ -25,7 +25,9 @@ public interface Model {
      */
     Predicate<Exercise> PREDICATE_SHOW_ALL_EXERCISES = unused -> true;
 
-    /** {@code Predicate} that always evaluate to true */
+    /**
+     * {@code Predicate} that always evaluate to true
+     */
     Predicate<Routine> PREDICATE_SHOW_ALL_ROUTINES = unused -> true;
 
     Predicate<Lesson> PREDICATE_SHOW_ALL_LESSONS = unused -> true;
@@ -147,6 +149,7 @@ public interface Model {
 
     /**
      * Updates the filter of the filtered lesson list to filter by the given {@code predicate}.
+     *
      * @throws NullPointerException if {@code predicate} is null.
      */
     void updateFilteredLessonList(Predicate<Lesson> predicate);
@@ -206,13 +209,18 @@ public interface Model {
     void deleteRoutine(Routine target);
 
     boolean hasSlot(Slot slot);
+
     boolean hasOverlappingSlot(Slot slot);
+
     void addSlotToTimetable(Slot slot);
+
     void deleteSlotFromTimetable(Slot target);
 
-    void addHeight(int height);
+    void addHeight(double height);
+
+    void addWeight(double weight);
 
-    void addWeight(int weight);
+    double getBmi();
 
     /**
      * Returns true if a lesson with the same details as {@code lesson} exists in timetable.
@@ -239,13 +247,15 @@ public interface Model {
 
     /**
      * Retrieves the Lesson object from UniqueLessonList that the user specified.
+     *
      * @param lesson Lesson object that the user wants.
      * @return Lesson object that exists within fitNUS that the user is looking for.
      */
     Lesson retrieveLesson(Lesson lesson);
 
     /**
      * Retrieves the Routine object from UniqueRoutineList that the user specified.
+     *
      * @param routine Routine object that the user wants.
      * @return Routine object that exists within fitNUS that the user is looking for.
      */

src/main/java/seedu/address/model/ModelManager.java

@@ -202,15 +202,20 @@ public String listRoutines() {
     }
 
     @Override
-    public void addHeight(int height) {
+    public void addHeight(double height) {
         addressBook.addHeight(height);
     }
 
     @Override
-    public void addWeight(int weight) {
+    public void addWeight(double weight) {
         addressBook.addWeight(weight);
     }
 
+    @Override
+    public double getBmi() {
+        return addressBook.getBmi();
+    }
+
     /**
      * Adds a Lesson into fitNUS.
      *
@@ -272,6 +277,7 @@ public void viewRoutine(Routine r) {
     }
 
     //=========== Filtered Person List Accessors =============================================================
+
     /**
      * Returns an unmodifiable view of the list of {@code Person} backed by the internal list of
      * {@code versionedAddressBook}
@@ -280,6 +286,7 @@ public void viewRoutine(Routine r) {
     public ObservableList<Routine> getFilteredRoutineList() {
         return filteredRoutine;
     }
+
     /**
      * Returns an unmodifiable view of the list of {@code Person} backed by the internal list of
      * {@code versionedAddressBook}
@@ -330,6 +337,7 @@ public void updateFilteredRoutineList(Predicate<Routine> predicate) {
         requireNonNull(predicate);
         filteredRoutine.setPredicate(predicate);
     }
+
     @Override
     public void updateFilteredPersonList(Predicate<Person> predicate) {
         requireNonNull(predicate);