Module:Pop density/sandbox - Revision history

Frietjes at 19:10, 4 January 2014

2014-01-04T19:10:17Z

← Previous revision		Revision as of 19:10, 4 January 2014
Line 72:		Line 72:
	end		end
	elseif(areaunit1 ~= '') then		elseif(areaunit1 ~= '') then
		⚫	if( disp ~= 'num' ) then
		⚫	dens2 = '?'
		⚫	else
		⚫	dens2 = '?' .. uniterror
		⚫	end
	if(unit2) then		if(unit2) then
⚫	if( disp ~= 'num' ) then
⚫	dens2 = '?'
⚫	else
⚫	dens2 = '?' .. uniterror
⚫	end
	str2 = '/' .. unitstr[unit2]		str2 = '/' .. unitstr[unit2]
			elseif(areaunit2 ~= '') then
			str2 = '/' .. areaunit2 .. uniterror
	end		end
	str1 = '/' .. areaunit1 .. uniterror		str1 = '/' .. areaunit1 .. uniterror

Frietjes at 19:06, 4 January 2014

2014-01-04T19:06:38Z

← Previous revision		Revision as of 19:06, 4 January 2014
Line 73:		Line 73:
	elseif(areaunit1 ~= '') then		elseif(areaunit1 ~= '') then
	if(unit2) then		if(unit2) then
	~~dens2~~ = '?'		if( disp ~= 'num' ) then
			dens2 = '?'
			else
			dens2 = '?' .. uniterror
			end
	str2 = '/' .. unitstr[unit2]		str2 = '/' .. unitstr[unit2]
	end		end

Frietjes at 19:05, 4 January 2014

2014-01-04T19:05:10Z

← Previous revision		Revision as of 19:05, 4 January 2014
Line 74:		Line 74:
	if(unit2) then		if(unit2) then
	dens2 = '?'		dens2 = '?'
	str2 = '/' .. ~~areaunit2 .. uniterror~~		str2 = '/' .. unitstr[unit2]
	end		end
	str1 = '/' .. areaunit1 .. uniterror		str1 = '/' .. areaunit1 .. uniterror

Frietjes at 19:03, 4 January 2014

2014-01-04T19:03:57Z

← Previous revision		Revision as of 19:03, 4 January 2014
Line 42:		Line 42:

	local function popdensity(pop, area1, areaunit1, areaunit2, prec, disp, flip)		local function popdensity(pop, area1, areaunit1, areaunit2, prec, disp, flip)
	local ~~dens1,~~ dens1, prec1 = ~~nil,~~ nil, nil		local dens1, prec1 = nil, nil
	local ~~dens2,~~ dens2, prec2 = ~~nil,~~ nil, nil		local dens2, prec2 = nil, nil
	local str1, str2 = '', ''		local str1, str2 = '', ''
	local uniterror = '<sup>[[Template:Pop density\|?Unknown unit?]]</sup>[[Category:Pop density using unsupported units]]'		local uniterror = '<sup>[[Template:Pop density\|?Unknown unit?]]</sup>[[Category:Pop density using unsupported units]]'
Line 72:		Line 72:
	end		end
	elseif(areaunit1 ~= '') then		elseif(areaunit1 ~= '') then
			if(unit2) then
			dens2 = '?'
			str2 = '/' .. areaunit2 .. uniterror
			end
	str1 = '/' .. areaunit1 .. uniterror		str1 = '/' .. areaunit1 .. uniterror
	end		end

Frietjes at 18:54, 4 January 2014

2014-01-04T18:54:20Z

← Previous revision		Revision as of 18:54, 4 January 2014
Line 64:		Line 64:
	str2 = '/' .. unitstr[unit2]		str2 = '/' .. unitstr[unit2]
	elseif(areaunit2 ~= '') then		elseif(areaunit2 ~= '') then
	~~dens2~~ = '?'		if( disp ~= 'num' ) then
			dens2 = '?'
			else
			dens2 = '?' .. uniterror
			end
	str2 = '/' .. areaunit2 .. uniterror		str2 = '/' .. areaunit2 .. uniterror
	end		end

Frietjes at 18:51, 4 January 2014

2014-01-04T18:51:34Z

