Module:IngredientsHierarchy - Revision history

76561197969631737: making the hierarchy delving stop at fuel types

2024-11-13T03:41:53Z

making the hierarchy delving stop at fuel types

← Older revision		Revision as of 03:41, 13 November 2024
Line 27:		Line 27:
	--region Private constants		--region Private constants

	local ~~EXCLUDED_BUILDING_IDS~~ = {		local IS_FUEL_TYPE = {
	["~~Clay Pit Workshop~~"] = true,		["[Mat Raw] Wood"] = true,
	["~~Greenhouse Workshop~~"] = true,		["[Crafting] Oil"] = true,
	["~~Ranch~~"] = true,		["[Crafting] Coal]"] = true,
			["[Crafting] Sea Marrow"] = true,
	}		}

Line 139:		Line 140:

	return ingredientsList		return ingredientsList
			end



			function IngredientsHierarchy.isAnyFuelInRecipe(DataModel, recipeData)

			if not recipeData then
			return false
			end

			for i = 1, DataModel:getRecipeNumIngredientSlots(recipeData) do
			if DataModel:isRecipeIngredientSlotFuel(recipeData, i) then
			return true
			end
			end
			return false
	end		end

Line 147:		Line 164:
	--Provide a quick way out if we find a no-ingredients recipe, like from a camp.		--Provide a quick way out if we find a no-ingredients recipe, like from a camp.
	local foundDeadEndRecipe = false		local foundDeadEndRecipe = false
			--Or fuel ingredients
			local foundFuelIngredients = false

	--First go through all the data models and extract an array of ingredients, with no duplicates.		--First go through all the data models and extract an array of ingredients, with no duplicates.
Line 158:		Line 177:
	--Go through all of those recipes, still for just this data model, and pull out a flat list of ingredients.		--Go through all of those recipes, still for just this data model, and pull out a flat list of ingredients.
	for _, recipe in ipairs(recipeList) do		for _, recipe in ipairs(recipeList) do
			foundFuelIngredients = IngredientsHierarchy.isAnyFuelInRecipe(DataModel, recipe)
	local newList = getIngredientsList(DataModel, recipe)		local newList = getIngredientsList(DataModel, recipe)

Line 177:		Line 197:
	local returnList = {}		local returnList = {}
	for _, newRoot in ipairs(ingredientsList) do		for _, newRoot in ipairs(ingredientsList) do
	local newNode = makeHierarchy(newRoot)		--Skip making the sub-hierarchy for fuel types. Currently, no fuel type ingredients exist in a recipe as both the fuel and the thing being fueled, so this is a safe shortcut.
			local newNode
			if foundFuelIngredients and IS_FUEL_TYPE[newRoot] then
			--This just has to be set to not-a-table-type
			newNode = newRoot
			else
			newNode = makeHierarchy(newRoot)
			end
	if type(newNode) == "table" then		if type(newNode) == "table" then
	returnList[newRoot] = newNode		returnList[newRoot] = newNode
Line 459:		Line 486:

	local ret = "{\|class=" .. CLASS_ENCOMPASSING_TABLE ..		local ret = "{\|class=" .. CLASS_ENCOMPASSING_TABLE ..
	"\n\|+ " .. caption		"\n\|+ " .. caption

	for _, id in ipairs(productIDList) do		for _, id in ipairs(productIDList) do
Line 577:		Line 604:
	return IngredientsHierarchy.renderProductTable(frame, cutoffDepth, caption, productIDList, truncatedHierarchy, leftoverItemsArray, sortedCountingTable)		return IngredientsHierarchy.renderProductTable(frame, cutoffDepth, caption, productIDList, truncatedHierarchy, leftoverItemsArray, sortedCountingTable)
	end		end



	return IngredientsHierarchy		return IngredientsHierarchy

76561197969631737: now making the hierarchy stop at camp-link/dead-end/no-ingredient recipes

2024-11-13T02:22:04Z

now making the hierarchy stop at camp-link/dead-end/no-ingredient recipes

