From 94783ff9d8cd81275fefd5804ac99f98e2dee3a4 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Thu, 30 Sep 2021 16:00:05 +0200
Subject: fix(simulator): Fix loss computation for UPS and PDU

This change fixes the loss computation for both the UPS and PDU
implementation that was broken due to the new pushing mechanism. We
implement a new class FlowMapper that can be used to map the flow pushed
by a `FlowSource` using a user-specified method.
---
 .../src/test/kotlin/org/opendc/simulator/power/SimPduTest.kt        | 6 ++----
 .../test/kotlin/org/opendc/simulator/power/SimPowerSourceTest.kt    | 6 +++---
 .../src/test/kotlin/org/opendc/simulator/power/SimUpsTest.kt        | 4 ++--
 3 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'opendc-simulator/opendc-simulator-power/src/test')

diff --git a/opendc-simulator/opendc-simulator-power/src/test/kotlin/org/opendc/simulator/power/SimPduTest.kt b/opendc-simulator/opendc-simulator-power/src/test/kotlin/org/opendc/simulator/power/SimPduTest.kt
index 85b9ab01..eb823eb1 100644
--- a/opendc-simulator/opendc-simulator-power/src/test/kotlin/org/opendc/simulator/power/SimPduTest.kt
+++ b/opendc-simulator/opendc-simulator-power/src/test/kotlin/org/opendc/simulator/power/SimPduTest.kt
@@ -25,7 +25,6 @@ package org.opendc.simulator.power
 import io.mockk.spyk
 import io.mockk.verify
 import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import org.opendc.simulator.core.runBlockingSimulation
@@ -79,7 +78,7 @@ internal class SimPduTest {
         source.connect(pdu)
         val consumer = spyk(FixedFlowSource(100.0, utilization = 1.0))
         val inlet = object : SimPowerInlet() {
-            override fun createConsumer(): FlowSource = consumer
+            override fun createSource(): FlowSource = consumer
         }
 
         val outlet = pdu.newOutlet()
@@ -90,7 +89,6 @@ internal class SimPduTest {
     }
 
     @Test
-    @Disabled
     fun testLoss() = runBlockingSimulation {
         val engine = FlowEngine(coroutineContext, clock)
         val source = SimPowerSource(engine, capacity = 100.0)
@@ -116,6 +114,6 @@ internal class SimPduTest {
     }
 
     class SimpleInlet : SimPowerInlet() {
-        override fun createConsumer(): FlowSource = FixedFlowSource(100.0, utilization = 0.5)
+        override fun createSource(): FlowSource = FixedFlowSource(100.0, utilization = 0.5)
     }
 }
diff --git a/opendc-simulator/opendc-simulator-power/src/test/kotlin/org/opendc/simulator/power/SimPowerSourceTest.kt b/opendc-simulator/opendc-simulator-power/src/test/kotlin/org/opendc/simulator/power/SimPowerSourceTest.kt
index 20677633..76142103 100644
--- a/opendc-simulator/opendc-simulator-power/src/test/kotlin/org/opendc/simulator/power/SimPowerSourceTest.kt
+++ b/opendc-simulator/opendc-simulator-power/src/test/kotlin/org/opendc/simulator/power/SimPowerSourceTest.kt
@@ -79,7 +79,7 @@ internal class SimPowerSourceTest {
         val source = SimPowerSource(engine, capacity = 100.0)
         val consumer = spyk(FixedFlowSource(100.0, utilization = 1.0))
         val inlet = object : SimPowerInlet() {
-            override fun createConsumer(): FlowSource = consumer
+            override fun createSource(): FlowSource = consumer
         }
 
         source.connect(inlet)
@@ -95,7 +95,7 @@ internal class SimPowerSourceTest {
         val inlet = mockk<SimPowerInlet>(relaxUnitFun = true)
         every { inlet.isConnected } returns false
         every { inlet._outlet } returns null
-        every { inlet.createConsumer() } returns FixedFlowSource(100.0, utilization = 1.0)
+        every { inlet.createSource() } returns FixedFlowSource(100.0, utilization = 1.0)
 
         source.connect(inlet)
 
@@ -131,6 +131,6 @@ internal class SimPowerSourceTest {
     }
 
     class SimpleInlet : SimPowerInlet() {
-        override fun createConsumer(): FlowSource = FixedFlowSource(100.0, utilization = 1.0)
+        override fun createSource(): FlowSource = FixedFlowSource(100.0, utilization = 1.0)
     }
 }
diff --git a/opendc-simulator/opendc-simulator-power/src/test/kotlin/org/opendc/simulator/power/SimUpsTest.kt b/opendc-simulator/opendc-simulator-power/src/test/kotlin/org/opendc/simulator/power/SimUpsTest.kt
index c6e0605a..a764a368 100644
--- a/opendc-simulator/opendc-simulator-power/src/test/kotlin/org/opendc/simulator/power/SimUpsTest.kt
+++ b/opendc-simulator/opendc-simulator-power/src/test/kotlin/org/opendc/simulator/power/SimUpsTest.kt
@@ -86,7 +86,7 @@ internal class SimUpsTest {
         source2.connect(ups.newInlet())
         val consumer = spyk(FixedFlowSource(100.0, utilization = 1.0))
         val inlet = object : SimPowerInlet() {
-            override fun createConsumer(): FlowSource = consumer
+            override fun createSource(): FlowSource = consumer
         }
 
         ups.connect(inlet)
@@ -96,6 +96,6 @@ internal class SimUpsTest {
     }
 
     class SimpleInlet : SimPowerInlet() {
-        override fun createConsumer(): FlowSource = FixedFlowSource(100.0, utilization = 0.5)
+        override fun createSource(): FlowSource = FixedFlowSource(100.0, utilization = 0.5)
     }
 }
-- 
cgit v1.2.3