summaryrefslogtreecommitdiff
path: root/simulator/opendc-runner-web/src/main
diff options
context:
space:
mode:
authorHongyu <39747921+HongyuHe@users.noreply.github.com>2021-03-06 19:36:46 +0100
committerGitHub <noreply@github.com>2021-03-06 19:36:46 +0100
commit2977dd8a5f1d742193eae79364a284e68269f7b5 (patch)
tree3fb378be396d728d30b2769a4610c652cfb71507 /simulator/opendc-runner-web/src/main
parentd72ac4b1df32dd5e6bd3faa4fa528dbf8a03f6f1 (diff)
sim: Implement energy models from CloudSim (#79)
This commit implements the energy models that are present in CloudSim: 1. Constant 2. Linear 3. Cubic 4. Square root 5. Interpolation based on data.
Diffstat (limited to 'simulator/opendc-runner-web/src/main')
-rw-r--r--simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/TopologyParser.kt4
1 files changed, 2 insertions, 2 deletions
diff --git a/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/TopologyParser.kt b/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/TopologyParser.kt
index 8bd1eefb..f43d0869 100644
--- a/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/TopologyParser.kt
+++ b/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/TopologyParser.kt
@@ -36,7 +36,7 @@ import org.opendc.compute.core.metal.NODE_CLUSTER
import org.opendc.compute.core.metal.service.ProvisioningService
import org.opendc.compute.core.metal.service.SimpleProvisioningService
import org.opendc.compute.simulator.SimBareMetalDriver
-import org.opendc.compute.simulator.power.LinearLoadPowerModel
+import org.opendc.compute.simulator.power.models.LinearPowerModel
import org.opendc.core.Environment
import org.opendc.core.Platform
import org.opendc.core.Zone
@@ -92,7 +92,7 @@ public class TopologyParser(private val collection: MongoCollection<Document>, p
"node-$clusterId-$position",
mapOf(NODE_CLUSTER to clusterId),
SimMachineModel(processors, memoryUnits),
- LinearLoadPowerModel(energyConsumptionW, 2 * energyConsumptionW)
+ LinearPowerModel(2 * energyConsumptionW, .5)
)
)
}