Module:MOS tuning spectrum - Revision history

Ganaram inukshuk at 21:30, 8 October 2025

2025-10-08T21:30:54Z

← Older revision		Revision as of 21:30, 8 October 2025
Line 5:		Line 5:
	local yesno = require("Module:yesno")		local yesno = require("Module:yesno")
	local getArgs = require("Module:Arguments").getArgs		local getArgs = require("Module:Arguments").getArgs

	local p = {}		local p = {}

Ganaram inukshuk: minor additions; may change later

2025-10-08T21:18:48Z

minor additions; may change later

← Older revision		Revision as of 21:18, 8 October 2025
Line 105:		Line 105:
	table.insert(result, string.format('! rowspan="2" \| %s', comments_header_text))		table.insert(result, string.format('! rowspan="2" \| %s', comments_header_text))
	table.insert(result, '\|-')		table.insert(result, '\|-')
	table.insert(result, '! Bright')		table.insert(result, '! <abbr title="Chroma-positive generator">Bright</abbr>')
	table.insert(result, '! Dark')		table.insert(result, '! <abbr title="Chroma-negative generator">Dark</abbr>')
	table.insert(result, '! L:s')		table.insert(result, '! L:s')
	table.insert(result, '! Hardness')		table.insert(result, '! Hardness')

Ganaram inukshuk: todo

2025-10-08T10:39:35Z

todo

← Older revision		Revision as of 10:39, 8 October 2025
Line 8:		Line 8:

	-- TODO:		-- TODO:
			-- - Add back old option from previous scale tree: toggle staggering of ratios.
	-- - (Low priority): Force-add comments that lie outside searched depth. If such		-- - (Low priority): Force-add comments that lie outside searched depth. If such
	-- ratios are added, they're added in either the last column or their own		-- ratios are added, they're added in either the last column or their own

Ganaram inukshuk: refactor code

2025-10-08T06:40:57Z

refactor code

← Older revision		Revision as of 06:40, 8 October 2025
Line 8:		Line 8:

	-- TODO:		-- TODO:
	~~-- - (High priority): Refactor code so instead of string concatenation, lines~~
	~~-- are appended to a table, where table.concat() is called at the end.~~
	-- - (Low priority): Force-add comments that lie outside searched depth. If such		-- - (Low priority): Force-add comments that lie outside searched depth. If such
	-- ratios are added, they're added in either the last column or their own		-- ratios are added, they're added in either the last column or their own
	-- column appended after the last one.		-- column appended after the last one. (to be determined)

	-- Split comments into in-range and out-of-range comments.		-- Split comments into in-range and out-of-range comments.
Line 18:		Line 16:
	-- in the table of step ratios. If so, add the corresponding key-value pair into		-- in the table of step ratios. If so, add the corresponding key-value pair into
	-- the table of in-comments; if not, add to the table of out-comments.		-- the table of in-comments; if not, add to the table of out-comments.
	function p.preprocess_comments(comments, step_ratios)		function p.preprocess_comments(comments, step_ratios, depths)
	local in_comments = {}		local in_comments = {}
	local out_comments = {}		local out_comments = {}
	local out_ratios = {}		local out_ratios = {}

	for key, value in pairs(comments) do		for key, value in pairs(comments) do
Line 75:		Line 73:
	default_comments["4/1"] = string.format("'''Superhard %s'''", mos_as_string)		default_comments["4/1"] = string.format("'''Superhard %s'''", mos_as_string)
	default_comments["1/0"] = string.format("'''Collapsed %s'''", mos_as_string)		default_comments["1/0"] = string.format("'''Collapsed %s'''", mos_as_string)



	-- Append boundary of proper scales to basic comment, if applicable		-- Append boundary of proper scales to basic comment, if applicable
