Module:Piechart - Revision history

Nux: force sum to be below 100%; error reporting

2025-05-10T02:05:22Z

force sum to be below 100%; error reporting

← Previous revision		Revision as of 02:05, 10 May 2025
Line 243:		Line 243:
	-- In short: ±0.3 is a reasonable deviation; ±1 when the errors accumulate		-- In short: ±0.3 is a reasonable deviation; ±1 when the errors accumulate
	-- https://en.wikipedia.org/wiki/Template_talk:Pie_chart#c-Nux-20250429152000-Nux-20250422224600		-- https://en.wikipedia.org/wiki/Template_talk:Pie_chart#c-Nux-20250429152000-Nux-20250422224600
	function priv.sumErrorTracking(sum)		function priv.sumErrorTracking(sum, items)
	local diff = sum - 100		local diff = sum - 100
	if diff >= 0.4 and diff <= 10 then		if diff >= 0.4 and diff <= 10 then
			local firstItem = items[1]
⚫	mw.addWarning("pie chart: Σ ~~(value)~~ = "..~~sum~~.."%")
			local lastItem = items[#items]
			mw.addWarning("pie chart: Σ (value) = "..sum.."% ("..firstItem.value.." + .. .+ "..lastItem.value..")")
	if mw.title.getCurrentTitle().namespace == 0 then		if mw.title.getCurrentTitle().namespace == 0 then
	local suffix = priv.boundaryFormatting(diff)		local suffix = priv.boundaryFormatting(diff)
Line 416:		Line 418:
	if (value < 0.03) then		if (value < 0.03) then
	mw.log('value too small', value, label)		mw.log('value too small', value, label)
		⚫	mw.addWarning("pie chart: too small ↆ "..value.."% ("..label..")")
	return ""		return ""
	end		end
Line 430:		Line 433:
	end		end
	value = value + 0.2		value = value + 0.2
			end
			-- force sum to be below 100% (needed due to value errors)
			if previous + value > 100 then
			if previous >= 100 then
			mw.log('previous is already at 100', value, label)
			return ""
			end
			value = 100 - previous
	end		end

Line 767:		Line 778:
	end		end
	-- re-loop to set values in labels		-- re-loop to set values in labels
			local willAutoscale = priv.willAutoscale(sum)
	for _, entry in ipairs(result) do		for _, entry in ipairs(result) do
	local label = entry.label		local label = entry.label
	if label and not label:find("%$v") then		if label and not label:find("%$v") then
	-- autoscale will be forced, so use $v in labels		-- autoscale will be forced, so use $v in labels
	if ~~priv.~~willAutoscale~~(sum)~~ then		if willAutoscale then
	entry.label = label .. " $v"		entry.label = label .. " $v"
	else		else
	entry.label = label .. " (" .. entry.value .. "%)"		entry.label = label .. " (" .. entry.value .. "%)"
	end		end
⚫	-- tracking data errors
⚫	priv.sumErrorTracking(sum)
	end		end
	end		end
		⚫	-- tracking data errors
		⚫	priv.sumErrorTracking(sum, result)

	-- support other value mapping		-- support other value mapping

Nux: Undid revision 1289661032 by Nux (talk)

2025-05-10T02:00:43Z

Undid revision 1289661032 by Nux (talk)

← Previous revision		Revision as of 02:00, 10 May 2025
Line 238:		Line 238:
	local diff = sum - 100		local diff = sum - 100
	local grace = 1		local grace = 1
⚫	-- ~~tracing~~ (note, ~~kind of~~ expensive, ~~same~~ as red-link)
⚫	if diff >= 0.1 and diff <= 10 then
⚫	local suffix = priv.boundaryFormatting(diff)
⚫	_ = mw.title.new("Module:Piechart/tracing/diff below "..suffix).id
⚫	end
	return diff > grace		return diff > grace
			end
		⚫	-- Tracking errors in data (note: somewhat expensive, similar to a red link)
			-- In short: ±0.3 is a reasonable deviation; ±1 when the errors accumulate
			-- https://en.wikipedia.org/wiki/Template_talk:Pie_chart#c-Nux-20250429152000-Nux-20250422224600
			function priv.sumErrorTracking(sum)
		⚫	local diff = sum - 100
		⚫	if diff >= 0.4 and diff <= 10 then
			mw.addWarning("pie chart: Σ (value) = "..sum.."%")
			if mw.title.getCurrentTitle().namespace == 0 then
		⚫	local suffix = priv.boundaryFormatting(diff)
		⚫	_ = mw.title.new("Module:Piechart/tracing/diff below "..suffix).id
		⚫	end
		⚫	end
	end		end

Line 365:		Line 373:
	local first = true		local first = true
	local previous = 0		local previous = 0
⚫	local no = 0
	local items = ""		local items = ""
	local header = ""
	for index, entry in ipairs(data) do		for index, entry in ipairs(data) do
	if not entry.error then		if not entry.error then
		⚫	items = items .. priv.renderItem(previous, entry, options)
	no = no + 1
⚫	if no == ~~total~~ then
⚫	header = priv.~~renderFinal~~(~~entry,~~ options)
⚫	else
⚫	items = items .. priv.~~renderOther~~(previous, entry, options)
⚫	end
	previous = previous + entry.value		previous = previous + entry.value
	end		end
	end		end
		⚫
⚫	local footer = '\n</div>'
		⚫	local header = priv.renderHeader(options)
		⚫	local footer = '\n<div class="smooth-pie-border"></div></div>'

	return header, items, footer		return header, items, footer
	end		end
			-- header of pie-items (class="smooth-pie")
	-- final, but header...
	function priv.~~renderFinal~~(~~entry,~~ options)		function priv.renderHeader(options)
	local ~~label~~ = ~~entry.label~~		local bcolor = 'background:#888;color:#000'
	local bcolor = entry.bcolor
	local size = options.size		local size = options.size

Line 400:		Line 402:
	<div class="smooth-pie"		<div class="smooth-pie"
	style="]]..style..[["		style="]]..style..[["
	title="]]..p.extract_text(label)..[["
	]]..aria..[[		]]..aria..[[
	>]]		>]]
	return html		return html
	end		end
			-- Render pie-item
	-- any other then final
			-- (previous is a sum of previous values)
	function priv.~~renderOther~~(previous, entry, options)		function priv.renderItem(previous, entry, options)
	local value = entry.value		local value = entry.value
	local label = entry.label		local label = entry.label
