steven/csep-2025
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

backend stuff for ingredients and nutritions AND FIXED MAGIC NUMBERS and fixed stevens and oskarsss problems

Browse source
This commit is contained in:
Aysegul Aydinlik 2025-12-05 00:30:12 +01:00
commit 1c9ff190ea
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
commons/src/main/java/commons/RecipeIngredient.java
View file

@ -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;

4
commons/src/main/java/commons/Unit.java
View file

@ -51,6 +51,10 @@ public final class Unit {
return formal;
}
public boolean isInformal() {
return !formal;
} //for oskar
@Override
public String toString() {
return name;