Line 99:		Line 95:
	-- - Step ratio and hardness		-- - Step ratio and hardness
	-- - Comments		-- - Comments
	local result = "{\| class=\"wikitable center-all~~\"\n~~"		local result = {}
	.~~. "~~\|+ style=\"font-size: 105%; white-space: nowrap;\" \| ~~" .. string.format("~~Scale tree and tuning spectrum of ~~%s\n",~~ mos_as_string)		table.insert(result, '{\| class="wikitable center-all"')
	.~~. "~~\|-~~\n"~~		table.insert(result, '\|+ style="font-size: 105%; white-space: nowrap;" \| Scale tree and tuning spectrum of ' .. mos_as_string)
	.. string.format("! rowspan=\"2\" colspan=\"%d\" \| Generator<sup><abbr title=\"In steps of %s.\">(%s)</abbr></sup>~~\n"~~, deepest + 1, et_suffix, et_suffix)		table.insert(result, '\|-')
	.~~. "~~! colspan=\"2\" \| Cents~~\n"~~		table.insert(result, string.format('! rowspan="2" colspan="%d" \| Generator<sup><abbr title="In steps of %s.">(%s)</abbr></sup>', deepest + 1, et_suffix, et_suffix))
	.~~. "~~! colspan=\"2\" \| Step ratio~~\n"~~		table.insert(result, '! colspan="2" \| Cents')
	.. "! rowspan=\"2\" \| ~~" ..~~ comments_header_text ~~.. "\n"~~		table.insert(result, '! colspan="2" \| Step ratio')
	.~~. "~~\|-~~\n"~~		table.insert(result, string.format('! rowspan="2" \| %s', comments_header_text))
	.~~. "~~! Bright~~\n"~~		table.insert(result, '\|-')
	.~~. "~~! Dark~~\n"~~		table.insert(result, '! Bright')
	.~~. "~~! L:s~~\n"~~		table.insert(result, '! Dark')
	.~~. "~~! Hardness~~\n"~~		table.insert(result, '! L:s')
			table.insert(result, '! Hardness')

	-- Rounding is done using string.format, to 3 decimal places (%.3f)		-- Rounding is done using string.format, to 3 decimal places (%.3f)
Line 132:		Line 129:

	-- New row		-- New row
	result ~~= result ..~~ "\|-\n"		table.insert(result, "\|-")

	-- Cells for bright generator, as steps in et		-- Cells for bright generator, as steps in et
			-- Bright gen cell is accompanied by cells to the left and right.
			-- The variable current_depth is the number of left cells; the number of
			-- right cells is deepest minus current_depth.
	local current_depth = depths[i]		local current_depth = depths[i]
	local ~~pre_blank_cells~~ = ~~string~~.~~rep~~("\|\n"~~, current_depth~~) ~~-- Blank cells preceding the bright gen~~		local num_right_cells = deepest - current_depth
	~~local bright_gen_cell =~~ string.format("\| [[%s\|%s]]\n", et_as_string, bright_generator_string) ~~-- Bright gen~~		for i = 1, current_depth do
	~~local post_blank_cells~~ = ~~string~~.~~rep~~("\|\n"~~, deepest - current_depth~~) ~~-- Blank cells succeeding the bright gen~~		table.insert(result, "\|")
	~~result = result .. pre_blank_cells .. bright_gen_cell .. post_blank_cells~~		end
			table.insert(result, string.format("\| [[%s\|%s]]", et_as_string, bright_generator_string))
			for i = 1, num_right_cells do
			table.insert(result, "\|")
			end

	-- Cells for generators in cents		-- Cells for generators in cents
	result ~~= result ..~~ string.format("\| %.3f\n", bright_generator_cents)		table.insert(result, string.format("\| %.3f", bright_generator_cents))
	result ~~= result ..~~ string.format("\| %.3f\n", dark_generator_cents )		table.insert(result, string.format("\| %.3f", dark_generator_cents ))

	-- Cell for step ratio		-- Cell for step ratio
	result ~~= result ..~~ string.format("\| %d:%d\n", step_ratio[1], step_ratio[2])		table.insert(result, string.format("\| %d:%d", step_ratio[1], step_ratio[2]))

	-- Cell for hardness, with divide-by-zero check		-- Cell for hardness, with divide-by-zero check
Line 155:		Line 159:
	hardness = string.format("%.3f", step_ratio[1] / step_ratio[2])		hardness = string.format("%.3f", step_ratio[1] / step_ratio[2])
	end		end
	result ~~= result ..~~ string.format("\| %s\n", hardness)		table.insert(result, string.format("\| %s", hardness))

	-- Cell for comment		-- Cell for comment
Line 168:		Line 172:
	comment = default_comment .. "<br />" .. custom_comment		comment = default_comment .. "<br />" .. custom_comment
	end		end
	result ~~= result ..~~ string.format("\| style=\"text-align: left;\" \| %s\n", comment)		table.insert(result, string.format("\| style=\"text-align: left;\" \| %s", comment))

	end		end

	result ~~= result ..~~ "\|}"		table.insert(result, "\|}")
	return result		return table.concat(result, "\n")
	end		end

