Module:Uniform map: Difference between revisions

(8 intermediate revisions by 2 users not shown)

Line 1:

local p = {}

local getArgs = require("Module:Arguments").getArgs

local utils = require("Module:Utils")

local yesno = require("Module:Yesno")

~~local p = {}~~

-- stylua: ignore

Line 87:

Line 88:

-- Generate table of p-limit uniform maps between min and max, for use with print_table

-- Could potentially be used standalone for raw data with headers

function p.make_table(prime, min, max)

function p.make_table(prime, prec, min, max)

local maptable = {} -- Table of uniform maps with boundaries and wart notation

local map_table = p.new()

Line 93:

Line 94:

local lb = p.lower_bound(map_table) -- Minimum size for the current map

local ub = p.upper_bound(map_table) -- Maximum size for the current map

local row = {"Min. size", "Max. size", "[[Wart notation]]"}

local row = { "Min. size", "Max. size", "[[Wart notation]]" }

for i = 1, #map_table.map do

table.insert(row, utils.primes[i])

Line 99:

Line 100:

table.insert(maptable, row)

while lb < max do

row = {string.format("%.4f", lb), string.format("%.4f", ub), p.wart(map_table.map)}

row = { string.format(string.format("%%.%df", tonumber(prec)), lb), string.format(string.format("%%.%df", tonumber(prec)), ub), p.wart(map_table.map) }

for j = 1, #map_table.map do

table.insert(row, map_table.map[j])

Line 114:

Line 115:

function p.print_table(frame)

local args = getArgs(frame)

local prime = args[1]

local prime = args["limit"]

local min = args[2]

local min = args["min"]

local max = args[3]

local max = args["max"]

local edo = args["edo"]

local prec = args["prec"]

local debugg = yesno(args["debug"])

if utils.index_of(utils.primes, utils.eval_num_arg(~~prime~~, 5)) == nil then

-- Default to 13-limit

~~prime = 5~~ -- ~~Default~~ to 5-~~limit~~

prime = utils.eval_num_arg(prime, 13)

if utils.index_of(utils.primes, prime) == nil then

prime = 13

end

assert(prime, "Prime limit undefined.")

min = utils.eval_num_arg(min, nil)

max = utils.eval_num_arg(max, nil)

if max == nil or min == nil then

assert(edo, "Must provide edo if not min or max given.")

-- default to +/- 0.2

min = edo - 0.2

max = edo + 0.2

end

local luatable = p.make_table(prime, ~~utils.eval_num_arg(~~min, ~~11.5), utils.eval_num_arg(~~max~~, 12.5)~~)

local ~~wtable~~ = "{| class=\"wikitable\"\n"

local luatable = p.make_table(prime, prec, min, max)

.. "|+ style=\"font-size: 105%; | "

local result = '{| class="wikitable"\n'

.. '|+ style="font-size: 105%; | '

.. string.format("%d-limit [[uniform map]]s between %g and %g\n", prime, min, max)

.. "|-\n"

for i = 1, 3 do

~~wtable~~ = ~~wtable~~ .. "! " .. luatable[1][i] .. "\n"

result = result .. "! " .. luatable[1][i] .. "\n"

end

~~wtable~~ = ~~wtable~~ .. "! Map\n"

result = result .. "! Map\n"

for i = 2, #luatable do

~~wtable~~ = ~~wtable~~ .. "|-\n"

result = result .. "|-\n"

for j = 1, 3 do

~~wtable~~ = ~~wtable~~ .. "| " .. luatable[i][j] .. "\n"

result = result .. "| " .. luatable[i][j] .. "\n"

end

local wikimap = ""

Line 140:

Line 157:

wikimap = wikimap .. " " .. luatable[i][j]

end

~~wtable~~ = ~~wtable~~ .. "| ~~" .. frame:expandTemplate(~~{ ~~title = "~~map", ~~args = {~~ wikimap ~~} }~~) .. "\n"

result = result .. string.format("| {{map|%s}}\n", wikimap)

end

result = result .. "|}"

-- Debugger option

if debugg == true then

result = "<syntaxhighlight lang=\"wikitext\">" .. result .. "</syntaxhighlight>"

end

~~wtable = wtable .. "|}"~~

return frame:preprocess(~~debugg == true and "<pre>" .. wtable .. "</pre>" or wtable~~)

return frame:preprocess(result)

end

return p

