diff options
Diffstat (limited to 'opendc-experiments/opendc-experiments-base/src/test')
3 files changed, 28 insertions, 6 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 d67ed727..2966c934 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 @@ -125,8 +125,8 @@ class ScenarioIntegrationTest { { assertEquals(66977091124, monitor.activeTime) { "Incorrect active time" } }, { assertEquals(3160267873, monitor.stealTime) { "Incorrect steal time" } }, { assertEquals(0, monitor.lostTime) { "Incorrect lost time" } }, - { assertEquals(2.5892214E7, monitor.powerDraw, 1E4) { "Incorrect power draw" } }, - { assertEquals(7.7672373E9, monitor.energyUsage, 1E4) { "Incorrect energy usage" } }, + { assertEquals(1.9469839319124512E7, monitor.powerDraw, 1E4) { "Incorrect power draw" } }, + { assertEquals(5.840705003360067E9, monitor.energyUsage, 1E5) { "Incorrect energy usage" } }, ) } @@ -167,8 +167,8 @@ class ScenarioIntegrationTest { { assertEquals(9741285381, monitor.activeTime) { "Active time incorrect" } }, { assertEquals(152, monitor.stealTime) { "Steal time incorrect" } }, { assertEquals(0, monitor.lostTime) { "Lost time incorrect" } }, - { assertEquals(2644612.0, monitor.powerDraw, 1E4) { "Incorrect power draw" } }, - { assertEquals(7.9336867E8, monitor.energyUsage, 1E4) { "Incorrect energy usage" } }, + { assertEquals(2337040.5458753705, monitor.powerDraw, 1E4) { "Incorrect power draw" } }, + { assertEquals(7.010994945790212E8, monitor.energyUsage, 1E4) { "Incorrect energy usage" } }, ) } diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/env/multi.json b/opendc-experiments/opendc-experiments-base/src/test/resources/env/multi.json index 721005b0..b87877af 100644 --- a/opendc-experiments/opendc-experiments-base/src/test/resources/env/multi.json +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/env/multi.json @@ -16,6 +16,12 @@ ], "memory": { "memorySize": 256000 + }, + "powerModel": { + "modelType": "linear", + "power": 350.0, + "maxPower": 350.0, + "idlePower": 200.0 } } ] @@ -36,6 +42,12 @@ ], "memory": { "memorySize": 64000 + }, + "powerModel": { + "modelType": "linear", + "power": 350.0, + "maxPower": 350.0, + "idlePower": 200.0 } } ] @@ -56,6 +68,12 @@ ], "memory": { "memorySize": 128000 + }, + "powerModel": { + "modelType": "linear", + "power": 350.0, + "maxPower": 350.0, + "idlePower": 200.0 } } ] @@ -63,4 +81,3 @@ ] } - diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/env/single.json b/opendc-experiments/opendc-experiments-base/src/test/resources/env/single.json index a1c8d95a..9862f71a 100644 --- a/opendc-experiments/opendc-experiments-base/src/test/resources/env/single.json +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/env/single.json @@ -16,6 +16,12 @@ ], "memory": { "memorySize": 128000 + }, + "powerModel": { + "modelType": "linear", + "power": 350.0, + "maxPower": 350.0, + "idlePower": 200.0 } } ] @@ -23,4 +29,3 @@ ] } - |