fix: hold slippes ved stoppet/sovende flow, koblingsvagt for fremmed AD-mål, rigeligt læs til silo/fabrik (v1.62.147)
This commit is contained in:
@@ -476,10 +476,12 @@ end
|
||||
local function findBestSource(markerStations, fillTypes, farmId, loadCapacity, need)
|
||||
local prefersFullest = ADSupplyPlanner.prefersFullestSource(getFillTypeNames(fillTypes))
|
||||
local ample = ADSupplyPlanner.ampleLevel(loadCapacity)
|
||||
-- silo/fabrik som mål: kun kilder med et rigeligt læs (dyrenes trug tager alt)
|
||||
local minLevel = ADSupplyPlanner.minSourceLevel ~= nil and ADSupplyPlanner.minSourceLevel(loadCapacity, need) or nil
|
||||
local best = {[true] = {}, [false] = {}}
|
||||
for _, entry in ipairs(markerStations) do
|
||||
local level, isOwn = getStationFillLevel(entry.station, fillTypes, farmId)
|
||||
if level >= ADSmartPickup.MIN_USEFUL_LITERS and mayUseSource(entry.station, fillTypes, level, loadCapacity, need)
|
||||
if level >= math.max(ADSmartPickup.MIN_USEFUL_LITERS, minLevel or 0) and mayUseSource(entry.station, fillTypes, level, loadCapacity, need)
|
||||
and ADSupplyPlanner.isBetterSource(level, best[isOwn].level, prefersFullest, ample) then
|
||||
best[isOwn] = {level = level, marker = entry.marker, station = entry.station, isOwn = isOwn}
|
||||
end
|
||||
@@ -922,12 +924,15 @@ local function logSupplyMiss(driver, ranked, bestFood, markerStations, farmId, h
|
||||
local parts = {}
|
||||
for _, need in ipairs(ranked or {}) do
|
||||
local allowed = ADSupplyPlanner.isFoodAllowed == nil or ADSupplyPlanner.isFoodAllowed(need, bestFood)
|
||||
local withStock, protected, bestLevel = 0, 0, 0
|
||||
local withStock, protected, bestLevel, tooLittle = 0, 0, 0, 0
|
||||
local minLevel = ADSupplyPlanner.minSourceLevel ~= nil and ADSupplyPlanner.minSourceLevel(loadCapacity, need) or nil
|
||||
for _, entry in ipairs(markerStations or {}) do
|
||||
local level = getStationFillLevel(entry.station, {need.fillType}, farmId)
|
||||
if level >= ADSmartPickup.MIN_USEFUL_LITERS then
|
||||
if not mayUseSource(entry.station, {need.fillType}, level, nil, need) then
|
||||
protected = protected + 1
|
||||
elseif minLevel ~= nil and level < minLevel then
|
||||
tooLittle = tooLittle + 1
|
||||
else
|
||||
withStock = withStock + 1
|
||||
bestLevel = math.max(bestLevel, level)
|
||||
@@ -935,10 +940,11 @@ local function logSupplyMiss(driver, ranked, bestFood, markerStations, farmId, h
|
||||
end
|
||||
end
|
||||
local fillType = g_fillTypeManager ~= nil and g_fillTypeManager.getFillTypeByIndex ~= nil and g_fillTypeManager:getFillTypeByIndex(need.fillType) or nil
|
||||
table.insert(parts, string.format("%s: fri %.0f l, %s, %d kilder med lager (bedst %.0f l), %d afvist (dyrestaldens eget lager, fabriksreserve, eller triggeren giver varen ikke ud)",
|
||||
table.insert(parts, string.format("%s: fri %.0f l, %s, %d kilder med lager (bedst %.0f l), %d afvist (dyrestaldens eget lager, fabriksreserve, eller triggeren giver varen ikke ud)%s",
|
||||
fillType ~= nil and fillType.name or tostring(need.fillType), need.freeSpace or 0,
|
||||
(held or {})[need] and "HOLDT (dyrene først: siloerne dækker ikke dyrene)" or (allowed and "tilladt" or "IKKE tilladt (bedre foder findes)"),
|
||||
withStock, bestLevel, protected))
|
||||
withStock, bestLevel, protected,
|
||||
tooLittle > 0 and string.format(", %d med for lidt til et rigeligt læs (< %.0f l — silo/fabrik venter)", tooLittle, minLevel or 0) or ""))
|
||||
end
|
||||
if #parts == 0 then table.insert(parts, "målet mangler intet (eller varerne kendes ikke)") end
|
||||
Logging.info(ADSmartPickup.LOG_PREFIX .. "'%s' forsyning fandt intet: %s (%d markør-stationer) — køb: %s", tostring(ADRuns.vehicleLabel(driver)),
|
||||
|
||||
Reference in New Issue
Block a user