Modul:Math: Unterschied zwischen den Versionen

K
33 Versionen von wikivoyage:Modul:Math importiert
(Undid revision 586591521 by Mr. Stradivarius (talk) reinstate the new version - the problem was limited to two modules, which I will now fix)
K (33 Versionen von wikivoyage:Modul:Math importiert)
 
(9 dazwischenliegende Versionen von 5 Benutzern werden nicht angezeigt)
Zeile 5: Zeile 5:
]]
]]


local yesno = require('Module:Yesno')
local yesno, getArgs -- lazily initialized
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.
Zeile 50: Zeile 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.
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
Zeile 64: Zeile 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


Zeile 113: Zeile 120:
else
else
return p._order(input_number)
return p._order(input_number)
end  
end
end
end


Zeile 135: Zeile 142:
local input_number;
local input_number;


if not yesno then
yesno = require('Module:Yesno')
end
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);
Zeile 144: Zeile 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);
Zeile 153: Zeile 163:
else
else
return p._precision(input_string)
return p._precision(input_string)
end  
end
end
end


Zeile 170: Zeile 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
Zeile 188: Zeile 198:
return result
return result
end
end


--[[
--[[
Zeile 205: Zeile 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
Zeile 219: Zeile 223:


--[[
--[[
min  
median
 
Find the median of set of numbers
 
Usage:
{{#invoke:Math | median | number1 | number2 | ...}}
OR
{{#invoke:Math | median }}
]]
 
function wrap.median(args)
return p._median(unpackNumberArgs(args))
end
 
function p._median(...)
local vals = makeArgArray(...)
local count = #vals
table.sort(vals)
 
if count == 0 then
return 0
end
 
if p._mod(count, 2) == 0 then
return (vals[count/2] + vals[count/2+1])/2
else
return vals[math.ceil(count/2)]
end
end
 
--[[
min


Finds the minimum argument
Finds the minimum argument
Zeile 237: Zeile 272:


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
Zeile 251: Zeile 279:


--[[
--[[
average  
sum
 
Finds the sum
 
Usage:
{{#invoke:Math| sum | value1 | value2 | ... }}
OR
{{#invoke:Math| sum }}
 
Note, any values that do not evaluate to numbers are ignored.
]]
 
function wrap.sum(args)
return p._sum(unpackNumberArgs(args))
end
 
function p._sum(...)
local sums, count = fold((function(a, b) return a + b end), ...)
if not sums then
return 0
else
return sums
end
end
 
--[[
average


Finds the average
Finds the average
Zeile 268: Zeile 322:


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
Zeile 296: Zeile 347:
else
else
return p._round(value, precision)
return p._round(value, precision)
end  
end
end
end


Zeile 302: Zeile 353:
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
--[[
log10
returns the log (base 10) of a number
Usage:
{{#invoke:Math | log10 | x }}
]]
function wrap.log10(args)
return math.log10(args[1])
end
end


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


Zeile 360: Zeile 424:
return oldr
return oldr
end
end
local result, count = applyFuncToArgs(findGcd, ...)
local result, count = fold(findGcd, ...)
return result
return result
end
end
Zeile 367: Zeile 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.


Zeile 399: Zeile 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


Zeile 409: Zeile 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))
Zeile 419: Zeile 482:
else
else
sign = ''
sign = ''
end  
end


-- Handle cases requiring scientific notation
-- Handle cases requiring scientific notation
Zeile 428: Zeile 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
Zeile 446: Zeile 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
Zeile 463: Zeile 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>'
Zeile 472: Zeile 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.
Zeile 491: Zeile 554:
-- 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 frame = mw.getCurrentFrame()
local success, result = pcall(mw.ext.ParserFunctions.expr, number_string)
local attempt = frame:preprocess('{{#expr: ' .. number_string .. '}}')
if success then
attempt = tonumber(attempt)
number = tonumber(result)
if attempt ~= nil then
number = attempt
number_string = tostring(number)
number_string = tostring(number)
else
else
Zeile 518: Zeile 579:
]]
]]


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
return wrap[k](getArgs(frame)-- Argument processing is left to Module:Arguments. Whitespace is trimmed and blank arguments are removed.
end
end
end
end }
 
for funcName in pairs(wrap) do
p[funcName] = makeWrapper(funcName)
end


return p
return setmetatable(p, mt)