diff --git a/commons/src/main/java/commons/RecipeIngredient.java b/commons/src/main/java/commons/RecipeIngredient.java index c94d8dd..36488d9 100644 --- a/commons/src/main/java/commons/RecipeIngredient.java +++ b/commons/src/main/java/commons/RecipeIngredient.java @@ -65,14 +65,11 @@ public class RecipeIngredient { }; } - public boolean isInformal() { - Unit unit = getUnit(); - return unit != null && !unit.isFormal(); - } + public double amountInBaseUnit() { Unit unit = getUnit(); - if (unit == null || !unit.isFormal() || unit.conversionFactor <= 0) { + if (unit == null || unit.isFormal() || unit.conversionFactor <= 0) { return 0.0; } return amount * unit.conversionFactor; diff --git a/commons/src/main/java/commons/Unit.java b/commons/src/main/java/commons/Unit.java index 5233121..05c174e 100644 --- a/commons/src/main/java/commons/Unit.java +++ b/commons/src/main/java/commons/Unit.java @@ -51,6 +51,10 @@ public final class Unit { return formal; } + public boolean isInformal() { + return !formal; + } //for oskar + @Override public String toString() { return name;