--- a/src/Utils.cpp Fri Jul 29 20:59:21 2022 +0200 +++ b/src/Utils.cpp Sat Jul 30 16:30:02 2022 +0200 @@ -395,7 +395,6 @@ { double alpha = Alpha / 100.0; double mass = Amount * 1000.0; - double ibu = 0.0; /* * Basic Glenn Tinseth formula. @@ -410,23 +409,10 @@ double Bigness_factor = 1.65 * pow(0.000125, SG - 1); double BoilTime_factor1 = ((1 - exp(-0.04 * T1)) / kUtilisation); double BoilTime_factor2 = ((1 - exp(-0.04 * T2)) / kUtilisation); - ibu = Bigness_factor * (BoilTime_factor2 - BoilTime_factor1) * AddedAlphaAcids; - qDebug() << "TinsethIBU" << SG << Amount << Alpha << Volume << kUtilisation << Bigness_factor * (BoilTime_factor2 - BoilTime_factor1) << "ibu:" << ibu; + double ibu = Bigness_factor * (BoilTime_factor2 - BoilTime_factor1) * AddedAlphaAcids; + //qDebug() << "TinsethIBU" << SG << Amount << Alpha << Volume << kUtilisation << Bigness_factor * (BoilTime_factor2 - BoilTime_factor1) << "ibu:" << ibu; - /* - * Correction for hop forms - */ - if (Form == HOP_FORMS_PELLET) { - ibu *= (1 + my_factor_pellet / 100.0); - } else if (Form == HOP_FORMS_PLUG) { - ibu *= (1 + my_factor_plug / 100.0); - } else if (Form == HOP_FORMS_LEAF_WET) { - ibu *= (1 + my_factor_wethop / 100.0); // From https://github.com/chrisgilmerproj/brewday/blob/master/brew/constants.py - } else if (Form == HOP_FORMS_CRYO) { - ibu *= (1 + my_factor_cryohop / 100.0); - } - - qDebug() << "boilIBU" << Form << SG << Volume << Amount << BoilTime_factor2 << BoilTime_factor1 << Alpha << "IBU:" << ibu; + //qDebug() << "boilIBU" << Form << SG << Volume << Amount << BoilTime_factor2 << BoilTime_factor1 << Alpha << "IBU:" << ibu; return ibu; }