Line 276:		Line 280:

	local args = {}		local args = {}
			--return out_comments
	return p._mos_tuning_spectrum(args)		return p._mos_tuning_spectrum(args)
	end		end

	return p		return p

Ganaram inukshuk: todo: refactor

2025-10-07T22:09:40Z

todo: refactor

← Older revision		Revision as of 22:09, 7 October 2025
Line 8:		Line 8:

	-- TODO:		-- TODO:
			-- - (High priority): Refactor code so instead of string concatenation, lines
			-- are appended to a table, where table.concat() is called at the end.
	-- - (Low priority): Force-add comments that lie outside searched depth. If such		-- - (Low priority): Force-add comments that lie outside searched depth. If such
	-- ratios are added, they're added in either the last column or their own		-- ratios are added, they're added in either the last column or their own

Ganaram inukshuk: rewrite adding the bright gen (in ed-steps) and its surrounding blank cells without the use of a for loop

2025-10-05T08:27:11Z

rewrite adding the bright gen (in ed-steps) and its surrounding blank cells without the use of a for loop

← Older revision		Revision as of 08:27, 5 October 2025
Line 133:		Line 133:

	-- Cells for bright generator, as steps in et		-- Cells for bright generator, as steps in et
	local current_depth = depths[i] ~~+ 1~~		local current_depth = depths[i]
	~~for i~~ = ~~1, deepest + 1 do~~		local pre_blank_cells = string.rep("\|\n", current_depth) -- Blank cells preceding the bright gen
	~~result = result .~~. "\| "		local bright_gen_cell = string.format("\| [[%s\|%s]]\n", et_as_string, bright_generator_string) -- Bright gen
	~~if i ==~~ current_depth ~~then~~		local post_blank_cells = string.rep("\|\n", deepest - current_depth) -- Blank cells succeeding the bright gen
	~~result~~ = ~~result ..~~ string.format("[[%s\|%s]]", et_as_string, bright_generator_string)		result = result .. pre_blank_cells .. bright_gen_cell .. post_blank_cells
	~~end~~
	~~result~~ = ~~result .~~. "\n"
	~~end~~

	-- Cells for generators in cents		-- Cells for generators in cents
Line 276:		Line 273:
	in_comments, out_comments, out_ratios = p.preprocess_comments(comments, step_ratios)		in_comments, out_comments, out_ratios = p.preprocess_comments(comments, step_ratios)

	return ~~out_ratios~~		local args = {}
			return p._mos_tuning_spectrum(args)
	end		end

	return p		return p

Ganaram inukshuk: add in-progress function for splitting in-range comments and out-of-range comments

2025-10-05T08:17:52Z

add in-progress function for splitting in-range comments and out-of-range comments

@@ Line 11: / Line 11: @@
 --   ratios are added, they're added in either the last column or their own
 --   column appended after the last one.
 -- Re-re-rewrite of tuning spectrum
@@ Line 47: / Line 73: @@
 	default_comments["4/1"] = string.format("'''Superhard %s'''", mos_as_string)
 	default_comments["1/0"] = string.format("'''Collapsed %s'''", mos_as_string)
 	-- Append boundary of proper scales to basic comment, if applicable
@@ Line 230: / Line 258: @@
 function p.tester()
-	local args = {}
+	--local args = {}
-	return p._mos_tuning_spectrum(args)
+	--return p._mos_tuning_spectrum(args)
 end
 return p

Ganaram inukshuk: code cleanup; adopt sorting function for when custom initial ratios are entered

2025-10-05T02:14:25Z

code cleanup; adopt sorting function for when custom initial ratios are entered

