#24 coordinator/supervisor setting process groups and unit burn rate limits

supervisor/session/svsessions.lua

@@ -4,7 +4,6 @@ local util        = require("scada-common.util")
 
 local facility    = require("supervisor.session.facility")
 local svqtypes    = require("supervisor.session.svqtypes")
-local unit        = require("supervisor.session.unit")
 
 local coordinator = require("supervisor.session.coordinator")
 local plc         = require("supervisor.session.plc")
@@ -33,8 +32,7 @@ svsessions.SESSION_TYPE = SESSION_TYPE
 local self = {
     modem = nil,
     num_reactors = 0,
-    facility = facility.new(),
-    units = {},
+    facility = nil,     ---@type facility
     rtu_sessions = {},
     plc_sessions = {},
     coord_sessions = {},
@@ -199,11 +197,7 @@ end
 function svsessions.init(modem, num_reactors, cooling_conf)
     self.modem = modem
     self.num_reactors = num_reactors
-    self.units = {}
-
-    for i = 1, self.num_reactors do
-        table.insert(self.units, unit.new(i, cooling_conf[i].BOILERS, cooling_conf[i].TURBINES))
-    end
+    self.facility = facility.new(num_reactors, cooling_conf)
 end
 
 -- re-link the modem
@@ -299,7 +293,8 @@ function svsessions.establish_plc_session(local_port, remote_port, for_reactor,
         plc_s.instance = plc.new_session(self.next_plc_id, for_reactor, plc_s.in_queue, plc_s.out_queue)
         table.insert(self.plc_sessions, plc_s)
 
-        self.units[for_reactor].link_plc_session(plc_s)
+        local units = self.facility.get_units()
+        units[for_reactor].link_plc_session(plc_s)
 
         log.debug("established new PLC session to " .. remote_port .. " with ID " .. self.next_plc_id)
 
@@ -332,7 +327,7 @@ function svsessions.establish_rtu_session(local_port, remote_port, advertisement
         instance = nil  ---@type rtu_session
     }
 
-    rtu_s.instance = rtu.new_session(self.next_rtu_id, rtu_s.in_queue, rtu_s.out_queue, advertisement, self.facility, self.units)
+    rtu_s.instance = rtu.new_session(self.next_rtu_id, rtu_s.in_queue, rtu_s.out_queue, advertisement, self.facility)
     table.insert(self.rtu_sessions, rtu_s)
 
     log.debug("established new RTU session to " .. remote_port .. " with ID " .. self.next_rtu_id)
@@ -362,7 +357,7 @@ function svsessions.establish_coord_session(local_port, remote_port, version)
             instance = nil  ---@type coord_session
         }
 
-        coord_s.instance = coordinator.new_session(self.next_coord_id, coord_s.in_queue, coord_s.out_queue, self.facility, self.units)
+        coord_s.instance = coordinator.new_session(self.next_coord_id, coord_s.in_queue, coord_s.out_queue, self.facility)
         table.insert(self.coord_sessions, coord_s)
 
         log.debug("established new coordinator session to " .. remote_port .. " with ID " .. self.next_coord_id)
@@ -405,10 +400,7 @@ function svsessions.iterate_all()
     self.facility.update()
 
     -- iterate units
-    for i = 1, #self.units do
-        local u = self.units[i]    ---@type reactor_unit
-        u.update()
-    end
+    self.facility.update_units()
 end
 
 -- delete all closed sessions