← Older revision		Revision as of 02:22, 13 November 2024
Line 132:		Line 132:
	for i = 1, DataModel:getRecipeNumIngredientSlots(recipeData) do		for i = 1, DataModel:getRecipeNumIngredientSlots(recipeData) do
	for j = 1, DataModel:getRecipeIngredientNumOptions(recipeData, i) do		for j = 1, DataModel:getRecipeIngredientNumOptions(recipeData, i) do

	local ingredientID = DataModel:getRecipeIngredientOptionIDAt(recipeData, i, j)		local ingredientID = DataModel:getRecipeIngredientOptionIDAt(recipeData, i, j)
	~~--Thankfully, ingredients are always goods, never services.~~
	table.insert(ingredientsList, ingredientID)		table.insert(ingredientsList, ingredientID)
	end		end
Line 144:		Line 144:

	local function makeHierarchy(rootID)		local function makeHierarchy(rootID)

			--Provide a quick way out if we find a no-ingredients recipe, like from a camp.
			local foundDeadEndRecipe = false

	--First go through all the data models and extract an array of ingredients, with no duplicates.		--First go through all the data models and extract an array of ingredients, with no duplicates.
Line 155:		Line 158:
	--Go through all of those recipes, still for just this data model, and pull out a flat list of ingredients.		--Go through all of those recipes, still for just this data model, and pull out a flat list of ingredients.
	for _, recipe in ipairs(recipeList) do		for _, recipe in ipairs(recipeList) do
			local newList = getIngredientsList(DataModel, recipe)

	~~if not EXCLUDED_BUILDING_IDS[DataModel:getRecipeBuildingID(recipe)] then~~		--Check if it's a leaf node, if so, add to the running ingredients list
	~~local newList = getIngredientsList(DataModel, recipe)~~		if #newList > 0 then
			ingredientsList = mergeArrays(ingredientsList, newList)
	--Check if it's a leaf node, if so, add to the running ingredients list		else
	if #newList > 0 then		--Quit looking for recipes if we found a dead-end (no-ingredients) recipe.
	ingredientsList = mergeArrays(ingredientsList, newList)		foundDeadEndRecipe = true
	end		break
	end		end
	end		end
Line 169:		Line 173:

	--Recurse only if it's not a leaf node, but we have to wait to do this until we get through all the data models.		--Recurse only if it's not a leaf node, but we have to wait to do this until we get through all the data models.
	if #ingredientsList > 0 then		if #ingredientsList > 0 and not foundDeadEndRecipe then
	--We need to remove any ingredients that turn into tables, but keep them in order and in an array with no gaps. To do this, we'll create a new list to return and re-add subtables and string alike, in order.		--We need to remove any ingredients that turn into tables, but keep them in order and in an array with no gaps. To do this, we'll create a new list to return and re-add subtables and string alike, in order.
	local returnList = {}		local returnList = {}
Line 485:		Line 489:
	if sortedCountingTable and #sortedCountingTable > 0 then		if sortedCountingTable and #sortedCountingTable > 0 then

	local best = "\n{\|class=" .. CLASS_LEFTOVERS_TABLE		local best = "\n\|-" ..
			"\n{\|class=" .. CLASS_LEFTOVERS_TABLE
	.. "\n! " .. BEST_GOODS_HEADING .. ": "		.. "\n! " .. BEST_GOODS_HEADING .. ": "

76561197969631737: trying to exclude some buildings

2024-11-12T03:10:11Z

trying to exclude some buildings

← Older revision		Revision as of 03:10, 12 November 2024
Line 26:		Line 26:

	--region Private constants		--region Private constants

			local EXCLUDED_BUILDING_IDS = {
			["Clay Pit Workshop"] = true,
			["Greenhouse Workshop"] = true,
			["Ranch"] = true,
			}

	local PARAMETER_HEADER_ICON_SIZE = "large"		local PARAMETER_HEADER_ICON_SIZE = "large"
Line 150:		Line 156:
	for _, recipe in ipairs(recipeList) do		for _, recipe in ipairs(recipeList) do

	local newList = getIngredientsList(DataModel, recipe)		if not EXCLUDED_BUILDING_IDS[DataModel:getRecipeBuildingID(recipe)] then
			local newList = getIngredientsList(DataModel, recipe)

	--Check if it's a leaf node, if so, add to the running ingredients list		--Check if it's a leaf node, if so, add to the running ingredients list
	if #newList > 0 then		if #newList > 0 then
	ingredientsList = mergeArrays(ingredientsList, newList)		ingredientsList = mergeArrays(ingredientsList, newList)
			end
	end		end
	end		end

