Module:Mediants: Difference between revisions

Newer edit →

@@ Line 1: / Line 1: @@
 local mos = require("Module:MOS")
 local p = {}
+-- Module for finding mediants, either by search depth or by search function.
 function p.find_mediants_by_depth(start_ratio_1, start_ratio_2, depth)
@@ Line 47: / Line 49: @@
 	if num_den_sum <= max_sum then
-		new_ratio_added = true
-		table.insert(ratios, mediant)
-	end
-	return new_ratio_added
-end
-function p.generator_increment_filter(ratios, ratio_1, ratio_2, increment)
-	local mediant = { ratio_1[1] + ratio_2[1], ratio_1[2] + ratio_2[2] }
-	local new_ratio_added = false
-	local input_mos = mos.new(5,2)
-	local g1 = mos.bright_gen_to_cents(input_mos, ratio_1)
-	local g2 = mos.bright_gen_to_cents(input_mos, ratio_2)
-	local gm = mos.bright_gen_to_cents(input_mos, mediant)
-	local inc1 = math.abs(g1 - gm)
-	local inc2 = math.abs(gm - g2)
-	if inc1 >= increment or inc2 >= increment then
 		new_ratio_added = true
 		table.insert(ratios, mediant)
@@ Line 101: / Line 83: @@
 	local func = p.int_limit_filter
-	local ratios = p.find_mediants_by_filter({1,1}, {1,0}, func, 12)
+	local ratios = p.find_mediants_by_filter({1,1}, {1,0}, func, 15)
 	local generators = {}
 	for i = 1, #ratios do
 		local input_mos = mos.new(5,2)
 		local gen = mos.bright_gen_to_cents(input_mos, ratios[i])
-		local new_string = string.format("%s:%s\t%s", ratios[i][1], ratios[i][2], gen)
+		local edo = ratios[i][1] * 5 + ratios[i][2] * 2
-		table.insert(generators, string.format("%s:%s\t%s", ratios[i][1], ratios[i][2], gen))
+		local new_string = string.format("%s:%s\t%sedo\t%.3f", ratios[i][1], ratios[i][2], edo, gen)
+		table.insert(generators, new_string)
 	end