← Previous revision		Revision as of 18:51, 4 January 2014
Line 45:		Line 45:
	local dens2, dens2, prec2 = nil, nil, nil		local dens2, dens2, prec2 = nil, nil, nil
	local str1, str2 = '', ''		local str1, str2 = '', ''
	local uniterror = '<sup>[[Template:Pop density\|?~~Unkown~~ unit?]]</sup>[[Category:Pop density using unsupported units]]'		local uniterror = '<sup>[[Template:Pop density\|?Unknown unit?]]</sup>[[Category:Pop density using unsupported units]]'

	if(pop ~= '' and area1 ~= '') then		if(pop ~= '' and area1 ~= '') then
Line 64:		Line 64:
	str2 = '/' .. unitstr[unit2]		str2 = '/' .. unitstr[unit2]
	elseif(areaunit2 ~= '') then		elseif(areaunit2 ~= '') then
			dens2 = '?'
	str2 = '/' .. areaunit2 .. uniterror		str2 = '/' .. areaunit2 .. uniterror
	end		end

Frietjes at 18:45, 4 January 2014

2014-01-04T18:45:48Z

← Previous revision		Revision as of 18:45, 4 January 2014
Line 45:		Line 45:
	local dens2, dens2, prec2 = nil, nil, nil		local dens2, dens2, prec2 = nil, nil, nil
	local str1, str2 = '', ''		local str1, str2 = '', ''
		⚫	local uniterror = '<sup>[[Template:Pop density\|?Unkown unit?]]</sup>[[Category:Pop density using unsupported units]]'
	local cat = ''

	if(pop ~= '' and area1 ~= '') then		if(pop ~= '' and area1 ~= '') then
Line 52:		Line 52:
	local unit1 = unitnames[areaunit1] or nil		local unit1 = unitnames[areaunit1] or nil
	local unit2 = unitnames[areaunit2] or nil		local unit2 = unitnames[areaunit2] or nil
	if(unit1 == nil) then
⚫	~~cat~~ = '[[Category:Pop density using unsupported units]]'
	else
⚫	if(~~unit2 == nil and~~ areaunit2 ~= '') then
	cat = '[[Category:Pop density using unsupported units]]'
	end
	end

	prec1 = (prec ~= '') and tonumber(prec) or (1+math.log10(2*area1/(1/10^precision(pop)+pop/area1/10^precision(area1))))		prec1 = (prec ~= '') and tonumber(prec) or (1+math.log10(2*area1/(1/10^precision(pop)+pop/area1/10^precision(area1))))
Line 70:		Line 63:
	dens2 = rnd(dens1num*mult, math.floor(prec2 + 0.5))		dens2 = rnd(dens1num*mult, math.floor(prec2 + 0.5))
	str2 = '/' .. unitstr[unit2]		str2 = '/' .. unitstr[unit2]
		⚫	elseif(areaunit2 ~= '') then
			str2 = '/' .. areaunit2 .. uniterror
	end		end
			elseif(areaunit1 ~= '') then
			str1 = '/' .. areaunit1 .. uniterror
	end		end

Line 91:		Line 88:
	if( disp ~= 'num' ) then		if( disp ~= 'num' ) then
	-- display input density number with unit		-- display input density number with unit
	return dens1 .. str1 ~~.. cat~~		return dens1 .. str1
	else		else
	-- display input density number without unit		-- display input density number without unit
	return dens1 ~~.. cat~~		return dens1
	end		end
	end		end
	end		end
	return '~~<span class="error">Error</span>~~' ~~.. cat~~		return ''
	end		end

Frietjes at 18:17, 4 January 2014

2014-01-04T18:17:45Z

← Previous revision		Revision as of 18:17, 4 January 2014
Line 19:		Line 19:
	["acre"] = "acre",		["acre"] = "acre",
	["ha"] = "ha",		["ha"] = "ha",
			["dunam"] = "dunam",
			["m²"] = "m2",
			["sqm"] = "m2",
	["m2"] = "m2"		["m2"] = "m2"
	}		}
Line 26:		Line 29:
	["acre"] = 4046.8564224,		["acre"] = 4046.8564224,
	["ha"] = 10000,		["ha"] = 10000,
			["dunam"] = 1000,
	["m2"] = 1		["m2"] = 1
	}		}
Line 33:		Line 37:
	["acre"] = 'acre',		["acre"] = 'acre',
	["ha"] = 'ha',		["ha"] = 'ha',
			["dunam"] = 'dunam',
	["m2"] = 'm<sup>2</sup>'		["m2"] = 'm<sup>2</sup>'
	}		}
