diff options
| author | Dante Niewenhuis <d.niewenhuis@hotmail.com> | 2024-04-22 14:32:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-22 14:32:53 +0200 |
| commit | 7ffa97502d2725c1fe0a84677a654a5ea12cb454 (patch) | |
| tree | 7f08b88a8e5bd1d39585b9cfcb530bd43f1a4733 /opendc-experiments/opendc-experiments-base | |
| parent | d4c1d8468a17eb7adf8bf20949c2fdc4b2f93fec (diff) | |
Updated the power models and added tests (#222)
* Updated the power models and added tests
* Updated test topologies
Diffstat (limited to 'opendc-experiments/opendc-experiments-base')
3 files changed, 4 insertions, 28 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 2966c934..0ab305ee 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(1.9469839319124512E7, monitor.powerDraw, 1E4) { "Incorrect power draw" } }, - { assertEquals(5.840705003360067E9, monitor.energyUsage, 1E5) { "Incorrect energy usage" } }, + { assertEquals(2.0774585843587227E7, monitor.powerDraw, 1E4) { "Incorrect power draw" } }, + { assertEquals(6.232122296636381E9, monitor.energyUsage, 1E4) { "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(2337040.5458753705, monitor.powerDraw, 1E4) { "Incorrect power draw" } }, - { assertEquals(7.010994945790212E8, monitor.energyUsage, 1E4) { "Incorrect energy usage" } }, + { assertEquals(2539987.394500494, monitor.powerDraw, 1E4) { "Incorrect power draw" } }, + { assertEquals(7.619825262052509E8, 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 b87877af..d23dbfe3 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,12 +16,6 @@ ], "memory": { "memorySize": 256000 - }, - "powerModel": { - "modelType": "linear", - "power": 350.0, - "maxPower": 350.0, - "idlePower": 200.0 } } ] @@ -42,12 +36,6 @@ ], "memory": { "memorySize": 64000 - }, - "powerModel": { - "modelType": "linear", - "power": 350.0, - "maxPower": 350.0, - "idlePower": 200.0 } } ] @@ -68,12 +56,6 @@ ], "memory": { "memorySize": 128000 - }, - "powerModel": { - "modelType": "linear", - "power": 350.0, - "maxPower": 350.0, - "idlePower": 200.0 } } ] 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 9862f71a..2d68b234 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,12 +16,6 @@ ], "memory": { "memorySize": 128000 - }, - "powerModel": { - "modelType": "linear", - "power": 350.0, - "maxPower": 350.0, - "idlePower": 200.0 } } ] |