Module:Chord consistency - Revision history

Dummy index: delete additively_consistent_int() and use new version of Module:Limits.additively_consistent()

2025-10-31T13:46:36Z

delete additively_consistent_int() and use new version of Module:Limits.additively_consistent()

@@ Line 1: / Line 1: @@
 local ET = require('Module:ET')
 local rat = require('Module:Rational')
 local utils = require("Module:Utils")
 local p = {}
 -- determine maximum error
@@ Line 119: / Line 39: @@
 	for i = 1, max_n do
 		local et = ET.parse('' .. i .. ed)
-		local consistent = p.additively_consistent_int(et, all_interval, false, nil)
+		local consistent = limits.additively_consistent(et, all_interval, false, false, nil)
 		if consistent then
 			local maxe = p.max_error(et, all_interval)

2025-05-19T12:02:05Z

← Older revision		Revision as of 12:02, 19 May 2025
Line 1:		Line 1:
			local ET = require('Module:ET')
	local rat = require('Module:Rational')		local rat = require('Module:Rational')
	local utils = require("Module:Utils")		local utils = require("Module:Utils")
	~~local ET = require('Module:ET')~~
	local p = {}		local p = {}

2024-12-19T15:13:28Z

+tolerance for zero error, -invalid variable

← Older revision		Revision as of 15:13, 19 December 2024
Line 119:		Line 119:
	for i = 1, max_n do		for i = 1, max_n do
	local et = ET.parse('' .. i .. ed)		local et = ET.parse('' .. i .. ed)
	local consistent = p.additively_consistent_int(et, all_interval, false, ~~previous~~)		local consistent = p.additively_consistent_int(et, all_interval, false, nil)
	if consistent then		if consistent then
	local maxe = p.max_error(et, all_interval)		local maxe = p.max_error(et, all_interval)
	if maxe <= 0.0 then		if maxe <= 5.0e-11 then
	table.insert(vals, "[[" .. i .. ed .. "]]" .. "(just)")		table.insert(vals, "[[" .. i .. ed .. "]]" .. "(just)")
	break		break

2024-12-18T14:58:08Z

support maxlen > 72

← Older revision		Revision as of 14:58, 18 December 2024
Line 101:		Line 101:
	distance = distance or 1.0		distance = distance or 1.0
	ed = ed or 'edo'		ed = ed or 'edo'
	maxlen = maxlen or 72		local max_n = 72
			maxlen = maxlen or max_n
			if max_n < maxlen then max_n = maxlen end
	local all_interval = {}		local all_interval = {}

Line 115:		Line 117:

	local vals = {}		local vals = {}
	for i = 1, 72 do		for i = 1, max_n do
	local et = ET.parse('' .. i .. ed)		local et = ET.parse('' .. i .. ed)
	local consistent = p.additively_consistent_int(et, all_interval, false, previous)		local consistent = p.additively_consistent_int(et, all_interval, false, previous)

2024-12-16T15:37:36Z

division by zero

← Older revision		Revision as of 15:37, 16 December 2024
Line 120:		Line 120:
	if consistent then		if consistent then
	local maxe = p.max_error(et, all_interval)		local maxe = p.max_error(et, all_interval)
			if maxe <= 0.0 then
			table.insert(vals, "[[" .. i .. ed .. "]]" .. "(just)")
			break
			end
	local dist = 0.5/maxe		local dist = 0.5/maxe
	local up = (dist >= distance)		local up = (dist >= distance)

2024-12-15T05:56:56Z

improve ellipsis

← Older revision		Revision as of 05:56, 15 December 2024
Line 128:		Line 128:
	end		end
	if up then		if up then
	~~table.insert(vals, "[[" .. i .. ed .. "]]" .. string.rep("*", llevel))~~
	if #vals >= maxlen then		if #vals >= maxlen then
	table.insert(vals, "~~...~~")		table.insert(vals, "…")
	break		break
	end		end
			table.insert(vals, "[[" .. i .. ed .. "]]" .. string.rep("*", llevel))
	end		end
	end		end

2024-12-15T05:48:29Z

+maxlen

← Older revision		Revision as of 05:48, 15 December 2024
Line 98:		Line 98:
	end		end

	function p.consistent_edos(harmonics, distance)		function p.consistent_edos(harmonics, distance, ed, maxlen)
			distance = distance or 1.0
			ed = ed or 'edo'
			maxlen = maxlen or 72
	local all_interval = {}		local all_interval = {}

Line 113:		Line 116:
	local vals = {}		local vals = {}
	for i = 1, 72 do		for i = 1, 72 do
	local et = ET.parse('' .. i .. ~~'edo'~~)		local et = ET.parse('' .. i .. ed)
	local consistent = p.additively_consistent_int(et, all_interval, false, previous)		local consistent = p.additively_consistent_int(et, all_interval, false, previous)
	if consistent then		if consistent then
Line 125:		Line 128:
	end		end
	if up then		if up then
	table.insert(vals, "[[" .. i .. "~~edo~~]]" .. string.rep("*", llevel))		table.insert(vals, "[[" .. i .. ed .. "]]" .. string.rep("*", llevel))
			if #vals >= maxlen then
			table.insert(vals, "...")
			break
			end
	end		end
	end		end
Line 190:		Line 197:
	end		end

	cat = "(d >= " .. distance .. ") " .. p.consistent_edos(harmonics, distance)		cat = "(d >= " .. distance .. ") " .. p.consistent_edos(harmonics, distance, 'edo', 4)
	--end		--end

2024-12-15T05:14:50Z

+distance parameter

@@ Line 96: / Line 96: @@
 	end
 	return maxe
 end
 function p.noinfobox_chord(frame)
-	local page_name = frame:preprocess("{{PAGENAME}}")
+	local distance = tonumber(frame.args["Distance"])
 	local debug_data = ""
 	local infobox_data = {}
@@ Line 111: / Line 145: @@
 			assert(h > 0, "invalid harmonic")
 			table.insert(harmonics, h)
 		end
@@ Line 129: / Line 173: @@
 		local root_interval_links = {}
 		local step_interval_links = {}
 		for i, h in ipairs(harmonics) do
 			-- compute ratio of this harmonic relative to the root
@@ Line 144: / Line 187: @@
 				local step_denom = prev / step_gcd
 				table.insert(step_interval_links, "[[" .. step_numer .. "/" .. step_denom .. "]]")
 			end
 		end
 	--end
 	return cat

2024-12-14T16:34:33Z

mark by consistency distance

@@ Line 83: / Line 83: @@
 	end
 	return true
 end
@@ Line 150: / Line 163: @@
 			local consistent = p.additively_consistent_int(et, all_interval, false, previous)
 			if consistent then
-				table.insert(vals, "[[" .. i .. "edo]]")
+				local maxe = p.max_error(et, all_interval)
 			end
 		end

2024-12-14T14:11:35Z

equave-free veresion of additively_consistent()

@@ Line 2: / Line 2: @@
 local utils = require("Module:Utils")
 local ET = require('Module:ET')
 local p = {}
 function p.noinfobox_chord(frame)
@@ Line 68: / Line 148: @@
 		for i = 1, 50 do
 			local et = ET.parse('' .. i .. 'edo')
-			local consistent = consistency.additively_consistent(et, all_interval, false, previous)
+			local consistent = p.additively_consistent_int(et, all_interval, false, previous)
 			if consistent then
 				table.insert(vals, "[[" .. i .. "edo]]")