Line 416:		Line 418:
	return ""		return ""
	end		end

⚫
			-- minimize transformation defects
			if value < 10 then
		⚫	if previous > 1 then
			previous = previous - 0.01
			end
			value = value + 0.02
		⚫	else
			if previous > 1 then
			previous = previous - 0.1
			end
			value = value + 0.2
			end

	local html = ""		local html = ""

Line 483:		Line 498:
	end		end

	-- translate value to turn rotation		-- translate value to turn rotation (v=100 => 1.0turn)
	function priv.rotation(value)		function priv.rotation(value)
	if (value > 0) then		if (value > 0.001) then
	~~return~~ string.format("~~transform: rotate(~~%.~~3fturn)~~", value/100)		local f = string.format("%.7f", value / 100)
			f = f:gsub("(%d)0+$", "%1") -- remove trailing zeros
			return "transform: rotate("..f.."turn)"
	end		end
	return ''		return ''
Line 759:		Line 776:
	entry.label = label .. " (" .. entry.value .. "%)"		entry.label = label .. " (" .. entry.value .. "%)"
	end		end
			-- tracking data errors
			priv.sumErrorTracking(sum)
	end		end
	end		end

Nux: broken

2025-05-10T01:18:37Z

broken

← Previous revision		Revision as of 01:18, 10 May 2025
Line 238:		Line 238:
	local diff = sum - 100		local diff = sum - 100
	local grace = 1		local grace = 1
		⚫	-- tracing (note, kind of expensive, same as red-link)
		⚫	if diff >= 0.1 and diff <= 10 then
		⚫	local suffix = priv.boundaryFormatting(diff)
		⚫	_ = mw.title.new("Module:Piechart/tracing/diff below "..suffix).id
		⚫	end
	return diff > grace		return diff > grace
	end
⚫	-- ~~Tracking errors in data~~ (note: ~~somewhat~~ expensive, ~~similar~~ ~~to a~~ red link)
	-- In short: ±0.3 is a reasonable deviation; ±1 when the errors accumulate
	-- https://en.wikipedia.org/wiki/Template_talk:Pie_chart#c-Nux-20250429152000-Nux-20250422224600
	function priv.sumErrorTracking(sum)
⚫	local ~~diff~~ = ~~sum - 100~~
⚫	if diff >= 0.4 and diff <= 10 then
	mw.addWarning("pie chart: Σ (value) = "..sum.."%")
	if mw.title.getCurrentTitle().namespace == 0 then