Line 40:		Line 45:
	local dens2, dens2, prec2 = nil, nil, nil		local dens2, dens2, prec2 = nil, nil, nil
	local str1, str2 = '', ''		local str1, str2 = '', ''
			local cat = ''

	if(pop ~= '' and area1 ~= '') then		if(pop ~= '' and area1 ~= '') then
	-- pop and area are defined		-- pop and area are defined
	local dens1num = tonumber(pop)/tonumber(area1)		local dens1num = tonumber(pop)/tonumber(area1)
		⚫	local unit1 = unitnames[areaunit1] or nil
		⚫	local unit2 = unitnames[areaunit2] or nil
		⚫	if(unit1 == nil) then
			cat = '[[Category:Pop density using unsupported units]]'
			else
			if(unit2 == nil and areaunit2 ~= '') then
			cat = '[[Category:Pop density using unsupported units]]'
			end
			end

	prec1 = (prec ~= '') and tonumber(prec) or (1+math.log10(2*area1/(1/10^precision(pop)+pop/area1/10^precision(area1))))		prec1 = (prec ~= '') and tonumber(prec) or (1+math.log10(2*area1/(1/10^precision(pop)+pop/area1/10^precision(area1))))
	dens1 = rnd(dens1num, math.floor(prec1 + 0.5))		dens1 = rnd(dens1num, math.floor(prec1 + 0.5))
			if (unit1) then
⚫	~~areaunit1~~ = unitnames[areaunit1] or nil
		⚫	str1 = '/' .. unitstr[unit1]
⚫	~~areaunit2~~ = unitnames[areaunit2] or nil
	if (~~areaunit1~~) then		if(unit2) then
⚫	str1 = '/' .. unitstr[~~areaunit1~~]
⚫	if(~~areaunit2~~) then
	-- convert		-- convert
	local mult = unitmult[~~areaunit2~~]/unitmult[~~areaunit1~~]		local mult = unitmult[unit2]/unitmult[unit1]
	prec2 = prec1 - math.log10(mult)		prec2 = prec1 - math.log10(mult)
	dens2 = rnd(dens1num*mult, math.floor(prec2 + 0.5))		dens2 = rnd(dens1num*mult, math.floor(prec2 + 0.5))
	str2 = '/' .. unitstr[~~areaunit2~~]		str2 = '/' .. unitstr[unit2]
	end		end
	end		end
Line 77:		Line 91:
	if( disp ~= 'num' ) then		if( disp ~= 'num' ) then
	-- display input density number with unit		-- display input density number with unit
	return dens1 .. str1		return dens1 .. str1 .. cat
	else		else
	-- display input density number without unit		-- display input density number without unit
	return dens1		return dens1 .. cat
	end		end
	end		end
	end		end
	return '<span class="error">Error</span>'		return '<span class="error">Error</span>' .. cat
	end		end

Frietjes at 18:05, 4 January 2014

2014-01-04T18:05:20Z

← Previous revision		Revision as of 18:05, 4 January 2014
Line 52:		Line 52:
	if(areaunit2) then		if(areaunit2) then
	-- convert		-- convert
	local mult = unitmult[~~areaunit1~~]/unitmult[~~areaunit2~~]		local mult = unitmult[areaunit2]/unitmult[areaunit1]
	prec2 = prec1 - math.log10(mult)		prec2 = prec1 - math.log10(mult)
	dens2 = rnd(dens1num*mult, math.floor(prec2 + 0.5))		dens2 = rnd(dens1num*mult, math.floor(prec2 + 0.5))

Frietjes at 18:01, 4 January 2014

2014-01-04T18:01:44Z

← Previous revision		Revision as of 18:01, 4 January 2014
Line 52:		Line 52:
	if(areaunit2) then		if(areaunit2) then
	-- convert		-- convert
	local mult = ~~areamult~~[areaunit1]/~~areamult~~[areaunit2]		local mult = unitmult[areaunit1]/unitmult[areaunit2]
	prec2 = prec1 - math.log10(mult)		prec2 = prec1 - math.log10(mult)
	dens2 = rnd(dens1num*mult, math.floor(prec2 + 0.5))		dens2 = rnd(dens1num*mult, math.floor(prec2 + 0.5))