← Older revision		Revision as of 02:14, 5 October 2025
Line 19:		Line 19:
	default_ratios, default_depths = mediants.find_mediants({{1,1}, {1,0}}, default_depth)		default_ratios, default_depths = mediants.find_mediants({{1,1}, {1,0}}, default_depth)

			-- Extract info from args
	local input_mos = args["Input MOS" ] or mos.new(5, 2)		local input_mos = args["Input MOS" ] or mos.new(5, 2)
	local comments = args["Comments" ] or {}		local comments = args["Comments" ] or {}
	local step_ratios = args["Step Ratios"] or default_ratios		local step_ratios = args["Step Ratios"] or default_ratios
	local depths = args["Depths" ] or default_depths		local depths = args["Depths" ] or default_depths
	~~local deepest = mediants.deepest_depth(depths)~~

			-- Find the deepest searched depth at which ratios were found
			local deepest = mediants.deepest_depth(depths)

			-- Find mos info
	local equave = input_mos.equave		local equave = input_mos.equave
	local large_steps = input_mos.nL -- Large steps in mos		local large_steps = input_mos.nL -- Large steps in mos
	local small_steps = input_mos.ns -- Small steps in mos		local small_steps = input_mos.ns -- Small steps in mos
	local periods = mos.period_count(input_mos) -- Number of periods		local periods = mos.period_count(input_mos) -- Number of periods
			local et_suffix = mos.et_suffix(input_mos) -- Mos's ET suffix (edo, edt, edf, ed-p/q, etc)
	-- ~~What is the et~~ suffix (edo, edt, edf, ed-p/q)?
	~~local et_suffix = mos.et_suffix(input_mos~~)

	-- Default comments for TAMNAMS-named step ratios		-- Default comments for TAMNAMS-named step ratios
Line 172:		Line 174:
	local initial_ratios = {}		local initial_ratios = {}
	if initial_ratios_unparsed ~= nil then		if initial_ratios_unparsed ~= nil then
	initial_ratios = tip.parse_numeric_pairs(initial_ratios_unparsed, ",", "/", true)		-- Parse initial ratios, then sort by ascending
			initial_ratios = tip.parse_numeric_pairs(initial_ratios_unparsed, ";", "/", true)
			mediants.sort_ratios(initial_ratios)
	else		else
			-- If no initial ratios were passed in, default to 1/1 and 1/0
	initial_ratios = {{1,1}, {1,0}}		initial_ratios = {{1,1}, {1,0}}
	end		end
Line 180:		Line 185:
	-- If using depth-based search, parse the depth, then remove it from args		-- If using depth-based search, parse the depth, then remove it from args
	-- If using int-limit search, parse the int limit, then remove it from args,		-- If using int-limit search, parse the int limit, then remove it from args,
	-- and remove depth ~~for good measure~~		-- and remove depth in case it was present.
	local step_ratios, depths		local step_ratios, depths
	local use_int_limit = args["Int Limit"] ~= nil		local use_int_limit = args["Int Limit"] ~= nil
Line 197:		Line 202:
	step_ratios, depths = mediants.find_mediants(initial_ratios, depth)		step_ratios, depths = mediants.find_mediants(initial_ratios, depth)
	end		end
	args["Depth"] = nil		args["Depth" ] = nil
	args["Step Ratios"] = step_ratios		args["Step Ratios"] = step_ratios
	args["Depths"] = depths		args["Depths" ] = depths

	-- Transfer comments from args to comments		-- Transfer comments from args to comments

Ganaram inukshuk: adopt simplify_ratio function from mediants module

2025-10-04T20:53:57Z

adopt simplify_ratio function from mediants module

← Older revision		Revision as of 20:53, 4 October 2025
Line 85:		Line 85:
	for i = 1, #step_ratios do		for i = 1, #step_ratios do
	-- Simplify step ratio before using it		-- Simplify step ratio before using it
	local step_ratio = step_ratios[i]		local step_ratio = mediants.simplify_ratio(step_ratios[i])
	~~local gcd = utils._gcd(step_ratio[1], step_ratio[2~~])
	~~step_ratio[1] = step_ratio[1] / gcd~~
	~~step_ratio[2] = step_ratio[2] / gcd~~

	-- Produce current ET as a string		-- Produce current ET as a string

Ganaram inukshuk: bugfix

2025-10-04T10:41:17Z

bugfix

← Older revision		Revision as of 10:41, 4 October 2025
Line 133:		Line 133:
	-- Cell for comment		-- Cell for comment
	-- Default comments are on their own line before custom comments		-- Default comments are on their own line before custom comments
	local key = ~~large_step / gcd~~ .. "/" .. ~~small_step / gcd~~ -- The step ratio is (literally and figuratively) the key to add comments!		local key = step_ratio[1] .. "/" .. step_ratio[2] -- The step ratio is (literally and figuratively) the key to add comments!
	local comment = ""		local comment = ""
	local default_comment = default_comments[key] or ""		local default_comment = default_comments[key] or ""