diff -r 5a2ec06e00d4 -r dc37f2b0a00b www/js/global.js --- a/www/js/global.js Mon Jul 05 15:48:34 2021 +0200 +++ b/www/js/global.js Mon Jul 05 20:59:10 2021 +0200 @@ -1102,18 +1102,15 @@ // from http://seanterrill.com FGnc = new cubic var FBc = FBrix / my_brix_correction; - //console.log('Correction ' + my_brix_correction + ' OPt ' + OPt + ' FBrix ' + FBrix + ' FBc ' + FBc); - // New cubic by Sean Terrill. - var FGnc = Round(1 - 0.0044993 * (OPt) + 0.0117741 * (FBc) + - 0.000275806 * (OPt * OPt) - 0.00127169 * (FBc * FBc) - - 0.00000727999 * Math.pow(OPt, 3) + 0.0000632929 * Math.pow(FBc, 3), 4); + // New cubic by Sean Terrill. Not good enough. + //var FGnc=Round(1-0.0044993*(OPt)+0.0117741*(FBc)+0.000275806*(OPt*OPt)-0.00127169*(FBc*FBc)-0.00000727999*Math.pow(OPt,3)+0.0000632929*Math.pow(FBc,3),4); // Petr Novotny, Zymurgy July/August 2017. Used by Brewers Friend. var FGbf = Round(1 + 0.006276 * FBc - 0.002349 * OPt, 4); // The real battle is now between Brouwhulp and Petr Novotny. - console.log('brix_to_fg(' + Round(OPt, 2) + ', ' + FBrix + ') FGbh:' + FGbh + ' FGnc:' + FGnc + ' FGbf:' + FGbf); + console.log('brix_to_fg(' + Round(OPt, 2) + ', ' + FBrix + ') FGbh:' + FGbh + ' FGbf:' + FGbf); return FGbf; }