Xenharmonic Wiki

Module:JI ratios: Difference between revisions

← Older edit
Ganaram inukshuk (talk | contribs)
autopatrolled, emailconfirmed
6,211 edits
m as a temporary fix, set default tenney height to positive infinity, and complements-only to false
Ganaram inukshuk (talk | contribs)
autopatrolled, emailconfirmed
6,211 edits
m comments
 
(24 intermediate revisions by 2 users not shown)
Line 1: Line 1:
-- This module follows [[User:Ganaram inukshuk/Provisional style guide for Lua]]
local getArgs = require("Module:Arguments").getArgs
local med = require("Module:Mediants")
local rat = require("Module:Rational")
local rat = require("Module:Rational")
local tip = require("Module:Template input parse")
local utils = require("Module:Utils")
local utils = require("Module:Utils")
local tip = require("Module:Template input parse")
local med = require("Module:Mediants")
local yesno = require("Module:Yesno")
local yesno = require("Module:Yesno")
local getArgs = require("Module:Arguments").getArgs
p = {}


-- TODO
local p = {}
-- - Move filtering functions to separate module?
-- - Transfer control over to new "main" function: p.ji_ratios()


-- Template for handling multiple entry of JI ratios into a template, and for
-- Template for handling multiple entry of JI ratios into a template, and for
Line 15: Line 13:
-- This is a successor/replacement for JI ratio finder.
-- This is a successor/replacement for JI ratio finder.


-- JI ratios are searched by the following params in a hierarchy:
-- TODO: Refactor code such that:
-- - Search by prime limit. Int limit is used to limit the num/den of ratios.
-- - For int-limit search, int limit is the first arg, and equave and min/max
--  Prime limit takes precedence over subgroup.
--  cents default to 2/1, 0c, and 1200c respectively.
-- - Search by subgroup. (Subgroup may contain nonprime numbers, but ratios are
--   (int_limit, equave)
--  currently not supported.) Int limit is used to limit the num/den of ratios.
--  (int_limit, min_cents, max_cents)
-- - If neither prime limit or subgroup is present, search by int limit. This
-- - For odd-limit search, odd limit is the first arg, int limit defaults to
--  is considered the absolute minimum requirement for ratio searching.
--  twice the odd limit, and equave and min/max cents default to 2/1, 0c, and
-- NOTES:
--  1200c respectively.
-- - Prime limits are infinite sets, so int limit is used to restrain the set
--  (odd_limit, int_limit, equave)
--  to a finite size. The same is true for subgroup.
--  (odd_limit, int_limit, min_cents, max_cents)
-- - Tenney height is used for further filtering of ratios, and is considered
-- - For prime-limit search, prime-limit is the first arg, int limit defaults to
--  optional. If omitted, tenney height defaults to infinity.
--  twice the largest prime, and equave and min/max cents default to 2/1, 0c,
--  and 1200c respectively.
--   (prime_limit, int_limit, equave)
--  (prime_limit, int_limit, min_cents, max_cents)
-- - For subgroup search, subgroup is the first arg, there's no default value
--  for int limit (due to complexity of subgroups), and equave and min/max
--  cents default to 2/1, 0c, and 1200c respectively.
--  (subgroup, int_limit, equave)
--  (subgroup, int_limit, min_cents, max_cents)
-- - Filter ratios function is split into two:
--  - Filter ratios by complement removes ratios from a table if its complement
--    is missing. Complements are octave-complements by default.
--  - Filter ratios by tenney height removes ratios from a table if its tenney
--    height exceeds a passed-in value.


local DEFAULT_FINE_SEARCH_ARGS = {
-- TODO: write filter function for cent range
["Int Limit"]        = 50,
 
["Tenney Height"]    = 1/0,
-- Module searches for ratios that are, at the minimum, up to an equave and are
["Complements Only"] = false
-- up to some integer limit. Search hierarchy is as follows:
}
-- - Search by subgroup (subgroup elements may be nonprime or rational)
-- - Then search by prime limit
-- - Then search by odd limit
-- - Then search by int limit
 
