Modul:Math: Unterschied zwischen den Versionen
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
Keine Bearbeitungszusammenfassung |
(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) |
||
Zeile 49: | Zeile 49: | ||
end | end | ||
local function | 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 63: | 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 112: | Zeile 120: | ||
else | else | ||
return p._order(input_number) | return p._order(input_number) | ||
end | end | ||
end | end | ||
Zeile 146: | 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 155: | Zeile 163: | ||
else | else | ||
return p._precision(input_string) | return p._precision(input_string) | ||
end | end | ||
end | end | ||
Zeile 172: | 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 190: | Zeile 198: | ||
return result | return result | ||
end | end | ||
--[[ | --[[ | ||
Zeile 207: | Zeile 216: | ||
function p._max(...) | function p._max(...) | ||
local function | local max_value = binary_fold((function(a, b) return a > b end), ...) | ||
if max_value then | if max_value then | ||
return max_value | return max_value | ||
Zeile 221: | 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 239: | Zeile 272: | ||
function p._min(...) | function p._min(...) | ||
local function | local min_value = binary_fold((function(a, b) return a < b end), ...) | ||
if min_value then | if min_value then | ||
return min_value | return min_value | ||
Zeile 253: | Zeile 279: | ||
--[[ | --[[ | ||
sum | sum | ||
Finds the sum | Finds the sum | ||
Zeile 270: | Zeile 296: | ||
function p._sum(...) | function p._sum(...) | ||
local function | local sums, count = fold((function(a, b) return a + b end), ...) | ||
if not sums then | |||
if not | |||
return 0 | return 0 | ||
else | else | ||
return | return sums | ||
end | end | ||
end | end | ||
--[[ | --[[ | ||
average | average | ||
Finds the average | Finds the average | ||
Zeile 299: | Zeile 322: | ||
function p._average(...) | function p._average(...) | ||
local function | local sum, count = fold((function(a, b) return a + b end), ...) | ||
if not sum then | if not sum then | ||
return 0 | return 0 | ||
Zeile 327: | Zeile 347: | ||
else | else | ||
return p._round(value, precision) | return p._round(value, precision) | ||
end | end | ||
end | end | ||
Zeile 333: | 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 354: | Zeile 387: | ||
else | else | ||
return p._mod(x, y) | return p._mod(x, y) | ||
end | end | ||
end | end | ||
Zeile 391: | Zeile 424: | ||
return oldr | return oldr | ||
end | end | ||
local result, count = | local result, count = fold(findGcd, ...) | ||
return result | return result | ||
end | end | ||
Zeile 398: | 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 430: | 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 | ||
if order + p._precision(value_string) >= 14 then | |||
precision = 13 - order; | |||
precision = 13 - order; | end | ||
end | |||
end | end | ||
Zeile 440: | 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 450: | Zeile 482: | ||
else | else | ||
sign = '' | sign = '' | ||
end | end | ||
-- Handle cases requiring scientific notation | -- Handle cases requiring scientific notation | ||
Zeile 459: | 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 477: | 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 494: | 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 503: | 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. |