⚫	local suffix = priv.boundaryFormatting(diff)
⚫	_ = mw.title.new("Module:Piechart/tracing/diff below "..suffix).id
⚫	end
⚫	end
	end		end

Line 373:		Line 365:
	local first = true		local first = true
	local previous = 0		local previous = 0
		⚫	local no = 0
	local items = ""		local items = ""
			local header = ""
	for index, entry in ipairs(data) do		for index, entry in ipairs(data) do
	if not entry.error then		if not entry.error then
			no = no + 1
⚫	items = items .. priv.~~renderItem~~(previous, entry, options)
		⚫	if no == total then
		⚫	header = priv.renderFinal(entry, options)
		⚫	else
		⚫	items = items .. priv.renderOther(previous, entry, options)
		⚫	end
	previous = previous + entry.value		previous = previous + entry.value
	end		end
	end		end
		⚫	local footer = '\n</div>'
⚫
⚫	~~local~~ header = priv.~~renderHeader~~(options)
⚫	local footer = '\n~~<div class="smooth-pie-border"></div>~~</div>'

	return header, items, footer		return header, items, footer
	end		end
			-- final, but header...
	-- header of pie-items (class="smooth-pie")
	function priv.~~renderHeader~~(options)		function priv.renderFinal(entry, options)
	local ~~bcolor~~ = ~~'background:#888;color:#000'~~		local label = entry.label
			local bcolor = entry.bcolor
	local size = options.size		local size = options.size

Line 402:		Line 400:
	<div class="smooth-pie"		<div class="smooth-pie"
	style="]]..style..[["		style="]]..style..[["
			title="]]..p.extract_text(label)..[["
	]]..aria..[[		]]..aria..[[
	>]]		>]]
	return html		return html
	end		end
			-- any other then final
	-- Render pie-item
		⚫	function priv.renderOther(previous, entry, options)
	-- (previous is a sum of previous values)
⚫	function priv.~~renderItem~~(previous, entry, options)
	local value = entry.value		local value = entry.value
	local label = entry.label		local label = entry.label
Line 418:		Line 416:
	return ""		return ""
	end		end
		⚫

	-- minimize transformation defects
	if value < 10 then
⚫	if ~~previous~~ > 1 then
	previous = previous - 0.01
	end
	value = value + 0.02
⚫	else
	if previous > 1 then
	previous = previous - 0.1
	end
	value = value + 0.2
	end

	local html = ""		local html = ""

Line 498:		Line 483:
	end		end

	-- translate value to turn rotation ~~(v=100 => 1.0turn)~~		-- translate value to turn rotation
	function priv.rotation(value)		function priv.rotation(value)
	if (value > 0~~.001~~) then		if (value > 0) then
	~~local f =~~ string.format("%.7f", value / 100)		return string.format("transform: rotate(%.3fturn)", value/100)
	f = f:gsub("(%d)0+$", "%1") -- remove trailing zeros
	return "transform: rotate("..f.."turn)"
	end		end
	return ''		return ''
Line 776:		Line 759:
	entry.label = label .. " (" .. entry.value .. "%)"		entry.label = label .. " (" .. entry.value .. "%)"
	end		end
	-- tracking data errors
	priv.sumErrorTracking(sum)
	end		end
	end		end

Nux: minimize transformation defects; add top border; render last element same as others; tracking errors evolution

2025-05-10T01:08:43Z

minimize transformation defects; add top border; render last element same as others; tracking errors evolution

← Previous revision		Revision as of 01:08, 10 May 2025
Line 238:		Line 238:
	local diff = sum - 100		local diff = sum - 100
	local grace = 1		local grace = 1
⚫	-- ~~tracing~~ (note, ~~kind of~~ expensive, ~~same~~ as red-link)
⚫	if diff >= 0.1 and diff <= 10 then
⚫	local suffix = priv.boundaryFormatting(diff)
⚫	_ = mw.title.new("Module:Piechart/tracing/diff below "..suffix).id
⚫	end
	return diff > grace		return diff > grace
			end
		⚫	-- Tracking errors in data (note: somewhat expensive, similar to a red link)
			-- In short: ±0.3 is a reasonable deviation; ±1 when the errors accumulate
			-- https://en.wikipedia.org/wiki/Template_talk:Pie_chart#c-Nux-20250429152000-Nux-20250422224600
			function priv.sumErrorTracking(sum)
		⚫	local diff = sum - 100
		⚫	if diff >= 0.4 and diff <= 10 then
			mw.addWarning("pie chart: Σ (value) = "..sum.."%")
			if mw.title.getCurrentTitle().namespace == 0 then
		⚫	local suffix = priv.boundaryFormatting(diff)
		⚫	_ = mw.title.new("Module:Piechart/tracing/diff below "..suffix).id
		⚫	end
		⚫	end
	end		end

