Module:Harmonics in equal: Difference between revisions

Sintel (talk | contribs)
No edit summary
Sintel (talk | contribs)
No edit summary
Line 40: Line 40:
intervals.prime = {2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97 }
intervals.prime = {2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97 }
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 }
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 }
intervals.integer = {1, 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}
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}


-- evaluate input on error use default
-- evaluate input on error use default
Line 74: Line 74:
local start = eval_num_arg(frame.args['start'], 1)
local start = eval_num_arg(frame.args['start'], 1)
-- option intervals
-- option intervals
local interv = intervals.prime
local select_intervals = "integer"
if denom == 1 and num == 2 then
select_intervals = "odd"
end
if frame.args['intervals'] and string.len(frame.args['intervals']) > 0 then
if frame.args['intervals'] and string.len(frame.args['intervals']) > 0 then
interv = intervals[frame.args['intervals']]
select_intervals = frame.args['intervals']
end
end


Line 92: Line 95:
name = steps .. 'edf'
name = steps .. 'edf'
end
end
title_intervals = "primes"
if select_intervals == "odd" then
title_intervals = "odd harmonics"
elseif select_intervals == "integer" then
title_intervals = "harmonics"
end
local title = frame.args['title']
local title = frame.args['title']
if title == nil or string.len(title) == 0 then
if title == nil or string.len(title) == 0 then
title = 'Approximation of harmonics in ' .. name
title = "Approximation of ".. title_intervals .. " in " .. name
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 = eval_num_arg(frame.args['prec'], prec_by_equal(steps, num, denom))
return approx( steps, num, denom, {unpack(interv, start, start+columns-1)}, title, prec)
return approx( steps, num, denom, {unpack(intervals[select_intervals], start, start+columns-1)}, title, prec)
end
end


return p;
return p;