xevion/project-cybersyn
1
0
Fork 0
mirror of https://github.com/Xevion/project-cybersyn.git synced 2025-12-08 12:08:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

optimized

Browse Source
This commit is contained in:
Monica Moniot
2022-11-03 18:30:14 -04:00
parent dc5e6f1d52
commit ebcb906f27
8 changed files with 242 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/launch.json vendored
View File

@@ -15,6 +15,7 @@
"flib": true, "flib": true,
"cybersyn": true, "cybersyn": true,
"creative-mod": true, "creative-mod": true,
"LogisticTrainNetwork": true,
}, },
"disableExtraMods": true "disableExtraMods": true
}, },
@@ -42,6 +43,7 @@
"flib": true, "flib": true,
"cybersyn": true, "cybersyn": true,
"creative-mod": true, "creative-mod": true,
"LogisticTrainNetwork": true,
}, },
"disableExtraMods": true "disableExtraMods": true
} }

2
cybersyn/locale/en/base.cfg
View File

@@ -2,11 +2,13 @@
cybersyn-ticks-per-second=Dispatcher ticks per second cybersyn-ticks-per-second=Dispatcher ticks per second
cybersyn-request-threshold=Default requester threshold cybersyn-request-threshold=Default requester threshold
cybersyn-provide-threshold=Default provider threshold cybersyn-provide-threshold=Default provider threshold
cybersyn-network-flag=Default network flags
[mod-setting-description] [mod-setting-description]
cybersyn-ticks-per-second=How many times per second to check all stations for possible deliveries. This value will be rounded up to a divisor of 60. cybersyn-ticks-per-second=How many times per second to check all stations for possible deliveries. This value will be rounded up to a divisor of 60.
cybersyn-request-threshold=When a requester threshold signal is not recieved by a station it will default to this value. cybersyn-request-threshold=When a requester threshold signal is not recieved by a station it will default to this value.
cybersyn-provide-threshold=When a provider threshold signal is not recieved by a station it will default to this value. cybersyn-provide-threshold=When a provider threshold signal is not recieved by a station it will default to this value.
cybersyn-network-flag=Choose the default set of networks a station will service when no network signal is provided. This integer is interpretted bit-wise to give 32 possible networks to choose from.
[item-name] [item-name]
cybersyn-combinator=Cybernetic combinator cybersyn-combinator=Cybernetic combinator

324
cybersyn/scripts/central-planning.lua
View File

