Module:Weather box/row: Difference between revisions

Content deleted Content added
update from Module:WeatherBox/sandbox; this moves many calculations into a Value object and displays significant trailing zeroes
Undid revision 875833472 by Johnuniq (talk) blunder somewhere: there were runtime errors
Line 3:
local wbc = require( "Module:WeatherBoxColors" )
 
local function checkFlag( flag )
local Value
Value = {
lang = mw.getContentLanguage(),
getDisplay = function (self)
if not self:isValid() then
return nil
end
local display = self.string
if math.abs(self.number) >= 1000 then
display = self.lang:formatNum(math.abs(self.number))
if self.number < 0 then
display = '−' .. display
end
elseif self.number < 0 then
display = '−' .. display:sub(2)
end
return display
end,
getPrecision = function (self)
local result = rawget(self, 'precision')
if not result then
if self:isValid() then
result = math.max(0, math_mod._precision(self.string))
else
result = 0
end
rawset(self, 'precision', result)
end
return result
end,
isValid = function (self)
return self.number ~= nil and self.number ~= -9999
end,
new = function (v)
local val, str
if type(v) == 'string' then
val, str = math_mod._cleanNumber(v)
elseif type(v) == 'number' then
val, str = v, tostring(v)
end
if not val then
val, str = -9999, ''
end
return setmetatable({
number = val,
string = str,
}, Value)
end,
setNumberRounded = function (self, number, precision)
-- precision is a small integer >= 0.
self.number = math_mod._round(number, precision)
local fmt = '%.' .. string.format('%d', precision) .. 'f'
self.string = string.format(fmt, self.number)
end,
}
Value.__index = Value
 
local function checkFlag( flag, default )
if flag == nil then
return defaultnil
elseif type( flag ) == 'boolean' then
return flag
Line 79 ⟶ 22:
end
 
local function makeLine( label, first_valuesfirst_value_string, second_valuessecond_value_string, color_values, color_scheme )
local result, color_str, value_str

result = {'|- style="text-align: center;"\n! scope="row" style="height: 16px;" | ', label, "\n"}
for i = 1,13 do
local color_str = color_values[i]
 
if i == 13 then
Line 90 ⟶ 35:
end
 
