perf: markørindeks i bygningslisten, cachet kildesøgning og kursus-bibliotek — 1.62.417

This commit is contained in:
2026-10-27 19:35:54 +01:00
parent 8efef4ab58
commit 2e3f781b14
8 changed files with 439 additions and 99 deletions
+20 -2
View File
@@ -79,6 +79,9 @@ function ADCourseCache.without(records, vehicleId)
return result
end
-- Spilleren har lavet et nyt kursus på maskinen (i CP's HUD): så hentes heller intet fra biblioteket
ADCourseCache.STALE_REASON = "kurset på maskinen er ændret"
-- Kursus der kan genbruges: egen maskines først ("own"), ellers en anden maskines ("copy", laveste id først).
-- isValid(record) (valgfri) tjekker at kurset stadig sidder på maskinen. Intet: nil + grunden.
function ADCourseCache.findReusable(records, request, vehicleId, isValid)
@@ -103,7 +106,7 @@ function ADCourseCache.findReusable(records, request, vehicleId, isValid)
for _, id in ipairs(ids) do
if usable(records[id]) then return records[id], "copy" end
end
if anyStale then return nil, "kurset på maskinen er ændret" end
if anyStale then return nil, ADCourseCache.STALE_REASON end
return nil, ADCourseCache.mismatchReason(own, request)
end
@@ -206,7 +209,15 @@ local function prepareUnsafe(adEnv, field, info, assignment, opts)
result.course = source.course
log(field.id, "kursus kopieret fra '%s' til '%s' — ingen ny beregning", ADRuns.vehicleLabel(source.vehicle), ADRuns.vehicleLabel(vehicle))
else
log(field.id, "nyt kursus beregnes til '%s' (%s)", ADRuns.vehicleLabel(vehicle), tostring(how))
-- biblioteket husker kurser som maskinerne har fået skiftet ud (adCourseLibrary.lua)
local saved = how ~= ADCourseCache.STALE_REASON and ADCourseLibrary ~= nil and ADCourseLibrary.get(ADCourseCache.key(request)) or nil
if saved ~= nil then
result.course = saved
log(field.id, "kursus hentet fra biblioteket til '%s' — ingen ny beregning", ADRuns.vehicleLabel(vehicle))
how = "library"
else
log(field.id, "nyt kursus beregnes til '%s' (%s)", ADRuns.vehicleLabel(vehicle), tostring(how))
end
end
return result, {request = request, how = how}
end
@@ -232,6 +243,11 @@ function ADCourseCache.afterStart(vehicle, vehicleId, context)
local r = context.request
local record = ADCourseCache.newRecord({vehicle = vehicleId, field = r.field, width = r.width, sig = r.sig,
settings = r.settings, waypoints = waypointCount(course)})
-- biblioteket: nyberegnede kurser afløser det gemte; kun kurser med forager (som genbrugsreglen i ADCpBridge)
local fresh = context.how ~= "own" and context.how ~= "copy" and context.how ~= "library"
if ADCourseLibrary ~= nil and (ADCpBridge.courseHasHeadlands == nil or ADCpBridge.courseHasHeadlands(course)) then
ADCourseLibrary.put(ADCourseCache.key(r), course, fresh)
end
local existing = records[record.vehicle]
if existing ~= nil and ADCourseCache.matches(existing, r) and existing.waypoints == record.waypoints then return end
setRecords(ADCourseCache.withRecord(records, record))
@@ -243,6 +259,7 @@ end
function ADCourseCache.checkField(fieldId, sig)
local records = getRecords()
local kept, removed = ADCourseCache.invalidateField(records, fieldId, sig)
if sig ~= nil and ADCourseLibrary ~= nil then removed = removed + ADCourseLibrary.forget(fieldId, sig) end
if removed > 0 then
setRecords(kept)
log(fieldId, "markens form er ændret — %d gemt(e) kursus(er) glemt, næste start beregner nyt", removed)
@@ -254,6 +271,7 @@ end
function ADCourseCache:consoleForget(arg)
local fieldId = tonumber((tostring(arg or ""):gsub("^[Ff]", "")))
local kept, removed = ADCourseCache.forget(getRecords(), fieldId)
if ADCourseLibrary ~= nil then removed = removed + ADCourseLibrary.forget(fieldId) end
setRecords(kept)
local text = string.format("ADSmartPickup: %d gemt(e) kursus(er) glemt (%s) — næste start beregner nyt", removed,
fieldId ~= nil and ("F" .. tostring(fieldId)) or "alle marker")