@@ -211,9 +211,9 @@ end
---@param p_station_id uint ---@param p_station_id uint
---@param depot Depot ---@param depot Depot
---@param primary_item_name string ---@param primary_item_name string
---@param economy Economy local function send_train_between(map_data, r_station_id, p_station_id, depot, primary_item_name)
local function send_train_between(map_data, r_station_id, p_station_id, depot, primary_item_name, economy)
--trains and stations expected to be of the same network --trains and stations expected to be of the same network
local economy = map_data.economy
local r_station = map_data.stations[r_station_id] local r_station = map_data.stations[r_station_id]
local p_station = map_data.stations[p_station_id] local p_station = map_data.stations[p_station_id]
local train = map_data.trains[depot.available_train] local train = map_data.trains[depot.available_train]
@@ -297,8 +297,8 @@ local function send_train_between(map_data, r_station_id, p_station_id, depot, p
end end
end end
r_station.last_delivery_tick = economy.total_ticks r_station.last_delivery_tick = map_data.total_ticks
p_station.last_delivery_tick = economy.total_ticks p_station.last_delivery_tick = map_data.total_ticks
r_station.deliveries_total = r_station.deliveries_total + 1 r_station.deliveries_total = r_station.deliveries_total + 1
p_station.deliveries_total = p_station.deliveries_total + 1 p_station.deliveries_total = p_station.deliveries_total + 1
@@ -310,8 +310,8 @@ local function send_train_between(map_data, r_station_id, p_station_id, depot, p
p_station.deliveries[item.name] = (p_station.deliveries[item.name] or 0) - item.count p_station.deliveries[item.name] = (p_station.deliveries[item.name] or 0) - item.count
local item_network_name = network_name..":"..item.name local item_network_name = network_name..":"..item.name
local r_stations = economy.r_stations_all[item_network_name] local r_stations = economy.all_r_stations[item_network_name]
local p_stations = economy.p_stations_all[item_network_name] local p_stations = economy.all_p_stations[item_network_name]
for i, id in ipairs(r_stations) do for i, id in ipairs(r_stations) do
if id == r_station_id then if id == r_station_id then
table.remove(r_stations, i) table.remove(r_stations, i)
@@ -337,56 +337,80 @@ local function send_train_between(map_data, r_station_id, p_station_id, depot, p
set_comb2(map_data, r_station) set_comb2(map_data, r_station)
end end
---@param map_data MapData
function tick(map_data, mod_settings)
local total_ticks = map_data.total_ticks
local stations = map_data.stations
---@type Economy
local economy = {
r_stations_all = {},
p_stations_all = {},
total_ticks = total_ticks,
}
local r_stations_all = economy.r_stations_all
local p_stations_all = economy.p_stations_all
local all_names = {}
for _, network in pairs(map_data.trains_available) do
for _, depot_id in pairs(network) do ---@param map_data MapData
local depot = map_data.depots[depot_id] local function tick_poll_depot(map_data)
local comb = depot.entity_comb local depot_id
if depot.network_name and comb.valid and (comb.status == defines.entity_status.working or comb.status == defines.entity_status.low_power) then do--get next depot id
depot.priority = 0 local tick_data = map_data.tick_data
depot.network_flag = 1 while true do
local signals = comb.get_merged_signals(defines.circuit_connector_id.combinator_input) if tick_data.network == nil then
if signals then tick_data.network_name, tick_data.network = next(map_data.trains_available)
for k, v in pairs(signals) do if tick_data.network == nil then
local item_name = v.signal.name tick_data.train_id = nil
local item_count = v.count map_data.tick_state = STATE_POLL_STATIONS
if item_name then return true
if item_name == SIGNAL_PRIORITY then
depot.priority = item_count
end
if item_name == depot.network_name then
depot.network_flag = item_count
end
end
end
end end
end
tick_data.train_id, depot_id = next(tick_data.network, tick_data.train_id)
if depot_id then
break
else else
depot.priority = 0 tick_data.network = nil
depot.network_flag = 0
end end
end end
end end
for station_id, station in pairs(stations) do local depot = map_data.depots[depot_id]
local comb = depot.entity_comb
if depot.network_name and comb.valid and (comb.status == defines.entity_status.working or comb.status == defines.entity_status.low_power) then
depot.priority = 0
depot.network_flag = 1
local signals = comb.get_merged_signals(defines.circuit_connector_id.combinator_input)
if signals then
for k, v in pairs(signals) do
local item_name = v.signal.name
local item_count = v.count
if item_name then
if item_name == SIGNAL_PRIORITY then
depot.priority = item_count
end
if item_name == depot.network_name then
depot.network_flag = item_count
end
end
end
end
else
depot.priority = 0
depot.network_flag = 0
end
return false
end
---@param map_data MapData
---@param mod_settings CybersynModSettings
local function tick_poll_station(map_data, mod_settings)
local tick_data = map_data.tick_data
local all_r_stations = map_data.economy.all_r_stations
local all_p_stations = map_data.economy.all_p_stations
local all_names = map_data.economy.all_names
while true do
local station_id, station = next(map_data.stations, tick_data.station_id)
tick_data.station_id = station_id
if station == nil then
map_data.tick_state = STATE_DISPATCH
return true
end
if station.network_name and station.deliveries_total < station.entity_stop.trains_limit then if station.network_name and station.deliveries_total < station.entity_stop.trains_limit then
station.r_threshold = mod_settings.r_threshold station.r_threshold = mod_settings.r_threshold
station.p_threshold = mod_settings.p_threshold station.p_threshold = mod_settings.p_threshold
station.priority = 0 station.priority = 0
station.locked_slots = 0 station.locked_slots = 0
station.network_flag = 1 station.network_flag = mod_settings.network_flag
local signals = get_signals(station) local signals = get_signals(station)
station.tick_signals = signals station.tick_signals = signals
if signals then if signals then
@@ -422,111 +446,153 @@ function tick(map_data, mod_settings)
if -effective_item_count >= r_threshold then if -effective_item_count >= r_threshold then
local item_network_name = station.network_name..":"..item_name local item_network_name = station.network_name..":"..item_name
if r_stations_all[item_network_name] == nil then local stations = all_r_stations[item_network_name]
r_stations_all[item_network_name] = {} if stations == nil then
p_stations_all[item_network_name] = {} stations = {}
all_r_stations[item_network_name] = stations
all_names[#all_names + 1] = item_network_name all_names[#all_names + 1] = item_network_name
all_names[#all_names + 1] = v.signal all_names[#all_names + 1] = v.signal
end end
table.insert(r_stations_all[item_network_name], station_id) stations[#stations + 1] = station_id
elseif effective_item_count >= p_threshold then elseif effective_item_count >= p_threshold then
local item_network_name = station.network_name..":"..item_name local item_network_name = station.network_name..":"..item_name
if r_stations_all[item_network_name] == nil then local stations = all_p_stations[item_network_name]
r_stations_all[item_network_name] = {} if stations == nil then
p_stations_all[item_network_name] = {} stations = {}
all_names[#all_names + 1] = item_network_name all_p_stations[item_network_name] = stations
all_names[#all_names + 1] = v.signal
end end
table.insert(p_stations_all[item_network_name], station_id) stations[#stations + 1] = station_id
end end
end end
end end
return false
end end
end end
end
---@param map_data MapData
---@param mod_settings CybersynModSettings
local function tick_dispatch(map_data, mod_settings)
--we do not dispatch more than one train per station per tick --we do not dispatch more than one train per station per tick
--psuedo-randomize what item (and what station) to check first so if trains available is low they choose orders psuedo-randomly --psuedo-randomize what item (and what station) to check first so if trains available is low they choose orders psuedo-randomly
--NOTE: It may be better for performance to update stations one tick at a time rather than all at once, however this does mean more redundant data will be generated and discarded each tick. Once we have a performance test-bed it will probably be worth checking. --NOTE: It may be better for performance to update stations one tick at a time rather than all at once, however this does mean more redundant data will be generated and discarded each tick. Once we have a performance test-bed it will probably be worth checking.
local start_i = 2*(total_ticks%(#all_names/2)) + 1 local tick_data = map_data.tick_data
for item_i = 0, #all_names - 1, 2 do local all_r_stations = map_data.economy.all_r_stations
local item_network_name = all_names[(start_i + item_i - 1)%#all_names + 1] local all_p_stations = map_data.economy.all_p_stations
local signal = all_names[(start_i + item_i)%#all_names + 1] local all_names = map_data.economy.all_names
local item_name = signal.name local stations = map_data.stations
local item_type = signal.type
local r_stations = r_stations_all[item_network_name]
local p_stations = p_stations_all[item_network_name]
--NOTE: this is an approximation algorithm for solving the assignment problem (bipartite graph weighted matching), the true solution would be to implement the simplex algorithm but I strongly believe most factorio players would prefer run-time efficiency over perfect train routing logic local size = #all_names
if #r_stations > 0 and #p_stations > 0 then if tick_data.start_i == nil and size > 0 then
if #r_stations <= #p_stations then --semi-randomized starting item
--probably backpressure, prioritize locality tick_data.start_i = 2*(map_data.total_ticks%(size/2)) + 1
repeat tick_data.offset_i = 0
local i = total_ticks%#r_stations + 1 elseif size == 0 or tick_data.offset_i >= size then
local r_station_id = table.remove(r_stations, i) tick_data.start_i = nil
tick_data.offset_i = nil
map_data.tick_state = STATE_INIT
return true
end
local name_i = tick_data.start_i + tick_data.offset_i
tick_data.offset_i = tick_data.offset_i + 2
local best = 0 local item_network_name = all_names[(name_i - 1)%size + 1]
local best_depot = nil local signal = all_names[(name_i)%size + 1]
local best_dist = INF local item_name = signal.name
local highest_prior = -INF local item_type = signal.type
local could_have_been_serviced = false local r_stations = all_r_stations[item_network_name]
for j, p_station_id in ipairs(p_stations) do local p_stations = all_p_stations[item_network_name]
--NOTE: this is an approximation algorithm for solving the assignment problem (bipartite graph weighted matching), the true solution would be to implement the simplex algorithm but I strongly believe most factorio players would prefer run-time efficiency over perfect train routing logic
if p_stations and #r_stations > 0 and #p_stations > 0 then
if #r_stations <= #p_stations then
--probably backpressure, prioritize locality
repeat
local i = map_data.total_ticks%#r_stations + 1
local r_station_id = table.remove(r_stations, i)
local best = 0
local best_depot = nil
local best_dist = INF
local highest_prior = -INF
local could_have_been_serviced = false
for j, p_station_id in ipairs(p_stations) do
local depot, d = get_valid_train(map_data, r_station_id, p_station_id, item_type)
local prior = stations[p_station_id].priority
if prior > highest_prior or (prior == highest_prior and d < best_dist) then
if depot then
best = j
best_dist = d
best_depot = depot
highest_prior = prior
elseif d < INF then
could_have_been_serviced = true
best = j
end
end
end
if best_depot then
send_train_between(map_data, r_station_id, p_stations[best], best_depot, item_name)
elseif could_have_been_serviced then
send_missing_train_alert_for_stops(stations[r_station_id].entity_stop, stations[p_stations[best]].entity_stop)
end
until #r_stations == 0
else
--prioritize round robin
repeat
local j = map_data.total_ticks%#p_stations + 1
local p_station_id = table.remove(p_stations, j)
local best = 0
local best_depot = nil
local lowest_tick = INF
local highest_prior = -INF
local could_have_been_serviced = false
for i, r_station_id in ipairs(r_stations) do
local r_station = stations[r_station_id]
local prior = r_station.priority
if prior > highest_prior or (prior == highest_prior and r_station.last_delivery_tick < lowest_tick) then
local depot, d = get_valid_train(map_data, r_station_id, p_station_id, item_type) local depot, d = get_valid_train(map_data, r_station_id, p_station_id, item_type)
local prior = stations[p_station_id].priority if depot then
if prior > highest_prior or (prior == highest_prior and d < best_dist) then best = i
if depot then best_depot = depot
best = j lowest_tick = r_station.last_delivery_tick
best_dist = d highest_prior = prior
best_depot = depot elseif d < INF then
highest_prior = prior could_have_been_serviced = true
elseif d < INF then best = i
could_have_been_serviced = true
best = j
end
end end
end end
if best_depot then end
send_train_between(map_data, r_station_id, p_stations[best], best_depot, item_name, economy) if best_depot then
elseif could_have_been_serviced then send_train_between(map_data, r_stations[best], p_station_id, best_depot, item_name)
send_missing_train_alert_for_stops(stations[r_station_id].entity_stop, stations[p_stations[best]].entity_stop) elseif could_have_been_serviced then
end send_missing_train_alert_for_stops(stations[r_stations[best]].entity_stop, stations[p_station_id].entity_stop)
until #r_stations == 0 end
else until #p_stations == 0
--prioritize round robin
repeat
local j = total_ticks%#p_stations + 1
local p_station_id = table.remove(p_stations, j)
local best = 0
local best_depot = nil
local lowest_tick = INF
local highest_prior = -INF
local could_have_been_serviced = false
for i, r_station_id in ipairs(r_stations) do
local r_station = stations[r_station_id]
local prior = r_station.priority
if prior > highest_prior or (prior == highest_prior and r_station.last_delivery_tick < lowest_tick) then
local depot, d = get_valid_train(map_data, r_station_id, p_station_id, item_type)
if depot then
best = i
best_depot = depot
lowest_tick = r_station.last_delivery_tick
highest_prior = prior
elseif d < INF then
could_have_been_serviced = true
best = i
end
end
end
if best_depot then
send_train_between(map_data, r_stations[best], p_station_id, best_depot, item_name, economy)
elseif could_have_been_serviced then
send_missing_train_alert_for_stops(stations[r_stations[best]].entity_stop, stations[p_station_id].entity_stop)
end
until #p_stations == 0
end
end end
end end
for station_id, station in pairs(stations) do return false
station.tick_signals = nil end
---@param map_data MapData
---@param mod_settings CybersynModSettings
function tick(map_data, mod_settings)
if map_data.tick_state == STATE_INIT then
map_data.total_ticks = map_data.total_ticks + 1
map_data.economy.all_p_stations = {}
map_data.economy.all_r_stations = {}
map_data.economy.all_names = {}
map_data.tick_state = STATE_POLL_DEPOTS
end
if map_data.tick_state == STATE_POLL_DEPOTS then
for i = 1, 3 do
if tick_poll_depot(map_data) then break end
end
elseif map_data.tick_state == STATE_POLL_STATIONS then
for i = 1, 2 do
if tick_poll_station(map_data, mod_settings) then break end
end
elseif map_data.tick_state == STATE_DISPATCH then
tick_dispatch(map_data, mod_settings)
end end
end end

5
cybersyn/scripts/constants.lua
View File

@@ -41,3 +41,8 @@ STATION_LAYOUT_NOT_FLUID = "[NC]"
STATION_LAYOUT_NOT_CARGO = "[NF]" STATION_LAYOUT_NOT_CARGO = "[NF]"
LONGEST_INSERTER_REACH = 2 LONGEST_INSERTER_REACH = 2
STATE_INIT = 0
STATE_POLL_DEPOTS = 1
STATE_POLL_STATIONS = 2
STATE_DISPATCH = 3

31
cybersyn/scripts/global.lua
View File

@@ -11,7 +11,9 @@
---@field public trains_available {[string]: {[uint]: uint}} --{[network_name]: {[train_id]: depot_id}} ---@field public trains_available {[string]: {[uint]: uint}} --{[network_name]: {[train_id]: depot_id}}
---@field public layouts {[uint]: string} ---@field public layouts {[uint]: string}
---@field public layout_train_count {[uint]: int} ---@field public layout_train_count {[uint]: int}
---@field public train_classes {[string]: TrainClass} ---@field public tick_state uint
---@field public tick_data {}
---@field public economy Economy
---@class Station ---@class Station
---@field public deliveries_total int ---@field public deliveries_total int
@@ -57,17 +59,33 @@
---@alias cybersyn.global MapData ---@alias cybersyn.global MapData
---@class Economy ---@class Economy
---@field public r_stations_all {[string]: uint[]} ---@field public all_r_stations {[string]: uint[]} --{[network_name:item_name]: count}
---@field public p_stations_all {[string]: uint[]} ---@field public all_p_stations {[string]: uint[]} --{[network_name:item_name]: count}
---@field public total_ticks uint ---@field public all_names {[string]: uint[]} --{[network_name:item_name]: count}
--TODO: only init once ---@class CybersynModSettings
---@field public tps int
---@field public r_threshold int
---@field public p_threshold int
---@field public network_flag int
--TODO: only init once and move settings code
---@type CybersynModSettings
mod_settings = {} mod_settings = {}
mod_settings.tps = settings.global["cybersyn-ticks-per-second"].value mod_settings.tps = settings.global["cybersyn-ticks-per-second"].value
mod_settings.r_threshold = settings.global["cybersyn-request-threshold"].value mod_settings.r_threshold = settings.global["cybersyn-request-threshold"].value
mod_settings.p_threshold = settings.global["cybersyn-provide-threshold"].value mod_settings.p_threshold = settings.global["cybersyn-provide-threshold"].value
mod_settings.network_flag = settings.global["cybersyn-network-flag"].value
global.total_ticks = 0 global.total_ticks = 0
global.tick_state = STATE_INIT
global.tick_data = {}
global.economy = {
all_r_stations = {},
all_p_stations = {},
all_names = {},
}
global.to_comb = {} global.to_comb = {}
global.to_output = {} global.to_output = {}
global.to_stop = {} global.to_stop = {}
@@ -78,6 +96,3 @@ global.trains_available = {}
global.layouts = {} global.layouts = {}
global.layout_train_count = {} global.layout_train_count = {}
global.layout_top_id = 1 global.layout_top_id = 1
global.train_classes = {
--[TRAIN_CLASS_ALL.name] = {},
}

2
cybersyn/scripts/layout.lua
View File

@@ -32,7 +32,6 @@ function remove_train(map_data, train, train_id)
for station_id, station in pairs(map_data.stations) do for station_id, station in pairs(map_data.stations) do
station.accepted_layouts[layout_id] = nil station.accepted_layouts[layout_id] = nil
end end
--map_data.train_classes[TRAIN_CLASS_ALL][layout_id] = nil
else else
map_data.layout_train_count[layout_id] = count - 1 map_data.layout_train_count[layout_id] = count - 1
end end
@@ -81,7 +80,6 @@ function update_train_layout(map_data, train)
station.accepted_layouts[layout_id] = true station.accepted_layouts[layout_id] = true
end end
end end
--map_data.train_classes[TRAIN_CLASS_ALL][layout_id] = true
else else
map_data.layout_train_count[layout_id] = map_data.layout_train_count[layout_id] + 1 map_data.layout_train_count[layout_id] = map_data.layout_train_count[layout_id] + 1
end end

13
cybersyn/scripts/main.lua
View File

@@ -325,7 +325,7 @@ local function on_combinator_broken(map_data, comb)
end end
else else
local depot = map_data.depots[stop.unit_number] local depot = map_data.depots[stop.unit_number]
if depot.entity_comb == comb then if depot and depot.entity_comb == comb then
--NOTE: this will disrupt deliveries in progress that where dispatched from this station in a minor way --NOTE: this will disrupt deliveries in progress that where dispatched from this station in a minor way
local depot_comb = search_for_station_combinator(map_data, stop, OPERATION_DEPOT, comb) local depot_comb = search_for_station_combinator(map_data, stop, OPERATION_DEPOT, comb)
if depot_comb then if depot_comb then
@@ -538,7 +538,7 @@ local function on_train_arrives_buffer(map_data, stop, train)
local station = map_data.stations[station_id] local station = map_data.stations[station_id]
local signals = {} local signals = {}
for i, item in ipairs(train.manifest) do for i, item in ipairs(train.manifest) do
signals[i] = {index = i, signal = {type = item.type, name = item.name}, count = -1} signals[i] = {index = i, signal = {type = item.type, name = item.name}, count = -item.count}
end end
set_combinator_output(map_data, station.entity_comb1, signals) set_combinator_output(map_data, station.entity_comb1, signals)
set_r_wagon_combs(map_data, station, train) set_r_wagon_combs(map_data, station, train)
@@ -605,11 +605,6 @@ local function on_train_modified(map_data, pre_train_id, train_entity)
end end
local function on_tick(event)
tick(global, mod_settings)
global.total_ticks = global.total_ticks + 1
end
local function on_built(event) local function on_built(event)
local entity = event.entity or event.created_entity or event.destination local entity = event.entity or event.created_entity or event.destination
if not entity or not entity.valid then return end if not entity or not entity.valid then return end
@@ -740,7 +735,9 @@ local function register_events()
flib_event.register(defines.events.on_entity_settings_pasted, on_paste) flib_event.register(defines.events.on_entity_settings_pasted, on_paste)
local nth_tick = math.ceil(60/mod_settings.tps); local nth_tick = math.ceil(60/mod_settings.tps);
flib_event.on_nth_tick(nth_tick, on_tick) flib_event.on_nth_tick(nth_tick, function(event)
tick(global, mod_settings)
end)
flib_event.register(defines.events.on_train_created, on_train_built) flib_event.register(defines.events.on_train_created, on_train_built)
flib_event.register(defines.events.on_train_changed_state, on_train_changed) flib_event.register(defines.events.on_train_changed_state, on_train_changed)

11
cybersyn/settings.lua
View File

@@ -5,7 +5,7 @@ data:extend({
name = "cybersyn-ticks-per-second", name = "cybersyn-ticks-per-second",
order = "aa", order = "aa",
setting_type = "runtime-global", setting_type = "runtime-global",
default_value = 10, default_value = 30,
minimum_value = 1, minimum_value = 1,
maximum_value = 60, maximum_value = 60,
}, },
@@ -27,4 +27,13 @@ data:extend({
minimum_value = 1, minimum_value = 1,
maximum_value = 2147483647, maximum_value = 2147483647,
}, },
{
type = "int-setting",
name = "cybersyn-network-flag",
order = "ad",
setting_type = "runtime-global",
default_value = 1,
minimum_value = -1,
maximum_value = 2147483647,
},
}) })