feat: kæden planlægger hø og ensilage — græs med produkt, mangel/afvisning pr. vare (v1.62.29)
This commit is contained in:
@@ -95,10 +95,11 @@ function ADChain.stateFromRecords(records)
|
||||
return state
|
||||
end
|
||||
|
||||
-- Afviste forslag beholdes kun mens manglen for afgrøden findes og har ændret sig højst 25 %.
|
||||
-- Afviste forslag beholdes kun mens manglen for afgrøden findes og har ændret sig højst 25 %. entry.fruit er
|
||||
-- mangelens nøgle: afgrøden, eller varen for hø/ensilage (DRYGRASS_WINDROW) — samme felt i savegamet.
|
||||
function ADChain.pruneDismissed(dismissed, shortages)
|
||||
local byFruit = {}
|
||||
for _, shortage in ipairs(shortages or {}) do byFruit[shortage.fruit] = shortage.missingHa end
|
||||
for _, shortage in ipairs(shortages or {}) do byFruit[shortage.key or shortage.fruit] = shortage.missingHa end
|
||||
local kept = {}
|
||||
for id, entry in pairs(dismissed or {}) do
|
||||
local now = byFruit[entry.fruit]
|
||||
@@ -117,10 +118,14 @@ function ADChain.dismissedFruits(dismissed)
|
||||
return result
|
||||
end
|
||||
|
||||
function ADChain.unionFruits(usedFruits, fieldDemand)
|
||||
-- fieldProducts[nøgle] = {fruit, product}: en markvares behov (hø) gør dens afgrøde (græs) brugt
|
||||
function ADChain.unionFruits(usedFruits, fieldDemand, fieldProducts)
|
||||
local result = {}
|
||||
for fruit in pairs(usedFruits or {}) do result[fruit] = true end
|
||||
for fruit in pairs(fieldDemand or {}) do result[fruit] = true end
|
||||
for key in pairs(fieldDemand or {}) do
|
||||
local spec = (fieldProducts or {})[key]
|
||||
result[spec ~= nil and spec.fruit or key] = true
|
||||
end
|
||||
return result
|
||||
end
|
||||
|
||||
@@ -303,17 +308,17 @@ end
|
||||
|
||||
local function plan(data, state)
|
||||
local recipes = ADChain.modelRecipes(data.recipes, state.paused, state.userOff, state.optIn)
|
||||
local chain = ADChainModel.build(recipes, data.husbandry, data.crops, data.fieldGoods)
|
||||
local chain = ADChainModel.build(recipes, data.husbandry, data.crops, data.fieldGoods, data.fieldGoodCrops)
|
||||
-- pausede rødder: det de bruger, er beskyttet mod slukning (modellen regnet som om de ikke var pauset)
|
||||
local protected = {}
|
||||
if next(state.paused) ~= nil then
|
||||
protected = ADChainModel.build(ADChain.modelRecipes(data.recipes, {}, state.userOff, state.optIn), data.husbandry, data.crops, data.fieldGoods).needRecipes
|
||||
protected = ADChainModel.build(ADChain.modelRecipes(data.recipes, {}, state.userOff, state.optIn), data.husbandry, data.crops, data.fieldGoods, data.fieldGoodCrops).needRecipes
|
||||
end
|
||||
local used = ADChain.unionFruits(data.usedFruits, chain.fieldDemand)
|
||||
local used = ADChain.unionFruits(data.usedFruits, chain.fieldDemand, chain.fieldProducts)
|
||||
-- ufuldstændig markliste: udbuddet ville være undervurderet -> ingen mangler, forslag eller markskift endnu
|
||||
local shortages, actions = {}, {}
|
||||
if not data.fieldsIncomplete then
|
||||
shortages = ADCropPlan.shortages(chain.fieldDemand, data.stock, data.fields, data.yields)
|
||||
shortages = ADCropPlan.shortages(chain.fieldDemand, data.stock, data.fields, data.yields, chain.fieldProducts)
|
||||
state.dismissed = ADChain.pruneDismissed(state.dismissed, shortages)
|
||||
actions = ADCropPlan.choose(shortages, data.fields, used, data.yields, data.priceOf or data.prices, ADChain.dismissedFruits(state.dismissed), data.harvesting)
|
||||
end
|
||||
@@ -482,7 +487,7 @@ function ADChain.approve(fieldId)
|
||||
local plan = ADFieldJobs.getField(fieldId).plan or {}
|
||||
if plan.targetSource == "user" then error("spilleren har selv valgt afgrøde") end
|
||||
end
|
||||
ADFieldJobs.setTarget(fieldId, action.to, "chain")
|
||||
ADFieldJobs.setTarget(fieldId, action.to, "chain", action.product)
|
||||
end)
|
||||
if not ok then
|
||||
Logging.warning(ADChain.LOG_PREFIX .. "F%s: forslag kunne ikke godkendes: %s", tostring(fieldId), tostring(err))
|
||||
@@ -497,10 +502,12 @@ function ADChain.dismiss(fieldId)
|
||||
local action = suggestionFor(fieldId)
|
||||
if action == nil then return false end
|
||||
local missingHa = action.hectares or 0
|
||||
-- nøglen = handlingens grund (afgrøden, eller varen for hø/ensilage)
|
||||
local key = action.reason or action.to
|
||||
for _, shortage in ipairs(ADChain.last.shortages or {}) do
|
||||
if shortage.fruit == action.to then missingHa = shortage.missingHa end
|
||||
if (shortage.key or shortage.fruit) == key then missingHa = shortage.missingHa end
|
||||
end
|
||||
ADChain.state.dismissed[fieldId] = {fruit = action.to, missingHa = missingHa}
|
||||
ADChain.state.dismissed[fieldId] = {fruit = key, missingHa = missingHa}
|
||||
Logging.info(ADChain.LOG_PREFIX .. "F%s: forslag %s afvist", tostring(fieldId), tostring(action.to))
|
||||
return true
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user