Module:Math - Revision history

Rickyboy320: 34 revisions imported: Imported Category TOC from wikipedia

2017-08-11T17:56:33Z

34 revisions imported: Imported Category TOC from wikipedia

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

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

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

Mr. Stradivarius: replace frame:preprocess with frame:callParserFunction per protected edit request by User:Jackmcbarn

2014-04-11T03:32:04Z

replace frame:preprocess with frame:callParserFunction per protected edit request by User:Jackmcbarn

Mr. Stradivarius: Undid revision 586591521 by Mr. Stradivarius (talk) reinstate the new version - the problem was limited to two modules, which I will now fix

2013-12-18T05:49:02Z

Undid revision 586591521 by Mr. Stradivarius (talk) reinstate the new version - the problem was limited to two modules, which I will now fix

Show changes

Mr. Stradivarius: Undid revision 586573269 by Mr. Stradivarius (talk) the code refactor broke some existing modules - revert for now while I work out the extent of the problem

2013-12-18T04:06:57Z

Undid revision 586573269 by Mr. Stradivarius (talk) the code refactor broke some existing modules - revert for now while I work out the extent of the problem

Show changes

Mr. Stradivarius: add a gcd function per edit request by User:Mxn, add a mod function, alter existing functions to allow access from Lua without calling a frame object, use Module:Arguments to process arguments, p._cleanNumber improvements

2013-12-18T00:45:55Z

add a gcd function per edit request by User:Mxn, add a mod function, alter existing functions to allow access from Lua without calling a frame object, use Module:Arguments to process arguments, p._cleanNumber improvements

Show changes

Dragons flight: add average

2013-04-18T14:36:27Z

add average

Dragons flight: Adds comments, slight reordering of functions.

2013-03-05T03:27:48Z

Adds comments, slight reordering of functions.

Dragons flight: Adds fraction trapping as an option

2013-02-25T17:08:57Z

Adds fraction trapping as an option

@@ 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)

@@ Line 492: / Line 492: @@
 	if number == nil then
 		local frame = mw.getCurrentFrame()
-		local attempt = frame:preprocess('{{#expr: ' .. number_string .. '}}')
+		local attempt = frame:callParserFunction('#expr', number_string)
 		attempt = tonumber(attempt)
 		if attempt ~= nil then

← Older revision		Revision as of 14:36, 18 April 2013
Line 187:		Line 187:

	return min_value		return min_value
		+	end
		+
		+	--[[
		+	average
		+
		+	Finds the average
		+
		+	Usage:
		+	{{#invoke:Math\| average \| value1 \| value2 \| ... }}
		+	OR
		+	{{#invoke:Math\| average }}
		+
		+	When used with no arguments, it takes its input from the parent
		+	frame. Note, any values that do not evaluate to numbers are ignored.
		+	]]
		+	function z.average( frame )
		+	local args = frame.args;
		+	if args[1] == nil then
		+	local parent = frame:getParent();
		+	args = parent.args;
		+	end
		+	local sum = 0;
		+	local count = 0;
		+
		+	local i = 1;
		+	while args[i] ~= nil do
		+	local val = z._cleanNumber( frame, args[i] );
		+	if val ~= nil then
		+	sum = sum + val
		+	count = count + 1
		+	end
		+	i = i + 1;
		+	end
		+
		+	return (count == 0 and 0 or sum/count)
	end		end

@@ Line 1: / Line 1: @@
 local z = {}
 -- Generate random number
@@ Line 44: / Line 20: @@
 end
--- Determine order of magnitude
+--[[
 function z.order(frame)
      local input_string = (frame.args[1] or frame.args.x or '0');
@@ Line 61: / Line 44: @@
 end
--- Determines precision of a number using the string representation
+--[[
 function z.precision( frame )
      local input_string = (frame.args[1] or frame.args.x or '0');
@@ Line 127: / Line 117: @@
 end
--- Finds maximum argument
+--[[
 function z.max( frame )
      local args = frame.args;
@@ Line 151: / Line 153: @@
 end
--- Finds minimum argument
+--[[
 function z.min( frame )
      local args = frame.args;
@@ Line 175: / Line 189: @@
 end
--- Rounds a number to specified precision
+--[[
 function z.round(frame)
      local value, precision;
@@ Line 193: / Line 215: @@
 end
--- Rounds a number to the specified precision and formats according to rules
+--[[
--- originally used for {{template:Rnd}}.  Output is a string.
+precision_format
 function z.precision_format( frame )
      -- For access to Mediawiki built-in formatter.
@@ Line 285: / Line 314: @@
      return formatted_num;
 end
 return z

← Older revision	Revision as of 17:56, 11 August 2017
(No difference)