Mercurial > bmsapp / file diff

--- a/src/Utils.h	Tue Jul 26 19:46:44 2022 +0200
+++ b/src/Utils.h	Fri Jul 29 13:12:26 2022 +0200
@@ -65,16 +65,19 @@
      * @param T1 in minutes start of time window
      * @param T2 in minutes end of time window
      * @param Alpha in procent
+     * @param Utilisation Hop extract utilisation
+     * @param BU_factor Bitterness Unit multiply factor
      * @return The calculated IBU's
      */
-    double TinsethIBU(int Form, double SG, double Volume, double Amount, double T1, double T2, double Alpha);
+    double TinsethIBU(int Form, double SG, double Volume, double Amount, double T1, double T2, double Alpha, double Utilisation, double BU_factor);
 
     /**
      * @brief Calculate IBU's of a hop during the whole production process.
      * @param Use HOP_USEAT_MASH HOP_USEAT_FWH HOP_USEAT_BOIL HOP_USEAT_AROMA HOP_USEAT_WHIRLPOOL HOP_USEAT_DRY_HOP HOP_USEAT_BOTTLING
      * @param Form HOP_FORMS_PELLET HOP_FORMS_PLUG HOP_FORMS_LEAF HOP_FORMS_LEAF_WET HOP_FORMS_CRYO HOP_FORMS_EXTRACT
-     * @param SG the density
-     * @param Volume in liters
+     * @param preSG the density pre boil.
+     * @param postSG the density after the boil.
+     * @param Volume in liters after boil.
      * @param Amount in kilograms
      * @param Boiltime in minutes
      * @param Alpha in procent
@@ -86,14 +89,35 @@
      * @param Cooltype 0 = N/A, 1 = Emersion chiller, 2 = Counterflow, 3 = Au bain marie, 4 = natural
      * @param Coolparm1 to define later
      * @param Coolparm2 to define later
+     * @param Utilisation Hop extract utilisation
+     * @param BU_factor Bitterness Unit multiply factor
      * @return The calculated IBU's
      */
-    double toIBU(int Use, int Form, double SG, double Volume, double Amount, double Boiltime, double Alpha,
+    double toIBU(int Use, int Form, double preSG, double postSG, double Volume, double Amount, double Boiltime, double Alpha,
                  int Method, double Whirlpool9, double Whirlpool7, double Whirlpool6, double Fulltime,
-		 int Cooltype, double Coolparm1, double Coolparm2);
+		 int Cooltype, double Coolparm1, double Coolparm2, double Utilisation, double BU_factor);
 
-    double hopFlavourContribution(double bt, double vol, int use, double amount);
-    double hopAromaContribution(double bt, double vol, int use, double amount);
+    /**
+     * @brief Estimate hop flavour contribution.
+     * @param bt Boil time in minutes.
+     * @param vol Volume of the wort.
+     * @param use Hop use moment.
+     * @param amount The amount in kg.
+     * @param form The hop form.
+     * @return A number indicating a contribution factor.
+     */
+    double hopFlavourContribution(double bt, double vol, int use, double amount, int form);
+
+    /**
+     * @brief Estimate hop aroma contribution.
+     * @param bt Boil time in minutes.
+     * @param vol Volume of the wort.
+     * @param use Hop use moment.
+     * @param amount The amount in kg.
+     * @param form The hop form.
+     * @return A number indicating a contribution factor.
+     */
+    double hopAromaContribution(double bt, double vol, int use, double amount, int form);
     QString hours_to_string(int hours);
     double kettle_cm(double volume, double kettle_volume, double kettle_height);
     double kettle_vol(double cm, double kettle_volume, double kettle_height);