Module:MOS intervals: Difference between revisions

Line 50:

result = result .. '! rowspan="2" | Steps subtended\n'

result = result .. '! rowspan="2" | Range in cents\n'

result = result .. '! rowspan="2" | [[Harmonic entropy]]<br/>(Shannon, ~~<math>\\sqrt{n\\cdot d}</math>~~)\n'

result = result .. '! rowspan="2" | [[Harmonic entropy]]<br/>(Shannon, √nd)\n'

result = result .. '|-\n'

result = result .. '! Generic<sup>[[#mosstep-1|[1]]]</sup>\n'

Line 76:

result = result .. string.format("| %s\n" , mos.interval_as_string(current_bright_interval))

result = result .. string.format("| %.1f¢\n", cents)

result = result .. string.format("| %.6f nats\n", 0)

result = result .. string.format("| ~%.3f nats\n", interval_extension.harmonic_entropy_with_lookup_table(cents))

else

-- Calculate the best and average harmonic entropies

Line 114:

result = result .. string.format("| %s\n" , mos.interval_as_string(current_dark_interval))

result = result .. string.format("| %s\n" , dark_interval_range)

result = result .. string.format("| %.~~6f¢~~ nats (average), %.~~6f¢~~ nats (min)\n" , he_dark_average, he_dark_best)

result = result .. string.format("| ~%.3f¢ nats (average), ~%.3f¢ nats (min)\n" , he_dark_average, he_dark_best)

result = result .. "|-\n"

Line 121:

result = result .. string.format("| %s\n" , mos.interval_as_string(current_bright_interval))

result = result .. string.format("| %s\n" , bright_interval_range)

result = result .. string.format("| %.~~6f¢~~ nats (average), %.~~6f¢~~ nats (min)\n" , he_bright_average, he_bright_best)

result = result .. string.format("| ~%.3f¢ nats (average), ~%.3f¢ nats (min)\n" , he_bright_average, he_bright_best)

end

@@ Line 50: / Line 50: @@
 	result = result .. '! rowspan="2" | Steps subtended\n'
 	result = result .. '! rowspan="2" | Range in cents\n'
-	result = result .. '! rowspan="2" | [[Harmonic entropy]]<br/>(Shannon, <math>\\sqrt{n\\cdot d}</math>)\n'
+	result = result .. '! rowspan="2" | [[Harmonic entropy]]<br/>(Shannon, √nd)\n'
 	result = result .. '|-\n'
 	result = result .. '! Generic<sup>[[#mosstep-1|[1]]]</sup>\n'
@@ Line 76: / Line 76: @@
 			result = result .. string.format("| %s\n" , mos.interval_as_string(current_bright_interval))
 			result = result .. string.format("| %.1f¢\n", cents)
-			result = result .. string.format("| %.6f nats\n", 0)
+			result = result .. string.format("| ~%.3f nats\n", interval_extension.harmonic_entropy_with_lookup_table(cents))
 		else
 			-- Calculate the best and average harmonic entropies
@@ Line 114: / Line 114: @@
 			result = result .. string.format("| %s\n" , mos.interval_as_string(current_dark_interval))
 			result = result .. string.format("| %s\n" , dark_interval_range)
-			result = result .. string.format("| %.6f¢ nats (average), %.6f¢ nats (min)\n" , he_dark_average, he_dark_best)
+			result = result .. string.format("| ~%.3f¢ nats (average), ~%.3f¢ nats (min)\n" , he_dark_average, he_dark_best)
 			result = result .. "|-\n"
@@ Line 121: / Line 121: @@
 			result = result .. string.format("| %s\n" , mos.interval_as_string(current_bright_interval))
 			result = result .. string.format("| %s\n" , bright_interval_range)
-			result = result .. string.format("| %.6f¢ nats (average), %.6f¢ nats (min)\n" , he_bright_average, he_bright_best)
+			result = result .. string.format("| ~%.3f¢ nats (average), ~%.3f¢ nats (min)\n" , he_bright_average, he_bright_best)
 		end