Line 365:		Line 373:
	local first = true		local first = true
	local previous = 0		local previous = 0
⚫	local no = 0
	local items = ""		local items = ""
	local header = ""
	for index, entry in ipairs(data) do		for index, entry in ipairs(data) do
	if not entry.error then		if not entry.error then
		⚫	items = items .. priv.renderItem(previous, entry, options)
	no = no + 1
⚫	if no == ~~total~~ then
⚫	header = priv.~~renderFinal~~(~~entry,~~ options)
⚫	else
⚫	items = items .. priv.~~renderOther~~(previous, entry, options)
⚫	end
	previous = previous + entry.value		previous = previous + entry.value
	end		end
	end		end
		⚫
⚫	local footer = '\n</div>'
		⚫	local header = priv.renderHeader(options)
		⚫	local footer = '\n<div class="smooth-pie-border"></div></div>'

	return header, items, footer		return header, items, footer
	end		end
			-- header of pie-items (class="smooth-pie")
	-- final, but header...
	function priv.~~renderFinal~~(~~entry,~~ options)		function priv.renderHeader(options)
	local ~~label~~ = ~~entry.label~~		local bcolor = 'background:#888;color:#000'
	local bcolor = entry.bcolor
	local size = options.size		local size = options.size

Line 400:		Line 402:
	<div class="smooth-pie"		<div class="smooth-pie"
	style="]]..style..[["		style="]]..style..[["
	title="]]..p.extract_text(label)..[["
	]]..aria..[[		]]..aria..[[
	>]]		>]]
	return html		return html
	end		end
			-- Render pie-item
	-- any other then final
			-- (previous is a sum of previous values)
	function priv.~~renderOther~~(previous, entry, options)		function priv.renderItem(previous, entry, options)
	local value = entry.value		local value = entry.value
	local label = entry.label		local label = entry.label
Line 416:		Line 418:
	return ""		return ""
	end		end

⚫
			-- minimize transformation defects
			if value < 10 then
		⚫	if previous > 1 then
			previous = previous - 0.01
			end
			value = value + 0.02
		⚫	else
			if previous > 1 then
			previous = previous - 0.1
			end
			value = value + 0.2
			end

	local html = ""		local html = ""

Line 483:		Line 498:
	end		end

	-- translate value to turn rotation		-- translate value to turn rotation (v=100 => 1.0turn)
	function priv.rotation(value)		function priv.rotation(value)
	if (value > 0) then		if (value > 0.001) then
	~~return~~ string.format("~~transform: rotate(~~%.~~3fturn)~~", value/100)		local f = string.format("%.7f", value / 100)
			f = f:gsub("(%d)0+$", "%1") -- remove trailing zeros
			return "transform: rotate("..f.."turn)"
	end		end
	return ''		return ''
Line 759:		Line 776:
	entry.label = label .. " (" .. entry.value .. "%)"		entry.label = label .. " (" .. entry.value .. "%)"
	end		end
			-- tracking data errors
			priv.sumErrorTracking(sum)
	end		end
	end		end

Nux at 15:12, 29 April 2025

2025-04-29T15:12:20Z

← Previous revision		Revision as of 15:12, 29 April 2025
Line 237:		Line 237:
	--- ...and data precision problems https://en.wikipedia.org/wiki/Template_talk:Pie_chart#c-PrimeHunter-20250420202500-Allow_percentage_sum_slightly_above_100		--- ...and data precision problems https://en.wikipedia.org/wiki/Template_talk:Pie_chart#c-PrimeHunter-20250420202500-Allow_percentage_sum_slightly_above_100
	local diff = sum - 100		local diff = sum - 100
	local grace = 0.1		local grace = 1
	-- tracing (note, kind of expensive, same as red-link)		-- tracing (note, kind of expensive, same as red-link)
	if diff > ~~grace~~ and diff < 10 then		if diff >= 0.1 and diff <= 10 then
	local suffix = priv.boundaryFormatting(diff)		local suffix = priv.boundaryFormatting(diff)
	_ = mw.title.new("Module:Piechart/tracing/diff below "..suffix).id		_ = mw.title.new("Module:Piechart/tracing/diff below "..suffix).id