value_str = first_value_string[i]
local display = first_values[i]:getDisplay()
if displayvalue_str ~= '' and value_str ~= nil then
table.insert( result, displayvalue_str )
if second_valuessecond_value_string ~= nil then
value_str = second_value_string[i]
display = second_values[i]:getDisplay()
if displayvalue_str ~= '' and value_str ~= nil then
table.insert( result, "<br /> (" .. displayvalue_str .. ")" )
end
end
Line 112 ⟶ 57:
local month_names = { 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec', 'year' }
local str, str2, val
 
local values = {}
local output_string = {}
local output_value = {}
local variant = {}
if suffix == nil then
for i_, mon in ipairs( month_names ) do
if include_space then
str = ( frame.args[ mon .. ' ' .. group_name ] or '' )
else
str = ( frame.args[ mon .. group_name ] or '' )
end
val, str2 = math_mod._cleanNumber( str )
if val ~= nil then
table.insert( output_string, str2 )
table.insert( output_value, val )
else
table.insert( output_string, str )
str = frame.args[ mon .. group_name ] or ''
table.insert( output_value, -9999 )
end
values[i] = Value.new(str)
end
else
local updated = false
for i_, mon in ipairs( month_names ) do
updated = false
local value, updated
for vari, suf in ipairs( suffix ) do
if include_space then
str = frame.args[ mon .. ' ' .. group_name .. ' ' .. suf ]
Line 133 ⟶ 89:
end
if str ~= nil and str ~= '' then
valueval, str2 = Valuemath_mod.new_cleanNumber( str )
value.variantif val ~= varnil then
table.insert( output_string, str2 )
table.insert( output_value, val )
else
table.insert( output_string, str )
table.insert( output_value, -9999 )
end
table.insert( variant, i )
updated = true
break
Line 140 ⟶ 103:
end
if not updated then
table.insert( output_string, '' )
value = Value.new()
table.insert( output_value, -9999 )
value.variant = 0
table.insert( variant, 0 )
end
values[i] = value
end
end
 
return values
return output_string, output_value, variant
end
 
local function getAnnualValue( values, mode )
local total = 0
local val = 0
 
if mode == 'avg' or mode == 'sum' then
local totalp1, = 0p2
local p1, p2, variant
p1 = 0
for i = 1, 12 do
ifval not= values[i]:isValid() then
if val == -9999 then
return Value.new()
return '', -9999
end
if not variant then
local var = values[i].variant
if var and var ~= 0 then
variant = var
end
end
 
p2 = values[i]:getPrecisionmath_mod._precision( val )
if p2 > p1 then
p1 = p2
end
 
total = total + values[i].numberval
end
local value = Value.new(total)
if mode == 'avg' then
value:setNumberRoundedtotal = math_mod._round( total / 12, p1 )
end
return tostring( total ), total
value.variant = variant
return value
elseif mode == 'min' then
local targetmin_val = nil
for i = 1, 12 do
ifval = values[i]:isValid() then
if targetval ~== nil or values[i].number < target.number-9999 then
if min_val == nil or val < min_val then
target = values[i]
min_val = val
end
end
end
return targettostring( ormin_val Value.new(), min_val
elseif mode == 'max' then
local targetmax_val = nil
for i = 1, 12 do
ifval = values[i]:isValid() then
if targetval ~== nil or values[i].number > target.number-9999 then
if max_val == nil or val > max_val then
target = values[i]
max_val = val
end
end
end
return target or Value.newtostring(max_val), max_val
else
error( 'Unrecognized Annual Mode' )
Line 203 ⟶ 164:
end
 
local function reconcileTemperature( C_valuesC_degree_strings, F_valuesC_degree_values, F_degree_strings, F_degree_values )
local p
for i = 1,13 do
if C_degree_strings[i] == '' then
local p
if C_valuesF_degree_values[i].string =~= ''-9999 then
p = math.max( 0, math_mod._precision( F_degree_strings[i] ) )
if F_values[i]:isValid() then
C_degree_values[i] = math_mod._round( (F_degree_values[i] - 32)*5/9, p )
p = F_values[i]:getPrecision()
C_degree_strings[i] = tostring( C_degree_values[i] )
C_values[i]:setNumberRounded( (F_values[i].number - 32)*5/9, p )
end
elseif F_valuesF_degree_strings[i].string == '' then
if C_valuesC_degree_values[i]:isValid() ~= -9999 then
p = math.max( 0, math_mod._precision( C_degree_strings[i] ) )
p = C_values[i]:getPrecision()
F_valuesF_degree_values[i]:setNumberRounded = math_mod._round( C_valuesC_degree_values[i].number*9/5 + 32, p )
F_degree_strings[i] = tostring( F_degree_values[i] )
end
end
end
return C_degree_strings, C_degree_values, F_degree_strings, F_degree_values
end
 
local function reconcilePrecipitation( M_valuesM_degree_strings, I_valuesM_degree_values, prefer_cm )
I_degree_strings, I_degree_values, variant, prefer_cm )
local p
 
local v_class = 0
for i = 1,13 do
if M_valuesvariant[i].variant == 1 then
v_class = 1
elseif M_valuesvariant[i].variant == 2 then
v_class = 2
end
Line 237 ⟶ 204:
end
for i = 1,13 do
if M_degree_strings[i] == '' then
local p
if M_valuesI_degree_values[i].string =~= ''-9999 then
if I_values[i]:isValid() then
if v_class == 1 then
p = I_valuesmath.max( 0, math_mod._precision( I_degree_strings[i]:getPrecision( ) ) - 1
M_valuesM_degree_values[i]:setNumberRounded = math_mod._round( I_valuesI_degree_values[i].number*2.54, p )
variant[i] = v_class
else
p = I_valuesmath.max( 0, math_mod._precision( I_degree_strings[i]:getPrecision( ) ) - 2
M_valuesM_degree_values[i]:setNumberRounded = math_mod._round( I_valuesI_degree_values[i].number*25.4, p )
variant[i] = v_class
end
M_degree_strings[i] = tostring( M_degree_values[i] )
M_values[i].variant = v_class
end
elseif I_valuesI_degree_strings[i].string == '' then
if M_valuesM_degree_values[i]:isValid() ~= -9999 then
if M_valuesvariant[i].variant == 1 then
p = math.max( 0, math_mod._precision( M_degree_strings[i] ) )
p = M_values[i]:getPrecision()
I_valuesI_degree_values[i].number = M_valuesM_degree_values[i].number/2.54
else
p = M_valuesmath.max( 0, math_mod._precision( M_degree_strings[i]:getPrecision( ) ) + 1
I_valuesI_degree_values[i].number = M_valuesM_degree_values[i].number/25.4
end
I_valuesI_degree_values[i]:setNumberRounded = math_mod._round( I_valuesI_degree_values[i].number, p )
I_degree_strings[i] = tostring( I_degree_values[i] )
end
end
end
return M_degree_strings, M_degree_values, I_degree_strings, I_degree_values, variant
end
 
Line 267 ⟶ 237:
local mode = (frame.args.mode or 'basic'):lower()
local group_name = frame.args.group_name
local first_value_string, second_value_string
local first_values, second_values
local first_value_number, second_value_number, color_values
local color_scheme = frame.args.color_scheme or 't'
local scale_factor = math_mod._cleanNumber( frame.args.scale_factor) or 1
local date_mode = checkFlag( frame.args.date_mode, or false )
local label = frame.args.label or ''
local annual_mode = (frame.args.annual_mode or 'avg'):lower()
local include_space = checkFlag( frame.args.include_space, or true )
local second_line = checkFlag( frame.args.second_line, false ) or false
local prefer_cm = checkFlag( frame.args.prefer_cm, false ) or false
local result
local variant
 
local pframe = frame:getParent()
local imperial_first = checkFlag( frame.args['imperial first'] or pframe.args['imperial first'] )
localif metric_firstimperial_first == checkFlag(nil frame.args['metricthen first']imperial_first or= checkFlag( pframe.args['metricimperial first'] ) end
local single_line = checkFlag( frame.args['single line'] or pframe.args['single line'] )
 
local metric_first = checkFlag( frame.args['metric first'] )
if imperial_first == nil then
imperial_first = if metric_first == nil andthen truemetric_first or= notcheckFlag( metric_firstpframe.args['metric first'] ) end
 
local single_line = checkFlag( frame.args['single line'] )
if single_line == nil then single_line = checkFlag( pframe.args['single line'] ) end
 
if imperial_first == nil and metric_first ~= nil then
imperial_first = not metric_first
else
imperial_first = true
end
 
if mode == 'basic' then
first_valuesfirst_value_string, first_value_number = getInputs( pframe, group_name, nil, include_space )
nil, include_space )
second_values = nil
second_value_string = nil
second_value_number = nil
elseif mode == 'temperature' then
first_valuesfirst_value_string, first_value_number = getInputs( pframe, group_name, {'C'}, include_space )
second_values = getInputs( pframe, group_name, {'FC'}, include_space )
second_value_string, second_value_number = getInputs( pframe, group_name,
reconcileTemperature( first_values, second_values )
{'F'}, include_space )
first_value_string, first_value_number, second_value_string, second_value_number =
reconcileTemperature( first_value_string, first_value_number,
second_value_string, second_value_number )
elseif mode == "precipitation" then
first_valuesfirst_value_string, first_value_number, variant = getInputs( pframe, group_name, {'cm', 'mm'}, include_space )
second_values = getInputs( pframe {'cm', group_name, {'inchmm'}, include_space )
second_value_string, second_value_number = getInputs( pframe, group_name,
reconcilePrecipitation( first_values, second_values, prefer_cm )
{'inch'}, include_space )
first_value_string, first_value_number, second_value_string, second_value_number,
variant =
reconcilePrecipitation( first_value_string, first_value_number,
second_value_string, second_value_number, variant, prefer_cm )
else
error( 'Requested mode not recognized' )
Line 303 ⟶ 294:
local good = false
for i = 1,13 do
if first_valuesfirst_value_string[i] ~= nil and first_value_string[i].string ~= '' then
good = true
break
Line 312 ⟶ 303:
end
 
if first_valuesfirst_value_string[13] == nil or first_value_string[13].string == '' then
first_valuesfirst_value_string[13], first_value_number[13] = getAnnualValue( first_valuesfirst_value_number, annual_mode )
end
if second_valuessecond_value_string ~= nil then
if second_valuessecond_value_string[13] == nil or second_value_string[13].string == '' then
second_valuessecond_value_string[13], second_value_number[13] = getAnnualValue( second_valuessecond_value_number, annual_mode )
end
if mode == 'precipitation' then
for i = 1,12 do
if variant[i] ~= 0 then
variant[13] = variant[i]
break
end
end
end
end
Line 325 ⟶ 324:
color_values = {}
local month_adj = { 31/30, 28.25/30, 31/30, 1, 31/30, 1,
31/30, 31/30, 1, 31/30, 1, 31/30, 36512.25/30175 }
local adj
for i = 1,13 do
if first_value_number[i] ~= nil and first_value_number[i] ~= -9999 then
if first_values[i]:isValid() then
local adj = scale_factor
if date_mode then
adj = adj / month_adj[i]
end
if mode == "precipitation" then
if first_valuesvariant[i].variant == 1 then
adj = adj * 10
end
end
table.insert( color_values, color_scheme( first_valuesfirst_value_number[i].number * adj ) )
else
table.insert( color_values, color_scheme( nil ) )
Line 343:
end
 
local lang = mw.getContentLanguage()
if imperial_first and second_values ~= nil then
local function formatNumber(number, number_string)
first_values, second_values = second_values, first_values
if number ~= nil and number ~= -9999 then
if math.abs(number) >= 1000 then
number_string = lang:formatNum( math.abs(number) )
if number < 0 then
number_string = '−' .. number_string
end
elseif number < 0 then
number_string = '−' .. number_string:sub(2)
end
end
return number_string
end
for i = 1,13 do
first_value_string[i] = formatNumber(first_value_number[i], first_value_string[i])
if second_value_number ~= nil then
second_value_string[i] = formatNumber(second_value_number[i], second_value_string[i])
end
end
 
if imperial_first and second_value_string ~= nil then
local t = first_value_string
first_value_string = second_value_string
second_value_string = t
end
 
if not single_line then
if second_line and second_valuessecond_value_string ~= nil then
first_value_string = second_value_string
first_values = second_values
end
second_valuessecond_value_string = nil
end
 
return makeLine( label, first_valuesfirst_value_string, second_valuessecond_value_string, color_values, color_scheme )
end