Module:Percentage/sandbox - Revision history

Frietjes at 15:28, 8 December 2019

2019-12-08T15:28:17Z

← Previous revision		Revision as of 15:28, 8 December 2019
Line 68:		Line 68:
	function p.main(frame)		function p.main(frame)
	local args = frame.args[1] and frame.args or frame:getParent().args		local args = frame.args[1] and frame.args or frame:getParent().args
			local yesno = require('Module:Yesno')
	return _percentage(		return _percentage(
	tonumber(args[1]) or 0,		tonumber(args[1]) or 0,
Line 74:		Line 75:
	args['%'] or '%', args['pad'] or '',		args['%'] or '%', args['pad'] or '',
	args['sigfig'] or '',		args['sigfig'] or '',
	(args['nonscinote'] or '') ~~== 'y'~~		yesno(args['nonscinote'] or 'no')
	)		)
	end		end

Frietjes at 15:09, 8 December 2019

2019-12-08T15:09:54Z

← Previous revision		Revision as of 15:09, 8 December 2019
Line 18:		Line 18:
	end		end

	~~local~~ function _nonscinote(num)		function _nonscinote(num)
	-- This function undoes scientific notation		-- This function undoes scientific notation
	~~while~~ mw.ustring.~~find~~(num or '', '^~~.-?~~%d%d%.%d+<span[^<>]>×</span>10<sup>[%-−]%d</sup>.$' ) do		if mw.ustring.match(num or '', '^%s(%d)%.(%d+)<span[^<>]>×</span>10<sup>([%-−])(%d)</sup>%s$') then
	local ~~pre,~~a,b,c,d~~,suf~~ = mw.ustring.match(num or '', '^~~(.-?)(~~%d%d)%.(%d+)<span[^<>]>×</span>10<sup>([%-−])(%d)</sup>(.)$')		local a,b,c,d = mw.ustring.match(num or '', '^%s(%d)%.(%d+)<span[^<>]>×</span>10<sup>([%-−])(%d)</sup>%s$')
	d = tonumber(d) or 1		d = tonumber(d) or 1
	if c ~= '' then		if c ~= '' then
	~~num = pre ..~~ '0.' .. mw.ustring.rep('0', d - 1) .. a .. b ~~.. suf~~		return '0.' .. mw.ustring.rep('0', d - 1) .. a .. b
	else		else
	~~num = pre ..~~ a .. mw.ustring.sub(b .. mw.ustring.rep('0', d ), 1, d) ~~.. suf~~		return a .. mw.ustring.sub(b .. mw.ustring.rep('0', d ), 1, d)
	end		end
	end		end
Line 78:		Line 78:
	end		end

	function p.nonscinote(frame)
	local args = frame.args[1] and frame.args or frame:getParent().args
	return _nonscinote(args[1] or '')
	end
	return p		return p

Frietjes at 15:04, 8 December 2019

2019-12-08T15:04:04Z

← Previous revision		Revision as of 15:04, 8 December 2019
Line 20:		Line 20:
	local function _nonscinote(num)		local function _nonscinote(num)
	-- This function undoes scientific notation		-- This function undoes scientific notation
	while mw.ustring.~~match~~(num or '', '^.-?%d%d%.%d+<span[^<>]>×</span>10<sup>[%-−]%d</sup>.$' ) do		while mw.ustring.find(num or '', '^.-?%d%d%.%d+<span[^<>]>×</span>10<sup>[%-−]%d</sup>.$' ) do
	num = 'MATCH' .. num
	local pre,a,b,c,d,suf = mw.ustring.match(num or '', '^(.-?)(%d%d)%.(%d+)<span[^<>]>×</span>10<sup>([%-−])(%d)</sup>(.)$')		local pre,a,b,c,d,suf = mw.ustring.match(num or '', '^(.-?)(%d%d)%.(%d+)<span[^<>]>×</span>10<sup>([%-−])(%d)</sup>(.)$')
	d = tonumber(d) or 1		d = tonumber(d) or 1

Frietjes at 15:03, 8 December 2019

2019-12-08T15:03:05Z

← Previous revision		Revision as of 15:03, 8 December 2019
Line 20:		Line 20:
	local function _nonscinote(num)		local function _nonscinote(num)
	-- This function undoes scientific notation		-- This function undoes scientific notation
	while mw.ustring.match(num or '', '^.-?%d%d%.%d+<span[^<>]>×</span>10<sup>[%-−]*%d</sup>.-?$' ) do		while mw.ustring.match(num or '', '^.-?%d%d%.%d+<span[^<>]>×</span>10<sup>[%-−]%d</sup>.$' ) do
			num = 'MATCH' .. num
	local pre,a,b,c,d,suf = mw.ustring.match(num or '', '^(.-?)(%d%d)%.(%d+)<span[^<>]>×</span>10<sup>([%-−]*)(%d)</sup>(.-?)$')		local pre,a,b,c,d,suf = mw.ustring.match(num or '', '^(.-?)(%d%d)%.(%d+)<span[^<>]>×</span>10<sup>([%-−])(%d)</sup>(.)$')
	d = tonumber(d) or 1		d = tonumber(d) or 1
	if c ~= '' then		if c ~= '' then

Frietjes at 14:59, 8 December 2019

2019-12-08T14:59:22Z