Nux: tracing per talk

2025-04-28T19:04:02Z

tracing per talk

@@ Line 220: / Line 220: @@
 	return html
 end
@@ Line 226: / Line 236: @@
 	-- Compare with a number larger then 100% to avoid floating-point precision problems
 	--- ...and data precision problems https://en.wikipedia.org/wiki/Template_talk:Pie_chart#c-PrimeHunter-20250420202500-Allow_percentage_sum_slightly_above_100
-	return sum - 100 > 1e-1
+	local diff = sum - 100
 end

Nux: even less precise autoscale: 0.1 margin

2025-04-21T11:24:41Z

even less precise autoscale: 0.1 margin

← Previous revision		Revision as of 11:24, 21 April 2025
Line 225:		Line 225:
	function priv.willAutoscale(sum)		function priv.willAutoscale(sum)
	-- Compare with a number larger then 100% to avoid floating-point precision problems		-- Compare with a number larger then 100% to avoid floating-point precision problems
			--- ...and data precision problems https://en.wikipedia.org/wiki/Template_talk:Pie_chart#c-PrimeHunter-20250420202500-Allow_percentage_sum_slightly_above_100
	return sum - 100 > 1e-4		return sum - 100 > 1e-1
	end		end

Nux: metadata cleanup (mostly)

2025-04-21T11:15:33Z

metadata cleanup (mostly)

@@ Line 6: / Line 6: @@
 -- require exact colors for printing
 local forPrinting = "-webkit-print-color-adjust: exact; print-color-adjust: exact;"
---[[
+--[===[
 	Smooth piechart module.
 	Draws charts in HTML with an accessible legend (optional).
 	A list of all features is in the "TODO" section of the main `p.pie` function.
 	Use with a helper template that adds required CSS.
@@ Line 25: / Line 29: @@
 	{{{meta}}}:
 		{"size":200, "autoscale":false, "legend":true}
 	All meta options are optional (see `function p.setupOptions`).
-]]
+]===]
 --[[
@@ Line 79: / Line 83: @@
 end
---[[
+--[===[
-	TODO:
+	TODO (maybe):
 function p.pie(frame)
 	local json_data = priv.trim(frame.args[1])
@@ Line 152: / Line 123: @@
 	-- internals
 	options.style = ""
-	if user_options.meta then
+	if user_options and user_options.meta then
 		local decodeSuccess, rawOptions = pcall(function()
 			return mw.text.jsonDecode(user_options.meta, mw.text.JSON_TRY_FIXING)

Nux: error messages for jsonDecode

2025-04-14T21:18:04Z

error messages for jsonDecode

@@ Line 153: / Line 153: @@
 	options.style = ""
 	if user_options.meta then
-		local rawOptions = mw.text.jsonDecode(user_options.meta, mw.text.JSON_TRY_FIXING)
+		local decodeSuccess, rawOptions = pcall(function()
 		if rawOptions then
 			if type(rawOptions.size) == "number" then
@@ Line 204: / Line 210: @@
 ]]
 function p.renderPie(json_data, user_options)
 	local options = p.setupOptions(user_options)
@@ Line 815: / Line 833: @@
 	-- explicit meta param
 	if args["meta"] then
-		meta = mw.text.jsonDecode(args["meta"], mw.text.JSON_TRY_FIXING)
+			return mw.text.jsonDecode(args["meta"], mw.text.JSON_TRY_FIXING)
 	end

Johnuniq: temp workaround for a Module:Political party issue reported on talk

2025-03-12T10:18:25Z

temp workaround for a Module:Political party issue reported on talk

← Previous revision		Revision as of 10:18, 12 March 2025
Line 602:		Line 602:
	if (type(entry.color) == "string") then		if (type(entry.color) == "string") then
	-- Remove unsafe characters from entry.color		-- Remove unsafe characters from entry.color
	local sanitizedColor = entry.color~~:gsub("[^a-zA-Z0-9#%-]", "")~~		local sanitizedColor = entry.color
			:gsub('#', '#') -- workaround Module:Political_party issue reported on talk
			:gsub("[^a-zA-Z0-9#%-]", "")
	return 'background:' .. sanitizedColor		return 'background:' .. sanitizedColor
	else		else