From dc26aece93f65aa97f8166fc37e15ac7c8848caa Mon Sep 17 00:00:00 2001 From: Gabriel Moreira Minossi Date: Fri, 1 Jan 2021 19:13:38 -0300 Subject: [PATCH] Adding getStatusUsecase --- .../domain/multiblock/get-status-usecase.lua | 12 ++++++++++++ Programs/monitor-system/init.lua | 13 +++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/Programs/monitor-system/domain/multiblock/get-status-usecase.lua b/Programs/monitor-system/domain/multiblock/get-status-usecase.lua index e69de29..c4e115a 100755 --- a/Programs/monitor-system/domain/multiblock/get-status-usecase.lua +++ b/Programs/monitor-system/domain/multiblock/get-status-usecase.lua @@ -0,0 +1,12 @@ +local function exec(multiblocks) + local statuses = {} + for _, multiblock in ipairs(multiblocks) do + statuses[multiblock.name] = { + problems = multiblock:getNumberOfProblems(), + efficiencyPercentage = multiblock:getEfficiencyPercentage() + } + end + return statuses +end + +return exec diff --git a/Programs/monitor-system/init.lua b/Programs/monitor-system/init.lua index 79b24b9..64ed417 100755 --- a/Programs/monitor-system/init.lua +++ b/Programs/monitor-system/init.lua @@ -15,25 +15,34 @@ local getEnergyStatus = require("domain.energy.get-energy-status-usecase") -- local cleanroom = MultiBlock:new(multiBlockAddresses.cleanroom) +cleanroom.name = "cleanroom" local cleanroomMachines = {} for _, address in pairs(cleanroomAddresses) do table.insert(cleanroomMachines, SingleBlock:new(address)) end local EBF11 = MultiBlock:new(multiBlockAddresses.EBF11) +EBF11.name = "EBF11" local multiblocks = {cleanroom, EBF11} local energyBuffer = EnergyProvider:new(energyBufferAddress.batteryBuffer1) local energyProducers = {} +local multiblockStatuses = {} for i = 0, 100 do print(i) protectCleanroomRecipes(cleanroom, cleanroomMachines) - -- local multiblockStatuses = getMultiblockStatuses(multiblocks) + multiblockStatuses = getMultiblockStatuses(multiblocks) local energyStatus = getEnergyStatus(energyProducers, energyBuffer) os.sleep(0) i = i + 1 end -require('resources.sound.zelda-secret')() + +for multiblock, status in pairs(multiblockStatuses) do + print(multiblock .. ": \ + problems: " .. status.problems .. "\ + efficiency: " .. status.efficiencyPercentage) +end +require("resources.sound.zelda-secret")()