@@ Line 1: / Line 1: @@
+local p = {}
 local getArgs = require("Module:Arguments").getArgs
 local utils = require("Module:Utils")
 local yesno = require("Module:Yesno")
-local p = {}
 -- stylua: ignore
@@ Line 87: / Line 88: @@
 -- Generate table of p-limit uniform maps between min and max, for use with print_table
 -- Could potentially be used standalone for raw data with headers
-function p.make_table(prime, min, max)
+function p.make_table(prime, prec, min, max)
 	local maptable = {} -- Table of uniform maps with boundaries and wart notation
 	local map_table = p.new()
@@ Line 93: / Line 94: @@
 	local lb = p.lower_bound(map_table) -- Minimum size for the current map
 	local ub = p.upper_bound(map_table) -- Maximum size for the current map
-	local row = {"Min. size", "Max. size", "[[Wart notation]]"}
+	local row = { "Min. size", "Max. size", "[[Wart notation]]" }
 	for i = 1, #map_table.map do
 		table.insert(row, utils.primes[i])
@@ Line 99: / Line 100: @@
 	table.insert(maptable, row)
 	while lb < max do
-		row = {string.format("%.4f", lb), string.format("%.4f", ub), p.wart(map_table.map)}
+		row = { string.format(string.format("%%.%df", tonumber(prec)), lb), string.format(string.format("%%.%df", tonumber(prec)), ub), p.wart(map_table.map) }
 		for j = 1, #map_table.map do
 			table.insert(row, map_table.map[j])
@@ Line 114: / Line 115: @@
 function p.print_table(frame)
 	local args = getArgs(frame)
-	local prime = args[1]
+	local prime = args["limit"]
-	local min = args[2]
+	local min = args["min"]
-	local max = args[3]
+	local max = args["max"]
+	local edo = args["edo"]
+	local prec = args["prec"]
 	local debugg = yesno(args["debug"])
-	if utils.index_of(utils.primes, utils.eval_num_arg(prime, 5)) == nil then
+	-- Default to 13-limit
-		prime = 5 -- Default to 5-limit
+	prime = utils.eval_num_arg(prime, 13)
+	if utils.index_of(utils.primes, prime) == nil then
+		prime = 13
+	end
+	assert(prime, "Prime limit undefined.")
+	min = utils.eval_num_arg(min, nil)
+	max = utils.eval_num_arg(max, nil)
+	if max == nil or min == nil then
+		assert(edo, "Must provide edo if not min or max given.")
+		-- default to +/- 0.2
+		min = edo - 0.2
+		max = edo + 0.2
 	end
-	local luatable = p.make_table(prime, utils.eval_num_arg(min, 11.5), utils.eval_num_arg(max, 12.5))
-	local wtable = "{| class=\"wikitable\"\n"
+	local luatable = p.make_table(prime, prec, min, max)
-		.. "|+ style=\"font-size: 105%; | "
+	local result = '{| class="wikitable"\n'
+		.. '|+ style="font-size: 105%; | '
 		.. string.format("%d-limit [[uniform map]]s between %g and %g\n", prime, min, max)
 		.. "|-\n"
 	for i = 1, 3 do
-		wtable = wtable .. "! " .. luatable[1][i] .. "\n"
+		result = result .. "! " .. luatable[1][i] .. "\n"
 	end
-	wtable = wtable .. "! Map\n"
+	result = result .. "! Map\n"
 	for i = 2, #luatable do
-		wtable = wtable .. "|-\n"
+		result = result .. "|-\n"
 		for j = 1, 3 do
-			wtable = wtable .. "| " .. luatable[i][j] .. "\n"
+			result = result .. "| " .. luatable[i][j] .. "\n"
 		end
 		local wikimap = ""
@@ Line 140: / Line 157: @@
 			wikimap = wikimap .. " " .. luatable[i][j]
 		end
-		wtable = wtable .. "| " .. frame:expandTemplate({ title = "map", args = { wikimap } }) .. "\n"
+		result = result .. string.format("| {{map|%s}}\n", wikimap)
+	end
+	result = result .. "|}"
+	-- Debugger option
+	if debugg == true then
+		result = "<syntaxhighlight lang=\"wikitext\">" .. result .. "</syntaxhighlight>"
 	end
-	wtable = wtable .. "|}"
-	return frame:preprocess(debugg == true and "<pre>" .. wtable .. "</pre>" or wtable)
+	return frame:preprocess(result)
 end
 return p