Module:JI ratios: Difference between revisions
Created new prime-limit search function; some cleanup with int-limit search |
Implement new subgroup/prime-lim functons |
||
| Line 413: | Line 413: | ||
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_new(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_new(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) | ||
| Line 439: | Line 439: | ||
if parsed["Subgroup"] ~= nil then | if parsed["Subgroup"] ~= nil then | ||
local subgroup_elements = tip.parse_numeric_entries(parsed["Subgroup"], ".", "/", true) | |||
for i = 1, #subgroup_elements do | |||
subgroup_elements[i] = rat.new(subgroup_elements[i][1], subgroup_elements[i][2]) | |||
end | |||
parsed["Subgroup"] = subgroup_elements | |||
end | end | ||
| Line 458: | Line 462: | ||
.. " " .. autosearch_text | .. " " .. autosearch_text | ||
elseif search_args["Subgroup"] ~= nil then | elseif search_args["Subgroup"] ~= nil then | ||
search_text = string.format("Ratios shown are within the %s subgroup.", | local subgroup = "" | ||
for i = 1, #search_args["Subgroup"] do | |||
subgroup = subgroup .. rat.as_string(search_args["Subgroup"][i]) | |||
end | |||
search_text = string.format("Ratios shown are within the %s subgroup.", subgroup) | |||
.. " " .. autosearch_text | .. " " .. autosearch_text | ||
elseif search_args["Int Limit"] ~= nil then | elseif search_args["Int Limit"] ~= nil then | ||