-- Optional args omit ratios that don't meet certain conditions, and are used
-- to further limit the number of ratios found. Current options include:
-- - Tenney Height: omits ratios that exceed some max Tenney height. Has no
--  effect if no Tenney height is passed in.
-- - Complements Only: omits ratios and their equave complements if either would
--  be omitted by Tenney height, or if no Tenney height is entered, omits
--  ratios whose complements are missing.
 
local DEFAULT_EQUAVE = rat.new(2)
local DEFAULT_INT_LIMIT = 30


--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
Line 38: Line 63:
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------


-- Filter functions remove certain ratios that don't meet some requirement.
-- Filter function removes certain ratios that don't meet some requirement.
-- Filters currently include:
-- Filters currently include:
-- - Removing ratios that exceed a max Tenney height.
-- - Removing ratios that exceed a max Tenney height.
-- - Removing ratios whose complement would exceed a max Tenney height.
-- - Removing ratios whose complement would exceed a max Tenney height or int limit
 
function p.filter_ratios(ratios, equave, int_limit, tenney_height, complements_only)
-- Remove ratios whose complements exceed the int limit and Tenney height.
-- If filtering based on Tenney height is not needed, then Tenney height is set
local filtered_ratios = {}
-- to infinity instead, which should be done by the calling function.
for i = 1, #ratios do
function p.filter_ratios_by_complements(ratios, equave, fine_search_args)
local complement = rat.mul(rat.inv(ratios[i]), equave)
if fine_search_args["Complements Only"] then
local ratio_th  = rat.tenney_height(ratios[i])
local filtered_ratios = {}
local compl_th  = rat.tenney_height(complement)
for i = 1, #ratios do
local complement = rat.mul(rat.inv(ratios[i]), equave)
-- Are the ratios within the Tenney height?
if rat.int_limit(complement) <= fine_search_args["Int Limit"] and rat.tenney_height(complement) <= fine_search_args["Tenney Height"] then
-- Has no effect (defaults to TRUE) if Tenney height is infinity.
local ratio_within_th = ratio_th <= tenney_height
local compl_within_th = compl_th <= tenney_height
-- Is the ratio's complement within the int limit?
local compl_within_int_limit = rat.is_within_int_limit(complement, int_limit)
if complements_only then
if ratio_within_th and compl_within_th and compl_within_int_limit then
table.insert(filtered_ratios, ratios[i])
end
else
if ratio_within_th then
table.insert(filtered_ratios, ratios[i])
table.insert(filtered_ratios, ratios[i])
end
end
end
end
return filtered_ratios
else
return ratios
end
end
return filtered_ratios
end
end


-- Remove ratios that exceed the Tenney height. This does nothing if the Tenney
-- Filters ratios from a table of ratios, returning an array of ratios within
-- height is infinity.
-- the cent range and preserving the original table. Meant for searching for
function p.filter_ratios_by_tenney_height(ratios, equave, fine_search_args)
-- multiple ranges. TODO: write
local filtered_ratios = {}
function p.filter_ratios_within_cent_range(ratios, min_cents, max_cents)
for i = 1, #ratios do
if rat.tenney_height(ratios[i]) <= fine_search_args["Tenney Height"] then
table.insert(filtered_ratios, ratios[i])
end
end
return filtered_ratios
end
end


Line 77: Line 108:
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------


-- Int-limit-based search; finds ratios between 1/1 and an equave, within an int
-- Int limit search finds ratios from 1/1 to an equave, where each ratio's
-- limit.
-- numerator or denominator don't exceed the int limit.
function p.search_within_equave(equave, fine_search_args)
function p.search_by_int_limit(equave, int_limit)
local equave = equave or rat.new(2,1) -- Defualt equave is 2/1.
return p.search_by_int_limit_within_cents(0, rat.cents(equave), int_limit)
--local fine_search_args = p.preprocess_fine_search_args(fine_search_args)
end
 
