Module:JI ratios in ED: Difference between revisions

Ganaram inukshuk (talk | contribs)
mNo edit summary
Ganaram inukshuk (talk | contribs)
Switched to no-equave-factors tenney height
Line 62: Line 62:
-- Primary function
-- Primary function
function p.find_ratios_in_ed(input_et, primes, tenney_height, denominator_limit)
function p.find_ratios_in_ed(input_et, primes, tenney_height, denominator_limit)
local input_et = input_et or et.parse("12edo")
local input_et = input_et or et.parse("12ed5/2")
local primes = primes or { 2, 3, 5, 7 }
local primes = primes or { 2, 3, 5, 7 }
local tenney_height = tenney_height or 10
local tenney_height = tenney_height or 10
Line 70: Line 70:
local steps = input_et['size']
local steps = input_et['size']
local equave = input_et['equave']
local equave = input_et['equave']
if tonumber(equave) ~= nil then
equave = rat.new(equave)
end
local et_as_string = et.as_string(input_et)
local et_as_string = et.as_string(input_et)
Line 127: Line 130:
-- Tenney height
-- Tenney height
prime_filtered_ratios = jiraf.filter_ratios_by_harmonic_class(filtered_ratios, current_prime)
prime_filtered_ratios = jiraf.filter_ratios_by_harmonic_class(filtered_ratios, current_prime)
prime_filtered_ratios = jiraf.filter_ratios_by_complement_agnostic_tenney_height(prime_filtered_ratios, tenney_height, equave)
prime_filtered_ratios = jiraf.filter_ratios_by_no_equave_factors_tenney_height(prime_filtered_ratios, tenney_height, equave)
end
end