Module:Math - Revision history

Ookami: 42 revisions imported

2020-09-03T00:52:27Z

42 revisions imported

← Older revision	Revision as of 00:52, 3 September 2020
(No difference)

meta>Johnuniq: clean whitespace; remove unintended global orig_precision which gives errors when used with a module that invokes Module:No globals such as 1994–95 Yemeni League

2019-09-14T01:55:35Z

clean whitespace; remove unintended global orig_precision which gives errors when used with a module that invokes Module:No globals such as 1994–95 Yemeni League

← Older revision		Revision as of 01:55, 14 September 2019
Line 52:		Line 52:
	-- Use a function on all supplied arguments, and return the result. The function must accept two numbers as parameters,		-- Use a function on all supplied arguments, and return the result. The function must accept two numbers as parameters,
	-- and must return a number as an output. This number is then supplied as input to the next function call.		-- and must return a number as an output. This number is then supplied as input to the next function call.
	local vals = makeArgArray(...)		local vals = makeArgArray(...)
	local count = #vals -- The number of valid arguments		local count = #vals -- The number of valid arguments
	if count == 0 then return		if count == 0 then return
	-- Exit if we have no valid args, otherwise removing the first arg would cause an error.		-- Exit if we have no valid args, otherwise removing the first arg would cause an error.
	nil, 0		nil, 0
	end		end
	local ret = table.remove(vals, 1)		local ret = table.remove(vals, 1)
	for _, val in ipairs(vals) do		for _, val in ipairs(vals) do
Line 120:		Line 120:
	else		else
	return p._order(input_number)		return p._order(input_number)
	end		end
	end		end

Line 154:		Line 154:
	return math.log10(denom_value);		return math.log10(denom_value);
	end		end
	end		end
	end		end
	end		end

	input_number, input_string = p._cleanNumber(input_string);		input_number, input_string = p._cleanNumber(input_string);
Line 163:		Line 163:
	else		else
	return p._precision(input_string)		return p._precision(input_string)
	end		end
	end		end

Line 180:		Line 180:
	x = string.sub(x, 1, exponent_pos - 1)		x = string.sub(x, 1, exponent_pos - 1)
	result = result - tonumber(exponent)		result = result - tonumber(exponent)
	end		end

	if decimal ~= nil then		if decimal ~= nil then
Line 238:		Line 238:

	function p._median(...)		function p._median(...)
	local vals = makeArgArray(...)		local vals = makeArgArray(...)
	local count = #vals		local count = #vals
	table.sort(vals)		table.sort(vals)

	if count == 0 then		if count == 0 then
	return 0		return 0
	end		end

	if p._mod(count, 2) == 0 then		if p._mod(count, 2) == 0 then
	return (vals[count/2] + vals[count/2+1])/2		return (vals[count/2] + vals[count/2+1])/2
