Editing Module:Math
The edit can be undone. Please check the comparison below to verify that this is what you want to do, and then publish the changes below to finish undoing the edit.
Latest revision | Your text | ||
Line 5: | Line 5: | ||
]] | ]] | ||
local yesno | local yesno = require('Module:Yesno') | ||
local getArgs = require('Module:Arguments').getArgs | |||
local p = {} -- Holds functions to be returned from #invoke, and functions to make available to other Lua modules. | local p = {} -- Holds functions to be returned from #invoke, and functions to make available to other Lua modules. | ||
Line 49: | Line 50: | ||
end | end | ||
local function | local function applyFuncToArgs(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 64: | ||
end | end | ||
return ret, count | return ret, count | ||
end | end | ||
Line 142: | Line 135: | ||
local input_number; | 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]]. | 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); | local pos = string.find(input_string, '/', 1, true); | ||
Line 198: | Line 188: | ||
return result | return result | ||
end | end | ||
--[[ | --[[ | ||
Line 216: | Line 205: | ||
function p._max(...) | function p._max(...) | ||
local | local function maxOfTwo(a, b) | ||
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 | ||
end | end | ||
end | end | ||
Line 272: | Line 237: | ||
function p._min(...) | function p._min(...) | ||
local | local function minOfTwo(a, b) | ||
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 | ||
end | end | ||
end | end | ||
Line 322: | Line 268: | ||
function p._average(...) | function p._average(...) | ||
local | local function getSum(a, b) | ||
return a + b | |||
end | |||
local sum, count = applyFuncToArgs(getSum, ...) | |||
if not sum then | if not sum then | ||
return 0 | return 0 | ||
Line 353: | Line 302: | ||
local rescale = math.pow(10, precision or 0); | local rescale = math.pow(10, precision or 0); | ||
return math.floor(value * rescale + 0.5) / rescale; | return math.floor(value * rescale + 0.5) / rescale; | ||
end | end | ||
Line 424: | Line 360: | ||
return oldr | return oldr | ||
end | end | ||
local result, count = | local result, count = applyFuncToArgs(findGcd, ...) | ||
return result | return result | ||
end | end | ||
Line 555: | Line 491: | ||
-- If failed, attempt to evaluate input as an expression | -- If failed, attempt to evaluate input as an expression | ||
if number == nil then | if number == nil then | ||
local | local frame = mw.getCurrentFrame() | ||
if | local attempt = frame:preprocess('{{#expr: ' .. number_string .. '}}') | ||
number = | attempt = tonumber(attempt) | ||
if attempt ~= nil then | |||
number = attempt | |||
number_string = tostring(number) | number_string = tostring(number) | ||
else | else | ||
Line 580: | Line 518: | ||
]] | ]] | ||
local | local function makeWrapper(funcName) | ||
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. | |||
return wrap[funcName](args) | |||
end | end | ||
end | end | ||
for funcName in pairs(wrap) do | |||
p[funcName] = makeWrapper(funcName) | |||
end | |||
return | return p |