Module:JI ratios: Difference between revisions

Line 164:

-- WORK-IN-PROGRESS!!

function p.search_by_subgroup_new(subgroup, equave, fine_search_args)

local subgroup = {rat.new(2), rat.new(5), rat.new(17,14), rat.new(28,19)}

local subgroup = subgroup or {rat.new(2), rat.new(5), rat.new(17,14), rat.new(28,19)}

local equave = rat.new(2,1)

local equave = equave or rat.new(2,1)

local fine_search_args = p.preprocess_fine_search_args(fine_search_args)

-- Fine search params for ease of access

local int_limit = ~~200000 --~~fine_search_args["Int Limit"]

local int_limit = fine_search_args["Int Limit"]

local tenney_height = fine_search_args["Tenney Height"]

local comps_only = fine_search_args["Complements Only"]

Line 559:

local equave = rat.new(2,1)

local fine_search_args = p.parse_search_args("Subgroup: 2.5.9.21; Int Limit: 30; Complements Only: 1; Tenney Height: 100000000")

local fine_search_args = p.parse_search_args("Subgroup: 2.5.9.21; Int Limit: 100; Complements Only: 1; Tenney Height: 100000000")

~~--return p~~.~~ratios_as_string~~(p.~~search_by_args_within_equave~~(~~equave~~, ~~fine_search_args))~~

local subgroup = { rat.new(2), rat.new(3), rat.new(9,7), rat.new(11,7), rat.new(25), rat.new(31,29) }

~~return p.divide_ratio_by_subgroup_elements(~~rat.new(9,5), {rat.new(2), rat.new(3), rat.new(7)}~~, 50)~~

--return p.~~ratio_within_search~~(~~{16,13}, equave, fine_search_args) and p.ratio_within_search({8,13}~~, equave, fine_search_args)

return p.search_by_subgroup_new(subgroup, equave, fine_search_args)

end

return p

@@ Line 164: / Line 164: @@
 -- WORK-IN-PROGRESS!!
 function p.search_by_subgroup_new(subgroup, equave, fine_search_args)
-	local subgroup = {rat.new(2), rat.new(5), rat.new(17,14), rat.new(28,19)}
+	local subgroup = subgroup or {rat.new(2), rat.new(5), rat.new(17,14), rat.new(28,19)}
-	local equave = rat.new(2,1)
+	local equave = equave or rat.new(2,1)
 	local fine_search_args = p.preprocess_fine_search_args(fine_search_args)
 	-- Fine search params for ease of access
-	local int_limit = 200000 --fine_search_args["Int Limit"]
+	local int_limit = fine_search_args["Int Limit"]
 	local tenney_height = fine_search_args["Tenney Height"]
 	local comps_only = fine_search_args["Complements Only"]
@@ Line 559: / Line 559: @@
 	local equave = rat.new(2,1)
-	local fine_search_args = p.parse_search_args("Subgroup: 2.5.9.21; Int Limit: 30; Complements Only: 1; Tenney Height: 100000000")
+	local fine_search_args = p.parse_search_args("Subgroup: 2.5.9.21; Int Limit: 100; Complements Only: 1; Tenney Height: 100000000")
-	--return p.ratios_as_string(p.search_by_args_within_equave(equave, fine_search_args))
+	local subgroup = { rat.new(2), rat.new(3), rat.new(9,7), rat.new(11,7), rat.new(25), rat.new(31,29) }
-	return p.divide_ratio_by_subgroup_elements(rat.new(9,5), {rat.new(2), rat.new(3), rat.new(7)}, 50)
-	--return p.ratio_within_search({16,13}, equave, fine_search_args) and p.ratio_within_search({8,13}, equave, fine_search_args)
+	return p.search_by_subgroup_new(subgroup, equave, fine_search_args)
 end
 return p