Line 254:		Line 254:

	--[[		--[[
	min		min

	Finds the minimum argument		Finds the minimum argument
Line 279:		Line 279:

	--[[		--[[
	sum		sum

	Finds the sum		Finds the sum
Line 305:		Line 305:

	--[[		--[[
	average		average

	Finds the average		Finds the average
Line 347:		Line 347:
	else		else
	return p._round(value, precision)		return p._round(value, precision)
	end		end
	end		end

Line 387:		Line 387:
	else		else
	return p._mod(x, y)		return p._mod(x, y)
	end		end
	end		end

Line 431:		Line 431:
	precision_format		precision_format

	Rounds a number to the specified precision and formats according to rules		Rounds a number to the specified precision and formats according to rules
	originally used for {{template:Rnd}}. Output is a string.		originally used for {{template:Rnd}}. Output is a string.

Line 463:		Line 463:
	-- some circumstances because the terminal digits will be inaccurately reported.		-- some circumstances because the terminal digits will be inaccurately reported.
	if order + precision >= 14 then		if order + precision >= 14 then
	~~orig_precision =~~ p._precision(value_string)		if order + p._precision(value_string) >= 14 then
	~~if order + orig_precision~~ >= 14 then		precision = 13 - order;
	precision = 13 - order;		end
	end
	end		end

Line 473:		Line 472:
	value = p._round(value, precision)		value = p._round(value, precision)
	current_precision = p._precision(value)		current_precision = p._precision(value)
	end		end

	local formatted_num = lang:formatNum(math.abs(value))		local formatted_num = lang:formatNum(math.abs(value))
Line 483:		Line 482:
	else		else
	sign = ''		sign = ''
	end		end

	-- Handle cases requiring scientific notation		-- Handle cases requiring scientific notation
Line 492:		Line 491:
	formatted_num = lang:formatNum(math.abs(value))		formatted_num = lang:formatNum(math.abs(value))
	else		else
	order = 0;		order = 0;
	end		end
	formatted_num = sign .. formatted_num		formatted_num = sign .. formatted_num

	-- Pad with zeros, if needed		-- Pad with zeros, if needed
	if current_precision < precision then		if current_precision < precision then
	local padding		local padding
Line 510:		Line 509:

	formatted_num = formatted_num .. string.rep('0', padding)		formatted_num = formatted_num .. string.rep('0', padding)
	end		end
	else		else
	padding = precision - current_precision		padding = precision - current_precision
	if padding > 20 then		if padding > 20 then
Line 527:		Line 526:
	else		else
	order = lang:formatNum(order)		order = lang:formatNum(order)
	end		end

	formatted_num = formatted_num .. '<span style="margin:0 .15em 0 .25em">×</span>10<sup>' .. order .. '</sup>'		formatted_num = formatted_num .. '<span style="margin:0 .15em 0 .25em">×</span>10<sup>' .. order .. '</sup>'
Line 536:		Line 535:

	--[[		--[[
	Helper function that interprets the input numerically. If the		Helper function that interprets the input numerically. If the
	input does not appear to be a number, attempts evaluating it as		input does not appear to be a number, attempts evaluating it as
	a parser functions expression.		a parser functions expression.

meta>Primefac: fix calculation

2018-09-30T23:27:34Z

fix calculation

← Older revision		Revision as of 23:27, 30 September 2018
Line 249:		Line 249:
	return (vals[count/2] + vals[count/2+1])/2		return (vals[count/2] + vals[count/2+1])/2
	else		else
	return vals[count/2+1]		return vals[math.ceil(count/2)]
	end		end
	end		end

meta>Primefac: error handling for count

2018-09-30T23:23:35Z

error handling for count

← Older revision		Revision as of 23:23, 30 September 2018
Line 241:		Line 241:
	local count = #vals		local count = #vals
	table.sort(vals)		table.sort(vals)

			if count == 0 then
			return 0
			end

	if p._mod(count, 2) == 0 then		if p._mod(count, 2) == 0 then

meta>Primefac: better median handling

2018-09-30T23:21:27Z

better median handling

← Older revision		Revision as of 23:21, 30 September 2018
Line 234:		Line 234:

	function wrap.median(args)		function wrap.median(args)
	return p._median(args)		return p._median(unpackNumberArgs(args))
	end		end

	function p._median(~~args~~)		function p._median(...)
	local vals = {}		local vals = makeArgArray(...)
	~~local count = 0~~		local count = #vals
	~~for k,v in pairs~~(~~args) do~~		table.sort(vals)
	~~if v == string~~.~~match(v,'(%d+)') then~~
	~~table~~.~~insert(vals,v~~)		if p._mod(count, 2) == 0 then
	count = ~~count+1~~
	~~end~~
	~~end~~
	table.sort(vals~~,function(a,b~~) ~~return tonumber(a) < tonumber(b) end) -- force number sort~~
	if ~~count/2 == math~~.~~ceil~~(count/2) then
	return (vals[count/2] + vals[count/2+1])/2		return (vals[count/2] + vals[count/2+1])/2
	else		else
	return vals[~~math.ceil(~~count/2)];		return vals[count/2+1]
	end		end
	end		end

meta>Primefac: implementing pseudo-TPER to add "median" - see Special:PermaLink/861908321#Module:Average

2018-09-30T22:14:07Z

implementing pseudo-TPER to add "median" - see Special:PermaLink/861908321#Module:Average

@@ Line 219: / Line 219: @@
 	if max_value then
 		return max_value
 	end
 end

meta>Primefac: fix typo

2018-09-30T21:54:56Z

fix typo

← Older revision		Revision as of 21:54, 30 September 2018
Line 330:		Line 330:

	Usage:		Usage:
	{{#invoke:Math \| ~~log~~ \| x }}		{{#invoke:Math \| log10 \| x }}
	]]		]]

meta>Primefac: add "sum" per merge with Module:Sum

2018-09-30T21:27:53Z

add "sum" per merge with Module:Sum

@@ Line 244: / Line 244: @@
 	if min_value then
 		return min_value
 	end
 end

meta>Primefac: add log10 functionality from module merge

2018-05-10T15:21:33Z

add log10 functionality from module merge

@@ Line 296: / Line 296: @@
 	local rescale = math.pow(10, precision or 0);
 	return math.floor(value * rescale + 0.5) / rescale;
 end

meta>Mr. Stradivarius: simplify using a new binary_fold function, per protected edit request by User:Esquivalience

2016-03-28T12:15:51Z

simplify using a new binary_fold function, per protected edit request by User:Esquivalience

← Older revision		Revision as of 12:15, 28 March 2016
Line 49:		Line 49:
	end		end

	local function ~~applyFuncToArgs~~(func, ...)		local function fold(func, ...)
	-- Use a function on all supplied arguments, and return the result. The function must accept two numbers as parameters,		-- Use a function on all supplied arguments, and return the result. The function must accept two numbers as parameters,
	-- and must return a number as an output. This number is then supplied as input to the next function call.		-- and must return a number as an output. This number is then supplied as input to the next function call.
Line 63:		Line 63:
	end		end
	return ret, count		return ret, count
			end

			--[[
			Fold arguments by selectively choosing values (func should return when to choose the current "dominant" value).
			]]
			local function binary_fold(func, ...)
			local value = fold((function(a, b) if func(a, b) then return a else return b end end), ...)
			return value
	end		end

Line 190:		Line 198:
	return result		return result
	end		end


	--[[		--[[
Line 207:		Line 216:

	function p._max(...)		function p._max(...)
	local function ~~maxOfTwo~~(a, b)		local max_value = binary_fold((function(a, b) return a > b end), ...)
	if a > b ~~then~~
	~~return a~~
	~~else~~
	~~return b~~
	end
	~~end~~
	~~local max_value = applyFuncToArgs(maxOfTwo~~, ...)
	if max_value then		if max_value then
	return max_value		return max_value
Line 239:		Line 241:

	function p._min(...)		function p._min(...)
	local function ~~minOfTwo~~(a, b)		local min_value = binary_fold((function(a, b) return a < b end), ...)
	if a < b ~~then~~
	~~return a~~
	~~else~~
	~~return b~~
	end
	~~end~~
	~~local min_value = applyFuncToArgs(minOfTwo~~, ...)
	if min_value then		if min_value then
	return min_value		return min_value
Line 270:		Line 265:

	function p._average(...)		function p._average(...)
	local function ~~getSum~~(a, b)		local sum, count = fold((function(a, b) return a + b end), ...)
	return a + b
	end
	~~local sum, count = applyFuncToArgs(getSum~~, ...)
	if not sum then		if not sum then
	return 0		return 0
Line 362:		Line 354:
	return oldr		return oldr
	end		end
	local result, count = ~~applyFuncToArgs~~(findGcd, ...)		local result, count = fold(findGcd, ...)
	return result		return result
	end		end