76561197969631737: Still WIP testing

2024-11-12T02:33:13Z

Still WIP testing

← Older revision		Revision as of 02:33, 12 November 2024
Line 39:		Line 39:
	local PARAMETER_BEST_DISPLAY_MODE = "notext"		local PARAMETER_BEST_DISPLAY_MODE = "notext"

	local CLASS_ENCOMPASSING_TABLE = "wikitable mw-collapsible verticalaligntop"		local CLASS_ENCOMPASSING_TABLE = "'wikitable mw-collapsible verticalaligntop'"
	local CLASS_HIERARCHY_TABLE = "wikitable"		local CLASS_HIERARCHY_TABLE = "wikitable"
	local CLASS_LEFTOVERS_TABLE = "wikitable"		local CLASS_LEFTOVERS_TABLE = "wikitable"

76561197969631737: Still WIP testing

2024-11-12T02:32:19Z

Still WIP testing

← Older revision		Revision as of 02:32, 12 November 2024
Line 39:		Line 39:
	local PARAMETER_BEST_DISPLAY_MODE = "notext"		local PARAMETER_BEST_DISPLAY_MODE = "notext"

	local CLASS_ENCOMPASSING_TABLE = "wikitable mw-collapsible"		local CLASS_ENCOMPASSING_TABLE = "wikitable mw-collapsible verticalaligntop"
	local CLASS_HIERARCHY_TABLE = "wikitable"		local CLASS_HIERARCHY_TABLE = "wikitable"
	local CLASS_LEFTOVERS_TABLE = "wikitable"		local CLASS_LEFTOVERS_TABLE = "wikitable"
Line 559:		Line 559:
	local truncatedHierarchy = truncateAtDepth(rolledupHierarchy, cutoffDepth-1)		local truncatedHierarchy = truncateAtDepth(rolledupHierarchy, cutoffDepth-1)
	local simplifiedHierarchy = simplifyHierarchy(truncatedHierarchy, createPresenceArray(leftoverItemsArray))		local simplifiedHierarchy = simplifyHierarchy(truncatedHierarchy, createPresenceArray(leftoverItemsArray))

	local caption = frame.args.caption or ""		local caption = frame.args.caption or ""

76561197969631737: Still WIP testing

2024-11-12T02:16:47Z

Still WIP testing

← Older revision		Revision as of 02:16, 12 November 2024
Line 559:		Line 559:
	local truncatedHierarchy = truncateAtDepth(rolledupHierarchy, cutoffDepth-1)		local truncatedHierarchy = truncateAtDepth(rolledupHierarchy, cutoffDepth-1)
	local simplifiedHierarchy = simplifyHierarchy(truncatedHierarchy, createPresenceArray(leftoverItemsArray))		local simplifiedHierarchy = simplifyHierarchy(truncatedHierarchy, createPresenceArray(leftoverItemsArray))

	local caption = frame.args.caption or ""		local caption = frame.args.caption or ""

	return IngredientsHierarchy.renderProductTable(frame, cutoffDepth, caption, productIDList, ~~simplifiedHierarchy~~, leftoverItemsArray, sortedCountingTable)		return IngredientsHierarchy.renderProductTable(frame, cutoffDepth, caption, productIDList, truncatedHierarchy, leftoverItemsArray, sortedCountingTable)
	end		end

76561197969631737: Still WIP testing

2024-11-12T02:07:31Z

Still WIP testing

← Older revision		Revision as of 02:07, 12 November 2024
Line 37:		Line 37:

	local PARAMETER_BEST_ICON_SIZE = "medium"		local PARAMETER_BEST_ICON_SIZE = "medium"
	local PARAMETER_BEST_DISPLAY_MODE = ""		local PARAMETER_BEST_DISPLAY_MODE = "notext"

	local CLASS_ENCOMPASSING_TABLE = "wikitable mw-collapsible"		local CLASS_ENCOMPASSING_TABLE = "wikitable mw-collapsible"
