Module:JI ratios in ED: Difference between revisions
m Bugfix?! (this module doesn't use the harmonic entropy module) |
ArrowHead294 (talk | contribs) mNo edit summary |
||
| Line 1: | Line 1: | ||
local utils = require( | local utils = require("Module:Utils") | ||
--local interval = require('Module:Harmonic entropy') | --local interval = require('Module:Harmonic entropy') | ||
local rat = require( | local rat = require("Module:Rational") | ||
local jiraf = require( | local jiraf = require("Module:JI ratio finder") | ||
local tip = require( | local tip = require("Module:Template input parse") | ||
local et = require( | local et = require("Module:ET") | ||
local p = {} | local p = {} | ||
| Line 58: | Line 58: | ||
-- Table headers | -- Table headers | ||
local step_in_cents = (step / steps) * rat.cents(equave) | local step_in_cents = (step / steps) * rat.cents(equave) | ||
result = result .. string.format( | result = result .. string.format("| %d\n", step) | ||
result = result .. string.format( | result = result .. string.format("| %.3f\n", step_in_cents) | ||
-- If this is the first or last step, only use the unison or equave | -- If this is the first or last step, only use the unison or equave | ||
| Line 87: | Line 87: | ||
local ratios_as_text = jiraf.ratios_to_text(prime_filtered_ratios, "<br>", true) | local ratios_as_text = jiraf.ratios_to_text(prime_filtered_ratios, "<br>", true) | ||
result = result .. string.format( | result = result .. string.format("| %s\n", ratios_as_text) | ||
end | end | ||
result = result .. string.format( | result = result .. string.format("|-\n") | ||
end | end | ||
return result | return result | ||
| Line 104: | Line 104: | ||
-- Get the number of divisions, equave, and et as text (eg edo, edt, etc) | -- Get the number of divisions, equave, and et as text (eg edo, edt, etc) | ||
local steps = input_et[ | local steps = input_et["size"] | ||
local equave = input_et[ | local equave = input_et["equave"] | ||
if tonumber(equave) ~= nil then | if tonumber(equave) ~= nil then | ||
equave = rat.new(equave) | equave = rat.new(equave) | ||
| Line 127: | Line 127: | ||
-- Build table headers | -- Build table headers | ||
local result = | local result = "{| class=\"wikitable center-all\"\n" | ||
.. "|+ style=\"font-size: 105%;\" | " | |||
.. string.format("Intervals of %s (as a %d-limit temperament)\n", et_as_string, prime_limit) | |||
.. "|-\n" | |||
.. "! rowspan=\"2\" | [[Degree]]\n" | |||
.. "! rowspan=\"2\" | [[Cent]]s\n" | |||
.. string.format("! colspan=\"%d\" | Approximated [[JI]] intervals\n", #primes) | |||
.. "|-\n" | |||
-- Build header cells for each prime limit | -- Build header cells for each prime limit | ||
for i = 1, #primes do | for i = 1, #primes do | ||
result = result .. string.format( | result = result .. string.format("! [[%d-limit]]\n", primes[i]) | ||
end | end | ||
result = result .. string.format( | result = result .. string.format("|-\n") | ||
-- Add rest of table | -- Add rest of table | ||
result = result .. p.ji_ratio_in_ed_content_cells(steps, equave, candidate_ratios, primes, tolerance) | result = result .. p.ji_ratio_in_ed_content_cells(steps, equave, candidate_ratios, primes, tolerance) | ||
result = result .. string.format( | result = result .. string.format("|}\n") | ||
return result | return result | ||
end | end | ||
| Line 157: | Line 158: | ||
-- Get the number of divisions, equave, and et as text (eg edo, edt, etc) | -- Get the number of divisions, equave, and et as text (eg edo, edt, etc) | ||
local steps = input_et[ | local steps = input_et["size"] | ||
local equave = input_et[ | local equave = input_et["equave"] | ||
if tonumber(equave) ~= nil then | if tonumber(equave) ~= nil then | ||
equave = rat.new(equave) | equave = rat.new(equave) | ||
| Line 180: | Line 181: | ||
-- Build table headers | -- Build table headers | ||
local result = | local result = "{| class=\"wikitable center-all\"\n" | ||
.. "|+ style=\"font-size: 105%;\" | " | |||
.. string.format("Intervals of %s (as a %s subgroup temperament)\n", et_as_string, subgroup_as_text) | |||
.. "|-\n" | |||
.. "! rowspan=\"2\" | [[Degree]]\n" | |||
.. "! rowspan=\"2\" | [[Cent]]s\n" | |||
.. string.format("! colspan=\"%d\" | Approximated [[JI]] intervals\n", #primes) | |||
.. "|-\n" | |||
-- Build header cells for each prime limit | -- Build header cells for each prime limit | ||
for i = 1, #primes do | for i = 1, #primes do | ||
result = result .. string.format( | result = result .. string.format("! [[%d-limit]]\n", primes[i]) | ||
end | end | ||
result = result .. | result = result .. "|-\n" | ||
-- Add rest of table | -- Add rest of table | ||
result = result .. p.ji_ratio_in_ed_content_cells(steps, equave, candidate_ratios, primes, tolerance) | result = result .. p.ji_ratio_in_ed_content_cells(steps, equave, candidate_ratios, primes, tolerance) | ||
result = result .. string.format( | result = result .. string.format("|}\n") | ||
return result | return result | ||
end | end | ||
| Line 218: | Line 220: | ||
local temperament_type = "Prime Limit" | local temperament_type = "Prime Limit" | ||
if string.len(frame.args["Subgroup"]) > 0 then | if string.len(frame.args["Subgroup"]) > 0 then | ||
primes = tip.parse_numeric_entries(frame.args["Subgroup"], | primes = tip.parse_numeric_entries(frame.args["Subgroup"], ".") or tip.parse_numeric_entries(frame.args["Subgroup"], ",") | ||
temperament_type = "Subgroup" | temperament_type = "Subgroup" | ||
end | end | ||