diff -r f4e00869f39f -r a4a9f6ded485 www/js/global.js --- a/www/js/global.js Sat Apr 18 11:12:28 2020 +0200 +++ b/www/js/global.js Sat Apr 18 14:45:41 2020 +0200 @@ -747,38 +747,7 @@ ], url: 'includes/db_profile_mash.php' }, -mashlist = new $.jqx.dataAdapter(mashProfileSource), - - - -/* - * From "Rekenen aan bier" by Hans Halberstadt. - */ -K1s = 0.384, K1a = -0.177, K1e = 0.241, K1g = 0.247, Ks = 0.1415, Ka1 = 0.058, Ka2 = 0.078, Ke = 0.174, Kg = 0.109; - -// =E2/E6+(E3/E6)*$B$24/$B$23+(E3/E6)*(E3/E6)*$B$25/$B$23+E4/E6*$B$26/$B$23+E5/E6*$B$27/$B$23 -// For Brix -function A(sugar, volume, alc, eiwit, glycerol) { - - var vol, A; - - vol = volume * 1000; - A = sugar / vol + (alc / vol) * Ka1 / Ks + (alc / vol) * (alc / vol) * Ka2 / Ks + eiwit / vol * Ke / Ks + glycerol / vol * Kg / Ks; - console.log('A(' + sugar + ',' + volume + ',' + alc + ',' + eiwit + ',' + glycerol + '):' + A); - return A; -} - -// =E2/E6+(E3/E6)*$B$20/$B$19+E4/E6*$B$21/$B$19+E5/E6*$B$22/$B$19 -// for Plato -function B(sugar, volume, alc, eiwit, glycerol) { - - var vol, B; - - vol = volume * 1000; - B = sugar / vol + (alc / vol) * K1a / K1s + eiwit / vol * K1e / K1s + glycerol / vol * K1g / K1s; - console.log('B(' + sugar + ',' + volume + ',' + alc + ',' + eiwit + ',' + glycerol + '):' + B); - return B; -} +mashlist = new $.jqx.dataAdapter(mashProfileSource);