Line 464:		Line 464:
	--New row in the encompassing table		--New row in the encompassing table
	ret = ret .. "\n\|-" ..		ret = ret .. "\n\|-" ..
	"\n\|colspan=" .. #productIDList .. "\|"		"\n\|colspan=" .. #productIDList .. "\| "
	--Make the leftover ingredients list		--Make the leftover ingredients list
	local list = "\n{\|class=" .. CLASS_LEFTOVERS_TABLE		local list = "\n{\|class=" .. CLASS_LEFTOVERS_TABLE ..
			"\n\| "
	for _, goodID in ipairs(leftoverItemsArray) do		for _, goodID in ipairs(leftoverItemsArray) do
	list = list .. "\n" .. renderResourceLink(frame, goodID, PARAMETER_LEAF_ICON_SIZE, PARAMETER_LEAF_DISPLAY_MODE)		list = list .. "\n" .. renderResourceLink(frame, goodID, PARAMETER_LEAF_ICON_SIZE, PARAMETER_LEAF_DISPLAY_MODE)

76561197969631737: Still WIP testing

2024-11-12T02:06:10Z

Still WIP testing

← Older revision		Revision as of 02:06, 12 November 2024
Line 35:		Line 35:
	local PARAMETER_LEAF_ICON_SIZE = "small"		local PARAMETER_LEAF_ICON_SIZE = "small"
	local PARAMETER_LEAF_DISPLAY_MODE = "notext"		local PARAMETER_LEAF_DISPLAY_MODE = "notext"

			local PARAMETER_BEST_ICON_SIZE = "medium"
			local PARAMETER_BEST_DISPLAY_MODE = ""

	local CLASS_ENCOMPASSING_TABLE = "wikitable mw-collapsible"		local CLASS_ENCOMPASSING_TABLE = "wikitable mw-collapsible"
Line 483:		Line 486:
	end		end

	best = best .. "\n\| " .. BOLD .. pair.count .. BOLD .. " " .. renderResourceLink(frame, pair.id, ~~PARAMETER_LEAF_ICON_SIZE~~, ~~PARAMETER_LEAF_DISPLAY_MODE~~)		best = best .. "\n\| " .. BOLD .. pair.count .. BOLD .. " " .. renderResourceLink(frame, pair.id, PARAMETER_BEST_ICON_SIZE, PARAMETER_BEST_DISPLAY_MODE)
	end		end
	best = best .. "\n\|}"		best = best .. "\n\|}"

76561197969631737: adding error checking to skip blank parameters

2024-11-12T02:04:21Z

adding error checking to skip blank parameters

← Older revision		Revision as of 02:04, 12 November 2024
Line 524:		Line 524:
	--Trim any surrounding whitespace from the name		--Trim any surrounding whitespace from the name
	productName = IngredientsHierarchy.trim(productName)		productName = IngredientsHierarchy.trim(productName)
			--Skip any blank parameters
			if productName and productName ~= "" then

	--Convert the parameters to IDs instead of names.		--Convert the parameters to IDs instead of names.
	local productID = GoodsData.getGoodID(productName)		local productID = GoodsData.getGoodID(productName)
	if not productID then		if not productID then
	--Swap out names of services for the goods, since we're focusing on the products themselves; this also has the nice side-effect of reducing the level of the hierarchy by one where it doesn't matter much.		--Swap out names of services for the goods, since we're focusing on the products themselves; this also has the nice side-effect of reducing the level of the hierarchy by one where it doesn't matter much.
	productID = ServicesData.getServiceGoodID(productName)		productID = ServicesData.getServiceGoodID(productName)
			end
			if not productID then
			error(ERROR_MESSAGE_INVALID_PRODUCT .. ": " .. productName)
			end
			table.insert(productIDList, productID)
	end		end
	~~if not productID then~~
	~~error(ERROR_MESSAGE_INVALID_PRODUCT .. ": " .. productName)~~
	~~end~~
	~~table.insert(productIDList, productID)~~
	end		end
	if #productIDList < 1 then		if #productIDList < 1 then

76561197969631737: Still WIP testing

2024-11-12T02:01:34Z

Still WIP testing

← Older revision		Revision as of 02:01, 12 November 2024
Line 496:		Line 496:
	function IngredientsHierarchy.trim(str)		function IngredientsHierarchy.trim(str)

	~~return~~ str:~~match~~("^%s(.-)%s$")		--Ignore second returned value from gsub.
			str = str:gsub("^%s(.-)%s$", "%1")
			return str
	end		end