Module:Harmonic entropy: Difference between revisions

← Older edit

@@ Line 1: / Line 1: @@
--- TODO: this module should just be called harmonic entropy!
 local limits = require("Module:Limits")
 local rat = require("Module:Rational")
 local p = {}
--- compute harmonic Shannon entropy for an interval of `c` cents
+-- Compute Harmonic Shannon entropy for an interval of `c` cents
 -- `c`, `deviation`: in cents
 -- `ratios`: an array of rational numbers
@@ Line 12: / Line 11: @@
 		return math.sqrt(rat.benedetti_height(ratio))
 	end
-	deviation = deviation or 0.01
+	deviation = deviation or 1200 * math.log(1.01, 2)
 	ratios = ratios
 		or limits.integer_limit(200, function(ratio)
-			if math.abs(ratio[0] * 2^(c / 1200)) > 3 * deviation then
+			if math.abs(rat.cents(ratio) - c) > 3 * deviation then
 				return 1 / 0
 			end
@@ Line 26: / Line 25: @@
 	local function weighted_gaussian(ratio)
-		return gaussian(ratio[0] * 2^(c / 1200)) / norm(ratio)
+		return gaussian(rat.cents(ratio) - c) / norm(ratio)
 	end