Module:Percentage - Revision history

Frietjes at 15:22, 8 December 2019

2019-12-08T15:22:00Z

← Previous revision		Revision as of 15:22, 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:12, 8 December 2019

2019-12-08T15:12:02Z

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

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

⚫	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		if mw.ustring.match(num or '', '^%s(%d)%.(%d+)<span[^<>]>×</span>10<sup>([%-−])(%d)</sup>%s$') then
Line 40:		Line 32:
	end		end

		⚫	local function fmtout(num,snote)
⚫	function ~~percentage~~(n1, n2, prec, suffix, pad, sigfig, sn)
		⚫	if snote then
		⚫	return _nonscinote(num)
		⚫	else
		⚫	return num
		⚫	end
		⚫	end

		⚫	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 67:		Line 67:

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

Frietjes at 14:43, 8 December 2019

2019-12-08T14:43:54Z

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

Frietjes at 14:35, 8 December 2019

2019-12-08T14:35:36Z

← Previous revision		Revision as of 14:35, 8 December 2019
Line 18:		Line 18:
	end		end

			local function fmtout(num,snote)
⚫	function percentage(n1, n2, prec, suffix, pad, sigfig)
			if snote then
			return nonscinote(num)
			else
			return num
			end
			end

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

		⚫	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 27:		Line 48:
	if sigfig ~= '' then		if sigfig ~= '' then
	if pct ~= 0 then		if pct ~= 0 then
	return skey .. rnd(pct, tonumber(sigfig) - oom(pct) - 1) .. suffix		return skey .. fmtout(rnd(pct, tonumber(sigfig) - oom(pct) - 1), sn) .. suffix
	else		else
	return skey .. rnd(pct, tonumber(sigfig) - 3) .. suffix		return skey .. fmtout(rnd(pct, tonumber(sigfig) - 3), sn) .. suffix
	end		end
	end		end
	if pad ~= '' then		if pad ~= '' then
	return skey .. rnd(pct, prec) .. suffix		return skey .. fmtout(rnd(pct, prec), sn) .. suffix
	end		end

Line 41:		Line 62:
	end		end

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

Line 50:		Line 71:
	tonumber(frame.args[3]) or tonumber(frame.args['pad']) or 0,		tonumber(frame.args[3]) or tonumber(frame.args['pad']) or 0,
	frame.args['%'] or '%', frame.args['pad'] or '',		frame.args['%'] or '%', frame.args['pad'] or '',
	frame.args['sigfig'] or ''		frame.args['sigfig'] or '',
			(frame.args['nonscinote'] or '') == 'y'
	)		)
	end		end

Bradv: Changed protection level for "Module:Percentage": Highly visible template, match with Template:Percentage ([Edit=Require template editor access] (indefinite) [Move=Require template editor access] (indefinite))

2019-10-24T01:54:40Z

Changed protection level for "Module:Percentage": Highly visible template, match with Template:Percentage ([Edit=Require template editor access] (indefinite) [Move=Require template editor access] (indefinite))

← Previous revision	Revision as of 01:54, 24 October 2019
(No difference)

MusikBot II: Protected "Module:Percentage": High-risk template or module (more info) ([Edit=Require autoconfirmed or confirmed access] (indefinite))

2019-10-20T17:59:41Z

Protected "Module:Percentage": High-risk template or module (more info) ([Edit=Require autoconfirmed or confirmed access] (indefinite))

← Previous revision	Revision as of 17:59, 20 October 2019
(No difference)

Frietjes at 14:29, 20 October 2019

2019-10-20T14:29:04Z

← Previous revision		Revision as of 14:29, 20 October 2019
Line 51:		Line 51:
	frame.args['%'] or '%', frame.args['pad'] or '',		frame.args['%'] or '%', frame.args['pad'] or '',
	frame.args['sigfig'] or ''		frame.args['sigfig'] or ''
			)
	) .. ' (' .. (tonumber(frame.args[3]) or tonumber(frame.args['pad']) or 0) .. ')'
	end		end

Frietjes at 14:20, 20 October 2019

2019-10-20T14:20:05Z

← Previous revision		Revision as of 14:20, 20 October 2019
Line 33:		Line 33:
	end		end
	if pad ~= '' then		if pad ~= '' then
	return skey .. rnd(pct, prec) .. suffix ~~.. ' (' .. pct .. ' and ' .. prec .. ')'~~		return skey .. rnd(pct, prec) .. suffix
	end		end

Line 48:		Line 48:
	tonumber(frame.args[1]) or 0,		tonumber(frame.args[1]) or 0,
	tonumber(frame.args[2]) or 100,		tonumber(frame.args[2]) or 100,
	tonumber(frame.args[3] or frame.args['pad']) or 0,		tonumber(frame.args[3]) or tonumber(frame.args['pad']) or 0,
	frame.args['%'] or '%', frame.args['pad'] or '',		frame.args['%'] or '%', frame.args['pad'] or '',
	frame.args['sigfig'] or ''		frame.args['sigfig'] or ''
			) .. ' (' .. (tonumber(frame.args[3]) or tonumber(frame.args['pad']) or 0) .. ')'
	)
	end		end

Frietjes at 14:17, 20 October 2019

2019-10-20T14:17:22Z

← Previous revision		Revision as of 14:17, 20 October 2019
Line 33:		Line 33:
	end		end
	if pad ~= '' then		if pad ~= '' then
	return skey .. rnd(pct, prec) .. suffix .. ' (' .. pct .. ' and ' .. prec ')'		return skey .. rnd(pct, prec) .. suffix .. ' (' .. pct .. ' and ' .. prec .. ')'
	end		end

Frietjes: debug

2019-10-20T14:16:28Z

debug

← Previous revision		Revision as of 14:16, 20 October 2019
Line 33:		Line 33:
	end		end
	if pad ~= '' then		if pad ~= '' then
	return skey .. rnd(pct, prec) .. suffix		return skey .. rnd(pct, prec) .. suffix .. ' (' .. pct .. ' and ' .. prec ')'
	end		end