From 3a0120dc333ae9823e2a78907bf21d200a43c7b2 Mon Sep 17 00:00:00 2001
From: Steven Liu <z.liu-74@student.tudelft.nl>
Date: Wed, 21 Jan 2026 15:53:58 +0100
Subject: [PATCH] fix: getting to it

---
 commons/src/main/java/commons/FormalIngredient.java | 4 ++--
 commons/src/main/java/commons/Recipe.java           | 4 ++--
 commons/src/main/java/commons/RecipeIngredient.java | 4 ++--
 commons/src/main/java/commons/VagueIngredient.java  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/commons/src/main/java/commons/FormalIngredient.java b/commons/src/main/java/commons/FormalIngredient.java
index 317a7d9..2c5c055 100644
--- a/commons/src/main/java/commons/FormalIngredient.java
+++ b/commons/src/main/java/commons/FormalIngredient.java
@@ -78,13 +78,13 @@ public class FormalIngredient extends RecipeIngredient implements Scalable<Forma
     }
 
     @Override
-    public double kcal() {
+    public double getKcal() {
         final double PER_GRAMS = 100;
         return ingredient.kcalPer100g() * amountInBaseUnit() / PER_GRAMS;
     }
 
     @Override
-    public double amount() {
+    public double getBaseAmount() {
         return amountInBaseUnit();
     }
 }
diff --git a/commons/src/main/java/commons/Recipe.java b/commons/src/main/java/commons/Recipe.java
index fbe1630..3828fde 100644
--- a/commons/src/main/java/commons/Recipe.java
+++ b/commons/src/main/java/commons/Recipe.java
@@ -202,8 +202,8 @@ public class Recipe {
     public double kcal() {
         final double PER = 100; // Gram
         return
-                this.ingredients.stream().mapToDouble(RecipeIngredient::kcal).sum() /
-                this.ingredients.stream().mapToDouble(RecipeIngredient::amount).sum() * PER;
+                this.ingredients.stream().mapToDouble(RecipeIngredient::getKcal).sum() /
+                this.ingredients.stream().mapToDouble(RecipeIngredient::getBaseAmount).sum() * PER;
     }
 
 }
\ No newline at end of file
diff --git a/commons/src/main/java/commons/RecipeIngredient.java b/commons/src/main/java/commons/RecipeIngredient.java
index d228a70..fdad4ef 100644
--- a/commons/src/main/java/commons/RecipeIngredient.java
+++ b/commons/src/main/java/commons/RecipeIngredient.java
@@ -92,6 +92,6 @@ public abstract class RecipeIngredient {
     public int hashCode() {
         return Objects.hash(id, ingredient);
     }
-    public abstract double kcal();
-    public abstract double amount();
+    public abstract double getKcal();
+    public abstract double getBaseAmount();
 }
diff --git a/commons/src/main/java/commons/VagueIngredient.java b/commons/src/main/java/commons/VagueIngredient.java
index 0d3056f..1c4cbac 100644
--- a/commons/src/main/java/commons/VagueIngredient.java
+++ b/commons/src/main/java/commons/VagueIngredient.java
@@ -52,11 +52,11 @@ public class VagueIngredient extends RecipeIngredient {
     }
 
     @Override
-    public double kcal() {
+    public double getKcal() {
         return 0;
     }
     @Override
-    public double amount() {
+    public double getBaseAmount() {
         return 0;
     }
 }