← Previous revision		Revision as of 14:59, 8 December 2019
Line 20:		Line 20:
	local function _nonscinote(num)		local function _nonscinote(num)
	-- This function undoes scientific notation		-- This function undoes scientific notation
	if mw.ustring.match(num or '', '^%s(%d)%.(%d+)<span[^<>]>×</span>10<sup>([%-−])(%d)</sup>%s$') ~~then~~		while mw.ustring.match(num or '', '^.-?%d%d%.%d+<span[^<>]>×</span>10<sup>[%-−]*%d</sup>.-?$' ) do
	local a,b,c,d = mw.ustring.match(num or '', '^%s(%d)%.(%d+)<span[^<>]>×</span>10<sup>([%-−])(%d)</sup>%s$')		local pre,a,b,c,d,suf = mw.ustring.match(num or '', '^(.-?)(%d%d)%.(%d+)<span[^<>]>×</span>10<sup>([%-−]*)(%d)</sup>(.-?)$')
	d = tonumber(d) or 1		d = tonumber(d) or 1
	if c ~= '' then		if c ~= '' then
	~~return~~ '0.' .. mw.ustring.rep('0', d - 1) .. a .. b		num = pre .. '0.' .. mw.ustring.rep('0', d - 1) .. a .. b .. suf
	else		else
	~~return~~ a .. mw.ustring.sub(b .. mw.ustring.rep('0', d ), 1, d)		num = pre .. a .. mw.ustring.sub(b .. mw.ustring.rep('0', d ), 1, d) .. suf
	end		end
	end		end
Line 40:		Line 40:
	end		end

	function ~~percentage~~(n1, n2, prec, suffix, pad, sigfig, sn)		function _percentage(n1, n2, prec, suffix, pad, sigfig, sn)
	local pct = 100*n1/n2		local pct = 100*n1/n2
	skey = '<span data-sort-value="'		skey = '<span data-sort-value="'
Line 68:		Line 68:
	function p.main(frame)		function p.main(frame)
	local args = frame.args[1] and frame.args or frame:getParent().args		local args = frame.args[1] and frame.args or frame:getParent().args
	return ~~percentage~~(		return _percentage(
	tonumber(args[1]) or 0,		tonumber(args[1]) or 0,
	tonumber(args[2]) or 100,		tonumber(args[2]) or 100,
Line 78:		Line 78:
	end		end

			function p.nonscinote(frame)
			local args = frame.args[1] and frame.args or frame:getParent().args
			return _nonscinote(args[1] or '')
			end
	return p		return p

Frietjes at 14:47, 8 December 2019

2019-12-08T14:47:35Z

@@ Line 18: / Line 18: @@
 end
-local function fmtout(num,snote)
+local function _nonscinote(num)
 	-- This function undoes scientific notation
 	if mw.ustring.match(num or '', '^%s*(%d)%.(%d+)<span[^<>]*>×</span>10<sup>([%-−]*)(%d)</sup>%s*$') then
@@ Line 38: / Line 30: @@
 	end
 	return num
 end

Frietjes: ←Created page with '-- -- This module implements Template:Percentage -- local p = {} local math_module = require( "Module:Math" ) local precision = math_module._precision local...'

2019-12-08T14:45:37Z

←Created page with '-- -- This module implements Template:Percentage -- local p = {} local math_module = require( "Module:Math" ) local precision = math_module._precision local...'

New page

--
-- This module implements [[Template:Percentage]]
--
local p = {}

local math_module = require( "Module:Math" )
local precision = math_module._precision
local sortkey = require( "Module:Sortkey" )

local function rnd(num, digits)
-- This function implements {{rnd}}
return math_module._precision_format(tostring(num), digits)
end

local function oom(num)
-- This function implements {{order of magnitude}}
return math_module._order(tostring(num))
end

local function fmtout(num,snote)
if snote then
return nonscinote(num)
else
return num
end
end

local function nonscinote(num)
-- This function undoes scientific notation
if mw.ustring.match(num or '', '^%s*(%d)%.(%d+)<span[^<>]*>×10([%-−]*)(%d)%s*$') then
local a,b,c,d = mw.ustring.match(num or '', '^%s*(%d)%.(%d+)<span[^<>]*>×10([%-−]*)(%d)%s*$')
d = tonumber(d) or 1
if c ~= '' then
return '0.' .. mw.ustring.rep('0', d - 1) .. a .. b
else
return a .. mw.ustring.sub(b .. mw.ustring.rep('0', d ), 1, d)
end
end
return num
end

function percentage(n1, n2, prec, suffix, pad, sigfig, sn)
local pct = 100*n1/n2
skey = ''

-- prec = math.floor(prec)

if sigfig ~= '' then
if pct ~= 0 then
return skey .. fmtout(rnd(pct, tonumber(sigfig) - oom(pct) - 1), sn) .. suffix
else
return skey .. fmtout(rnd(pct, tonumber(sigfig) - 3), sn) .. suffix
end
end
if pad ~= '' then
return skey .. fmtout(rnd(pct, prec), sn) .. suffix
end

prec = (prec < 0) and 0 or prec
if pct ~= 0 then
pct = ((pct < 0) and -1 or 1)*math.floor(math.abs(pct * 10^prec) + 0.5) / 10^prec
end

return skey .. fmtout(pct, sn) .. suffix
end

function p.main(frame)
local args = frame.args[1] and frame.args or frame:getParent().args
return percentage(
tonumber(args[1]) or 0,
tonumber(args[2]) or 100,
tonumber(args[3]) or tonumber(args['pad']) or 0,
args['%'] or '%', args['pad'] or '',
args['sigfig'] or '',
(args['nonscinote'] or '') == 'y'
)
end

return p