Module:Math - Revision history

Vincent: 41 revisions imported

2019-09-10T01:26:01Z

41 revisions imported

2018-09-30T23:27:34Z

fix calculation

2018-09-30T23:23:35Z

error handling for count

2018-09-30T23:21:27Z

better median handling

2018-09-30T22:14:07Z

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

2018-09-30T21:54:56Z

fix typo

2018-09-30T21:27:53Z

add "sum" per merge with Module:Sum

2018-05-10T15:21:33Z

add log10 functionality from module merge

2016-03-28T12:15:51Z

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

2014-06-20T02:47:21Z

get #expr without a frame, don't make unnecessary wrappers, and lazily initialise dependent modules, per protected edit request by User:Jackmcbarn

@@ Line 249: / Line 249: @@
 		return (vals[count/2] + vals[count/2+1])/2
 	else
-		return vals[count/2+1]
+		return vals[math.ceil(count/2)]
 	end
 end

@@ Line 241: / Line 241: @@
 	local count = #vals
 	table.sort(vals)
 	if p._mod(count, 2) == 0 then

@@ Line 234: / Line 234: @@
 function wrap.median(args)
-	return p._median(args)
+	return p._median(unpackNumberArgs(args))
 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
 		return (vals[count/2] + vals[count/2+1])/2
 	else
-		return vals[math.ceil(count/2)];
+		return vals[count/2+1]
 	end
 end

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

@@ Line 330: / Line 330: @@
 Usage:
-{{#invoke:Math | log | x }}
+{{#invoke:Math | log10 | x }}
 ]]

← Older revision	Revision as of 01:26, 10 September 2019
(No difference)

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

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

@@ Line 49: / Line 49: @@
 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,
 	-- 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
 	return ret, count
 end
@@ Line 190: / Line 198: @@
 	return result
 end
 --[[
@@ Line 207: / Line 216: @@
 function p._max(...)
-	local function maxOfTwo(a, b)
+	local max_value = binary_fold((function(a, b) return a > b end), ...)
 	if max_value then
 		return max_value
@@ Line 239: / Line 241: @@
 function p._min(...)
-	local function minOfTwo(a, b)
+	local min_value = binary_fold((function(a, b) return a < b end), ...)
 	if min_value then
 		return min_value
@@ Line 270: / Line 265: @@
 function p._average(...)
-	local function getSum(a, b)
+	local sum, count = fold((function(a, b) return a + b end), ...)
 	if not sum then
 		return 0
@@ Line 362: / Line 354: @@
 		return oldr
 	end
-	local result, count = applyFuncToArgs(findGcd, ...)
+	local result, count = fold(findGcd, ...)
 	return result
 end

@@ Line 5: / Line 5: @@
 ]]
-local yesno = require('Module:Yesno')
+local yesno, getArgs -- lazily initialized
 local p = {} -- Holds functions to be returned from #invoke, and functions to make available to other Lua modules.
@@ Line 135: / Line 134: @@
 	local input_number;
 	if yesno(trap_fraction, true) then -- Returns true for all input except nil, false, "no", "n", "0" and a few others. See [[Module:Yesno]].
 		local pos = string.find(input_string, '/', 1, true);
@@ Line 491: / Line 493: @@
 	-- If failed, attempt to evaluate input as an expression
 	if number == nil then
-		local frame = mw.getCurrentFrame()
+		local success, result = pcall(mw.ext.ParserFunctions.expr, number_string)
-		local attempt = frame:callParserFunction('#expr', number_string)
+		if success then
-		attempt = tonumber(attempt)
+			number = tonumber(result)
 			number_string = tostring(number)
 		else
@@ Line 518: / Line 518: @@
 ]]
-local function makeWrapper(funcName)
+local mt = { __index = function(t, k)
-	return function (frame)
+	return function(frame)
-		local args = getArgs(frame) -- Argument processing is left to Module:Arguments. Whitespace is trimmed and blank arguments are removed.
+		if not getArgs then
-		return wrap[funcName](args)
+			getArgs = require('Module:Arguments').getArgs
 	end
-end
+end }
-return p
+return setmetatable(p, mt)