Module:JI ratios in ED: Difference between revisions

Ganaram inukshuk (talk | contribs)
mNo edit summary
Ganaram inukshuk (talk | contribs)
Switched to subgroup search; 2- and 3-limit ratios are now separated in their own columns
Line 8: Line 8:
function p.find_ratios_in_ed_by_primes(ed, primes, equave, tenney_height, denominator_limit)
function p.find_ratios_in_ed_by_primes(ed, primes, equave, tenney_height, denominator_limit)
local ed = ed or 7
local ed = ed or 7
local primes = primes or { 3, 5, 7, 11, 13, 17, 19 }
local primes = primes or { 2, 3, 7, 11 }
local equave = equave or rat.new(3, 2)
local equave = equave or rat.new(3, 2)
local tenney_height = tenney_height or 10
local tenney_height = tenney_height or 10
Line 18: Line 18:
-- Find candidate ratios; filter later
-- Find candidate ratios; filter later
local max_prime = primes[#primes]
local max_prime = primes[#primes]
local candidate_ratios = jiraf.find_candidate_ratios(equave_in_cents, denominator_limit, max_prime)
local candidate_ratios = jiraf.find_candidate_ratios_within_subgroup(equave_in_cents, denominator_limit, primes)
-- Equave as text
-- Equave as text
Line 123: Line 123:
local equave = p.parse_equave(frame.args["ED"])
local equave = p.parse_equave(frame.args["ED"])


local primes = { 3, 5, 7, 11, 13 }
local primes = { 2, 3, 5, 7, 11, 13 }
if string.len(frame.args["Primes"]) > 0 then
if string.len(frame.args["Primes"]) > 0 then
primes = tip.parse_numeric_entries(frame.args["Primes"], ',')
primes = tip.parse_numeric_entries(frame.args["Primes"], ',')