Module:JI ratios: Difference between revisions
m clear todo |
m Renamed "new" functions by dropping "new" (it's been a few weeks); may break dependent modules |
||
| Line 139: | Line 139: | ||
-------------------------------------------------------------------------------- | -------------------------------------------------------------------------------- | ||
function p. | function p.search_by_prime_limit(prime_limit, equave, fine_search_args) | ||
local prime_limit = prime_limit or 5 | local prime_limit = prime_limit or 5 | ||
local equave = equave or rat.new(2,1) | local equave = equave or rat.new(2,1) | ||
| Line 161: | Line 161: | ||
-- Perform subgroup search on the primes found, as subgroup-search code can | -- Perform subgroup search on the primes found, as subgroup-search code can | ||
-- be reused for prime-limit search. | -- be reused for prime-limit search. | ||
return p. | return p.search_by_subgroup(primes, equave, fine_search_args) | ||
end | end | ||
-- WORK-IN-PROGRESS!! | -- WORK-IN-PROGRESS!! | ||
function p. | function p.search_by_subgroup(subgroup, equave, fine_search_args) | ||
local subgroup = subgroup or {rat.new(2), rat.new(3), rat.new(7)} | local subgroup = subgroup or {rat.new(2), rat.new(3), rat.new(7)} | ||
local equave = equave or rat.new(2,1) | local equave = equave or rat.new(2,1) | ||
| Line 248: | Line 248: | ||
local ratios = {} | local ratios = {} | ||
if search_args["Prime Limit"] ~= nil and search_args["Int Limit"] ~= nil then | if search_args["Prime Limit"] ~= nil and search_args["Int Limit"] ~= nil then | ||
ratios = p. | 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 | elseif search_args["Subgroup"] ~= nil and search_args["Int Limit"] ~= nil then | ||
ratios = p. | ratios = p.search_by_subgroup(search_args["Subgroup"], equave, search_args) | ||
elseif search_args["Int Limit"] ~= nil then | elseif search_args["Int Limit"] ~= nil then | ||
ratios = p.search_within_equave(equave, search_args) | ratios = p.search_within_equave(equave, search_args) | ||