Module:Harmonics in equal: Difference between revisions
Contribution (talk | contribs) No edit summary |
Call Module: Utils for "eval_num_arg". Replace "eval_num_arg" with "value_provided" at "collapsed" to allow any non-empty string |
||
| Line 1: | Line 1: | ||
local p = {} | local p = {} | ||
local utils = require("Module:Utils") | |||
-- direct mapping | -- direct mapping | ||
| Line 73: | Line 74: | ||
intervals.odd = {3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 61, 63 } | intervals.odd = {3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 61, 63 } | ||
intervals.integer = {2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128 } | intervals.integer = {2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128 } | ||
-- calculate default precision | -- calculate default precision | ||
| Line 96: | Line 82: | ||
function p.harmonics_in_equal (frame) | function p.harmonics_in_equal (frame) | ||
-- optional number of steps, default: 12 | -- optional number of steps, default: 12 | ||
local steps = eval_num_arg(frame.args['steps'], 12) | local steps = utils.eval_num_arg(frame.args['steps'], 12) | ||
-- numerator, default: 2 | -- numerator, default: 2 | ||
local num = eval_num_arg(frame.args['num'], 2) | local num = utils.eval_num_arg(frame.args['num'], 2) | ||
-- denominator, default: 1 | -- denominator, default: 1 | ||
local denom = eval_num_arg(frame.args['denom'], 1) | local denom = utils.eval_num_arg(frame.args['denom'], 1) | ||
-- optional number of columns, default: 11 | -- optional number of columns, default: 11 | ||
local columns = eval_num_arg(frame.args['columns'], 11) | local columns = utils.eval_num_arg(frame.args['columns'], 11) | ||
-- optional start column, default: start with prime 2 | -- optional start column, default: start with prime 2 | ||
local start = eval_num_arg(frame.args['start'], 1) | local start = utils.eval_num_arg(frame.args['start'], 1) | ||
-- option intervals | -- option intervals | ||
local select_intervals = "integer" | local select_intervals = "integer" | ||
| Line 145: | Line 131: | ||
end | end | ||
-- optional precision for abs error, default about 3 digits | -- optional precision for abs error, default about 3 digits | ||
local prec = eval_num_arg(frame.args['prec'], prec_by_equal(steps, num, denom)) | local prec = utils.eval_num_arg(frame.args['prec'], prec_by_equal(steps, num, denom)) | ||
local reduction = true | local reduction = true | ||
if steps == 1 then | if steps == 1 then | ||
reduction = false | reduction = false | ||
end | end | ||
local collapsed = | local collapsed = utils.value_provided(frame.args['collapsed']) | ||
return approx( steps, num, denom, {unpack(intervals[select_intervals], start, start+columns-1)}, title, prec, reduction, collapsed) | return approx( steps, num, denom, {unpack(intervals[select_intervals], start, start+columns-1)}, title, prec, reduction, collapsed) | ||