diff options
| author | Dante Niewenhuis <d.niewenhuis@hotmail.com> | 2024-11-29 13:54:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-29 13:54:31 +0100 |
| commit | a49a3878758438fe8d04bf4c4d3e3ffc5873aace (patch) | |
| tree | d89f2fcc058a9b23b798c29402f8b8fd69beca41 /opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments | |
| parent | 124b40ce36fa03c5275e12ff5a020fc40fe5fd5a (diff) | |
Multiplexer update (#278)
* Fixed the Multiplexer.java to properly divide the supply over the different consumers.
Fixed a bug where fragments were being loaded in reversed order.
* Optimized the Multiplexer.java, by only updating the supply of the consumer that updated its demand when possible.
Diffstat (limited to 'opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments')
| -rw-r--r-- | opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ScenarioIntegrationTest.kt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ScenarioIntegrationTest.kt b/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ScenarioIntegrationTest.kt index 9ce25c99..10478174 100644 --- a/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ScenarioIntegrationTest.kt +++ b/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ScenarioIntegrationTest.kt @@ -253,9 +253,9 @@ class ScenarioIntegrationTest { assertAll( { assertEquals(0, monitor.tasksTerminated) { "Idle time incorrect" } }, { assertEquals(1, monitor.tasksCompleted) { "Idle time incorrect" } }, - { assertEquals(4297000, monitor.idleTime) { "Idle time incorrect" } }, - { assertEquals(5003000, monitor.activeTime) { "Active time incorrect" } }, - { assertEquals(0, monitor.stealTime) { "Steal time incorrect" } }, + { assertEquals(4296000, monitor.idleTime) { "Idle time incorrect" } }, + { assertEquals(5004000, monitor.activeTime) { "Active time incorrect" } }, + { assertEquals(14824, monitor.stealTime) { "Steal time incorrect" } }, { assertEquals(0, monitor.lostTime) { "Lost time incorrect" } }, { assertEquals(2860800.0, monitor.energyUsage, 1E4) { "Incorrect energy usage" } }, ) @@ -294,8 +294,8 @@ class ScenarioIntegrationTest { // Note that these values have been verified beforehand assertAll( - { assertEquals(1803918431, monitor.idleTime) { "Idle time incorrect" } }, - { assertEquals(787181569, monitor.activeTime) { "Active time incorrect" } }, + { assertEquals(1803918432, monitor.idleTime) { "Idle time incorrect" } }, + { assertEquals(787181568, monitor.activeTime) { "Active time incorrect" } }, { assertEquals(0, monitor.stealTime) { "Steal time incorrect" } }, { assertEquals(0, monitor.lostTime) { "Lost time incorrect" } }, { assertEquals(6.7565629E8, monitor.energyUsage, 1E4) { "Incorrect energy usage" } }, @@ -341,8 +341,8 @@ class ScenarioIntegrationTest { { assertEquals(0, monitor.tasksActive, "All VMs should finish after a run") }, { assertEquals(0, monitor.attemptsFailure, "No VM should be unscheduled") }, { assertEquals(0, monitor.tasksPending, "No VM should not be in the queue") }, - { assertEquals(43101787498, monitor.idleTime) { "Incorrect idle time" } }, - { assertEquals(3489412502, monitor.activeTime) { "Incorrect active time" } }, + { assertEquals(43101787496, monitor.idleTime) { "Incorrect idle time" } }, + { assertEquals(3489412504, monitor.activeTime) { "Incorrect active time" } }, { assertEquals(0, monitor.stealTime) { "Incorrect steal time" } }, { assertEquals(0, monitor.lostTime) { "Incorrect lost time" } }, { assertEquals(1.0016123392181786E10, monitor.energyUsage, 1E4) { "Incorrect energy usage" } }, |