-- Cent range search finds ratios within a cent range. Meant for searching for
-- ratios within a single interval range. If searching for ratios within many
-- interval ranges, then try a broad search first.
function p.search_by_int_limit_within_cents(min_cents, max_cents, int_limit)
local init_ratios = {{1,1}, {1,0}}
local init_ratios = {{1,1}, {1,0}}
local ratios = med.find_only_mediants_by_int_limit(init_ratios, fine_search_args["Int Limit"])
local ratios = med.find_only_mediants(init_ratios, 2)
for i = 3, int_limit do
ratios = med.find_mediants_by_int_limit(ratios, i)
-- Purge ratios from the beginning.
-- If the first and second ratio are smaller than min_cents, and smaller
-- than max_cents, then remove the first ratio. Keeping the first ratio
-- would add mediants outside the cent range.
local cents_1 = utils.log2(ratios[1][1] / ratios[1][2]) * 1200
local cents_2 = utils.log2(ratios[2][1] / ratios[2][2]) * 1200
if cents_1 < min_cents and cents_2 <= min_cents and cents_1 < max_cents and cents_2 < max_cents then
table.remove(ratios, 1)
end
-- Purge ratios from the end.
-- If the 2nd-last ratio and last ratio are greater than max_cents, and
-- larger than min_cents, then remove the last ratio. Keeping the last
-- ratio would add mediants outside the cent range.
local cents_3 = utils.log2(ratios[#ratios-1][1] / ratios[#ratios-1][2]) * 1200
local cents_4 = utils.log2(ratios[#ratios  ][1] / ratios[#ratios  ][2]) * 1200
if cents_3 > max_cents and cents_4 >= max_cents and cents_3 > min_cents and cents_4 > min_cents then
table.remove(ratios, #ratios)
end
end
-- Convert to ratios that Module:Rational can work with
-- Convert to ratios that Module:Rational can work with
Line 91: Line 150:
end
end
-- Remove ratios that exceed the equave.
-- Remove any remaining ratios that fall outside the cent range.
-- Note that mediant search returns sorted ratios, so remove them from the
while rat.cents(ratios[1]) < min_cents do
-- end until there's no more to remove.
table.remove(ratios, 1)
while rat.gt(ratios[#ratios], equave) do
end
while rat.cents(ratios[#ratios]) > max_cents do
table.remove(ratios, #ratios)
table.remove(ratios, #ratios)
end
end
-- Filter out ratios that exceed the int limit.
-- Then filter out ratios if their equave complement would be filtered out.
ratios = p.filter_ratios_by_tenney_height(ratios, equave, fine_search_args)
ratios = p.filter_ratios_by_complements(ratios, equave, fine_search_args)
return ratios
return ratios
Line 110: Line 165:
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------


-- to be implemented
-- Convert odd limit into equivalent subgroup.
-- EG, 11-odd-limit becomes 2.3.5.7.9.11
-- 2 is part of the subgroup by definition.
function p.odd_limit_to_subgroup(odd_limit)
local subgroup = { rat.new(2) }
for i = 3, odd_limit, 2 do
table.insert(subgroup, rat.new(i))
end
return subgroup
end
 
function p.search_by_odd_limit(equave, int_limit, odd_limit)
local subgroup = p.odd_limit_to_subgroup(odd_limit)
return p.search_by_subgroup_within_cents(0, rat.cents(equave), int_limit, subgroup)
end
 
function p.search_by_odd_limit_within_cents(min_cents, max_cents, odd_limit)
local subgroup = p.odd_limit_to_subgroup(odd_limit)
return p.search_by_subgroup_within_cents(min_cents, max_cents, int_limit, subgroup)
end


--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
Line 116: Line 190:
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------


function p.search_by_prime_limit(prime_limit, equave, fine_search_args)
-- Convert prime limit into equivalent subgroup.
local prime_limit = prime_limit or 5
-- EG, 11-prime-limit becomes 2.3.5.7.11
local equave = equave or rat.new(2,1)
function p.prime_limit_to_subgroup(prime_limit)
--local fine_search_args = p.preprocess_fine_search_args(fine_search_args)
local subgroup = {}
 
for i = 3, prime_limit do
-- Find all primes up to the prime limit.
local primes = {}
for i = 2, prime_limit do
local is_prime = true
local is_prime = true
for j = 2, math.floor(math.sqrt(i)) do
for j = 2, math.floor(math.sqrt(i)) do
Line 132: Line 203:
end
end
if is_prime then
if is_prime then
table.insert(primes, rat.new(i))
table.insert(subgroup, rat.new(i))
end
end
end
end
return subgroup
-- Perform subgroup search on the primes found, as subgroup-search code can
end
-- be reused for prime-limit search.
 
return p.search_by_subgroup(primes, equave, fine_search_args)
-- Prime limit search finds ratios with prime factors that don't exceed some
-- prime limit.
-- Upper bounds for searching is the equave and int limit.
function p.search_by_prime_limit(equave, int_limit, prime_limit)
local subgroup = p.prime_limit_to_subgroup(prime_limit)
return p.search_by_subgroup_within_cents(0, rat.cents(equave), int_limit, subgroup)
end
 
-- Prime limit search finds ratios with prime factors that don't exceed some
-- prime limit. Searches within a cent range.
function p.search_by_prime_limit_within_cents(min_cents, max_cents, int_limit, prime_limit)
local subgroup = p.prime_limit_to_subgroup(prime_limit)
local ratios = p.search_by_subgroup_within_cents(min_cents, max_cents, int_limit, subgroup)
while rat.cents(ratios[1]) < min_cents do
table.remove(ratios, 1)
end
return ratios
end
end


Line 145: Line 232:
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------


function p.search_by_subgroup(subgroup, equave, fine_search_args)
-- Subgroup search find ratios that are products of at least two non-unique
local subgroup = subgroup or {rat.new(2), rat.new(3), rat.new(7)}
-- elements from the subgroup.
local equave = equave or rat.new(2,1)
function p.search_by_subgroup(equave, int_limit, subgroup)
--local fine_search_args = p.preprocess_fine_search_args(fine_search_args)
local ratios = p.search_by_subgroup_within_cents(0, rat.cents(equave), int_limit, subgroup)
return ratios
end
 
function p.search_by_subgroup_within_cents(min_cents, max_cents, int_limit, subgroup)
--local equave   = equave or rat.new(2,1) -- Defualt equave is 2/1.
--local int_limit = int_limit or 50 -- Default is 50
--local subgroup  = subgroup or {rat.new(2), rat.new(3), rat.new(7)} -- Default is 2.3.7 subgroup
-- Fine search params for ease of access
-- Find all possible ways to multiply subgroup elements with one another
local tenney_height = fine_search_args["Tenney Height"]
-- using breadth-first-search. Products found this way should not exceed the
local comps_only = fine_search_args["Complements Only"]
-- int limit, and if a subgroup element is rational, neither its numerator
local int_limit = fine_search_args["Int Limit"]
-- nor denominator should exceed the int limit.
local products = { rat.new(1) }
local i = 1
while i <= #products do
-- Multiply each subgroup element by the current ratio. The table of
-- product ratios created this way is merged with the running table of
-- ratios. This is the Cartesian product of the single ratio as a set,
-- with the subgroup elements as a set, or {p/q} X subgroup.
local new_products = {}
for j = 1, #subgroup do
local new_ratio = rat.mul(products[i], subgroup[j])
if rat.is_within_int_limit(new_ratio, int_limit) and not p.find_ratio_in_table(new_products, new_ratio) then
table.insert(new_products, new_ratio)
end
end
-- Merge new products with the table of products, omitting duplicates.
p.merge_tables(products, new_products)
i = i + 1
end
-- Search for ratios within int limit within subgroup by multiplication.
-- Sort for next step
local products = p.multiply_ratios_using_bfs(rat.new(1), subgroup, int_limit)
table.sort(products, rat.lt)
-- Use the products found to find all ratios between 1 and the equave.
-- Use the products found to find all ratios between 1 and the equave.
-- For each ratio found, have it be the denominator and have the numerator
-- For each ratio in the table of products, create a set of new ratios by
-- be all successive ratios after it. For each new ratio found this way, add
-- having that ratio be the numerator and all successive ratios be possible
-- it to the table of ratios, excluding ratios that exceed the equave or int
-- denominators. Store these new ratios in a table, and repeat with all
-- limit, and excluding duplicates. This is way faster than performing BFS
-- successive products, omitting duplicats. From earlier testing, this is
-- on each ratio and yields the same results.
-- faster than performing BFS on each ratio, and yields the same results.
local ratios = {}
local ratios = {}
for i = 1, #products do
for i = 1, #products do
local new_ratios = {}
local new_ratios = {}
for j = i, #products do
for j = i, #products do
local ratio = rat.div(products[j], products[i])
local new_ratio = rat.div(products[j], products[i])
if rat.as_float(ratio) > rat.as_float(equave) then break end
if rat.cents(new_ratio) > max_cents then break end
if not p.find_ratio_in_table(new_ratios, ratio) and rat.int_limit(ratio) <= int_limit then
if not p.find_ratio_in_table(new_ratios, new_ratio) and rat.is_within_int_limit(new_ratio, int_limit) then
table.insert(new_ratios, ratio)
table.insert(new_ratios, new_ratio)
end
end
end
end
p.merge_ratio_tables_without_duplicates(ratios, new_ratios)
-- Merge new ratios with the table of ratios, omitting duplicates.
p.merge_tables(ratios, new_ratios)
end
end
-- Sort, then filter out ratios that exceed the int limit.
-- Sort
-- Then filter out ratios if their equave complement would be filtered out.
table.sort(ratios, rat.lt)
table.sort(ratios, rat.lt)
ratios = p.filter_ratios_by_tenney_height(ratios, equave, fine_search_args)
ratios = p.filter_ratios_by_complements(ratios, equave, fine_search_args)
return ratios
-- Remove ratios less than minimum
end
while rat.cents(ratios[1]) < min_cents do
 
table.remove(ratios, 1)
-- Helper function for subgroup search; implementation of BFS
function p.multiply_ratios_using_bfs(init_ratio, subgroup, int_limit)
local ratios = { init_ratio }
local i = 1
while i <= #ratios do
local new_ratios = p.multiply_ratio_by_subgroup_elements(ratios[i], subgroup, int_limit)
p.merge_ratio_tables_without_duplicates(ratios, new_ratios)
i = i + 1
end
end
table.sort(ratios, rat.lt)
return ratios
return ratios
end
end


-- Helper function for BFS search; returns { ratio } X subgroup
--------------------------------------------------------------------------------
function p.multiply_ratio_by_subgroup_elements(ratio, subgroup, int_limit)
------------------------------- HELPER FUNCTIONS -------------------------------
local ratios = {}
--------------------------------------------------------------------------------
for i = 1, #subgroup do
local new_ratio = rat.mul(ratio, subgroup[i])
if rat.int_limit(new_ratio) <= int_limit and not p.find_ratio_in_table(ratios, new_ratio) then
table.insert(ratios, new_ratio)
end
end
return ratios
end


-- Heleper function; merges tables while disallowing duplicates
-- Heleper function; merges elements from source table with destination table
function p.merge_ratio_tables_without_duplicates(dest_table, source_table)
-- while disallowing duplicates.
function p.merge_tables(dest_table, source_table)
for i = 1, #source_table do
for i = 1, #source_table do
if not p.find_ratio_in_table(dest_table, source_table[i]) then
if not p.find_ratio_in_table(dest_table, source_table[i]) then
Line 221: Line 318:
end
end


-- Helper function for table merge function
-- Helper function for merge function.
function p.find_ratio_in_table(table_, ratio)
function p.find_ratio_in_table(table_, ratio)
local found = false
local found = false
Line 234: Line 331:


--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
-------------------------- ARG-BASED SEARCH FUNCTIONS --------------------------
---------------------------- RATIO STRING FUNCTIONS ----------------------------
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------


-- Search for ratios based on an array of args passed in. Certain params have
-- Convert a table of ratios into a string, with options for links and delimiter
-- their own function calls.
function p.ratios_as_string(ratios, add_links, delimiter)
function p.search_by_args_within_equave(equave, search_args)
local add_links = add_links == true
local equave = equave or rat.new(2,1)
local delimiter = delimiter or ", "
local text = ""
if #ratios ~= 0 then
text = add_links and string.format("[[%s]]", rat.as_ratio(ratios[1])) or rat.as_ratio(ratios[1])
for i = 2, #ratios do
text = text .. (add_links and string.format("%s[[%s]]", delimiter, rat.as_ratio(ratios[i])) or string.format("%s%s", delimiter, rat.as_ratio(ratios[i])))
end
end
return text
end
 
-- Convert a jagged array of ratios into an array of strings
function p.ratios_as_strings(ratios, add_links, delimiter)
local add_links = add_links == true
local delimiter = delimiter or ", "
-- For each search method, check whether the corresponding search arg and
local texts = {}
-- int limit are both present and pass it and the equave to that function.
for i = 1, #ratios do
-- All other search args are used as finer search args.
local text = p.ratios_as_string(ratios[i], add_links, delimiter)
-- Note that search by int limit alone just has the equave and search args
table.insert(texts, text)
-- passed in.
local ratios = {}
if search_args["Prime Limit"] ~= nil and search_args["Int Limit"] ~= nil then
ratios = p.search_by_prime_limit(search_args["Prime Limit"], equave, search_args)
elseif search_args["Subgroup"] ~= nil and search_args["Int Limit"] ~= nil then
ratios = p.search_by_subgroup(search_args["Subgroup"], equave, search_args)
elseif search_args["Int Limit"] ~= nil then
ratios = p.search_within_equave(equave, search_args)
end
end
return ratios
return texts
end
end


-- Parse search args.
--------------------------------------------------------------------------------
function p.parse_search_args(search_args)
---------------------------- ARG-PARSING FUNCTION ------------------------------
--------------------------------------------------------------------------------
 
-- Parse search args if entered as one string. Use is to be determined.
function p.parse_args(search_args)
local parsed = tip.parse_kv_pairs(search_args)
local parsed = tip.parse_kv_pairs(search_args)
if parsed["Equave"] ~= nil then
parsed["Equave"] = rat.parse(parsed["Equave"])
end
if parsed["Int Limit"] ~= nil then
if parsed["Int Limit"] ~= nil then
Line 290: Line 402:


--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
---------------------------- RATIO STRING FUNCTIONS ----------------------------
----------------------------- INVOKABLE FUNCTIONS ------------------------------
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------


-- Convert a table of ratios into a string, with options for links and delimiter
-- Function callable by other modules
function p.ratios_as_string(ratios, add_links, delimiter)
-- Ratios are returned as a table, for use with other modules.
local add_links = add_links == true
function p._ji_ratios(args)
local delimiter = delimiter or ", "
-- Args for ease of access
equave      = args["Equave"    ] or DEFAULT_EQUAVE
int_limit  = args["Int Limit"  ] or DEFAULT_INT_LIMIT
odd_limit  = args["Odd Limit"  ]
prime_limit = args["Prime Limit"]
subgroup    = args["Subgroup"  ]
-- Filtering args
tenney_height    = args["Tenney Height"  ] or 1/0 -- Default Tenney height is infinity
complements_only = args["Complements Only"] or false -- Default is to include all ratios
local text = ""
local ratios = {}
if #ratios ~= 0 then
if subgroup ~= nil then
text = add_links and string.format("[[%s]]", rat.as_ratio(ratios[1])) or rat.as_ratio(ratios[1])
ratios = p.search_by_subgroup(equave, int_limit, subgroup)
for i = 2, #ratios do
elseif prime_limit ~= nil then
text = text .. (add_links and string.format("%s[[%s]]", delimiter, rat.as_ratio(ratios[i])) or string.format("%s%s", delimiter, rat.as_ratio(ratios[i])))
ratios = p.search_by_prime_limit(equave, int_limit, prime_limit)
end
elseif int_limit ~= nil then
ratios = p.search_by_int_limit(equave, int_limit)
end
end
return text
end
-- Convert a jagged array of ratios into an array of strings
function p.ratios_as_strings(ratios, add_links, delimiter)
local add_links = add_links == true
local delimiter = delimiter or ", "
local texts = {}
-- Filter ratios
for i = 1, #ratios do
ratios = p.filter_ratios(ratios, equave, int_limit, tenney_height, complements_only)
local text = p.ratios_as_string(ratios[i], add_links, delimiter)
table.insert(texts, text)
end
return texts
end
 
--------------------------------------------------------------------------------
----------------------------- INVOKABLE FUNCTIONS ------------------------------
--------------------------------------------------------------------------------
 
-- Function callable by other modules
function p._ji_ratios(args)
return ratios
end
end


-- Invokable function; for templates
-- Invokable function; for templates
-- Ratios are returned as a comma-delimited list. For finer control, it's
-- necessary to call the "main" function, then further process the results.
function p.ji_ratios(frame)
function p.ji_ratios(frame)
args = getArgs(frame)
args = getArgs(frame)
args["Equave"] = rat.parse(args["Equave"])
-- Preprocess equave
-- Ratios are searched from 1/1 to some equave (default 2/1), so an equave
-- must be passed in.
args["Equave"] = args["Equave"] ~= nil and rat.parse(args["Equave"])
-- Preprocess int limit
-- Ratios are searched up to some int limit (default 50), so an int limit
-- must be passed in.
args["Int Limit"] = args["Int Limit"] ~= nil and tonumber(args["Int Limit"])


 
-- Preprocess Tenney height
if args["Int Limit"] ~= nil then
args["Int Limit"] = tonumber(args["Int Limit"])
end
if args["Tenney Height"] ~= nil then
if args["Tenney Height"] ~= nil then
args["Tenney Height"] = tonumber(args["Tenney Height"]) or math.huge
args["Tenney Height"] = tonumber(args["Tenney Height"])
end
end
-- Preprocess prime limit
if args["Prime Limit"] ~= nil then
if args["Prime Limit"] ~= nil then
args["Prime Limit"] = tonumber(args["Prime Limit"])
args["Prime Limit"] = tonumber(args["Prime Limit"])
end
end
-- Preprocess subgroup
if args["Subgroup"] ~= nil then
if args["Subgroup"] ~= nil then
local subgroup_elements = tip.parse_numeric_pairs(args["Subgroup"], ".", "/", true)
local subgroup_elements = tip.parse_numeric_pairs(args["Subgroup"], ".", "/", true)
Line 361: Line 473:
end
end
-- Find and return ratios
local result = p.ratios_as_string(p._ji_ratios(args))
local debugg = yesno(frame.args["debug"])
ratios = p.search_by_args_within_equave(args["Equave"], args)
if debugg == true then
return p.ratios_as_string(ratios)
result = "<syntaxhighlight lang=\"wikitext\">" .. result .. "</syntaxhighlight>"
end
return frame:preprocess(result)
 
end
 
function p.tester()
--return p.ratios_as_string(p._ji_ratios(p.parse_args("Int Limit: 16; Equave: 3/1; Complements Only: 0")))
--return p.ratios_as_string(p.search_by_prime_limit_within_cents(372, 440, 17, 30))
return p.ratios_as_string(p.search_by_odd_limit(rat.new(2), 15, 15*2))
end
end


Line 409: Line 534:
return sorted_ratios
return sorted_ratios
end
end


return p
return p
Retrieved from "https://en.xen.wiki/w/Module:JI_ratios"