summaryrefslogtreecommitdiff
path: root/opendc-experiments/opendc-experiments-base/src/test/resources
diff options
context:
space:
mode:
authorDante Niewenhuis <d.niewenhuis@hotmail.com>2024-04-22 14:32:53 +0200
committerGitHub <noreply@github.com>2024-04-22 14:32:53 +0200
commit7ffa97502d2725c1fe0a84677a654a5ea12cb454 (patch)
tree7f08b88a8e5bd1d39585b9cfcb530bd43f1a4733 /opendc-experiments/opendc-experiments-base/src/test/resources
parentd4c1d8468a17eb7adf8bf20949c2fdc4b2f93fec (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/src/test/resources')
-rw-r--r--opendc-experiments/opendc-experiments-base/src/test/resources/env/multi.json18
-rw-r--r--opendc-experiments/opendc-experiments-base/src/test/resources/env/single.json6
2 files changed, 0 insertions, 24 deletions
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
}
}
]