From 2977dd8a5f1d742193eae79364a284e68269f7b5 Mon Sep 17 00:00:00 2001
From: Hongyu <39747921+HongyuHe@users.noreply.github.com>
Date: Sat, 6 Mar 2021 19:36:46 +0100
Subject: 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.
---
 .../opendc/format/environment/sc20/Sc20ClusterEnvironmentReader.kt    | 4 ++--
 .../org/opendc/format/environment/sc20/Sc20EnvironmentReader.kt       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'simulator/opendc-format/src')

diff --git a/simulator/opendc-format/src/main/kotlin/org/opendc/format/environment/sc20/Sc20ClusterEnvironmentReader.kt b/simulator/opendc-format/src/main/kotlin/org/opendc/format/environment/sc20/Sc20ClusterEnvironmentReader.kt
index b4c71c4e..6ec8ba4a 100644
--- a/simulator/opendc-format/src/main/kotlin/org/opendc/format/environment/sc20/Sc20ClusterEnvironmentReader.kt
+++ b/simulator/opendc-format/src/main/kotlin/org/opendc/format/environment/sc20/Sc20ClusterEnvironmentReader.kt
@@ -27,7 +27,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
@@ -118,7 +118,7 @@ public class Sc20ClusterEnvironmentReader(
                                 // For now we assume a simple linear load model with an idle draw of ~200W and a maximum
                                 // power draw of 350W.
                                 // Source: https://stackoverflow.com/questions/6128960
-                                LinearLoadPowerModel(200.0, 350.0)
+                                LinearPowerModel(350.0, 200 / 350.0)
                             )
                         )
                     }
diff --git a/simulator/opendc-format/src/main/kotlin/org/opendc/format/environment/sc20/Sc20EnvironmentReader.kt b/simulator/opendc-format/src/main/kotlin/org/opendc/format/environment/sc20/Sc20EnvironmentReader.kt
index 94237cb9..a58a2524 100644
--- a/simulator/opendc-format/src/main/kotlin/org/opendc/format/environment/sc20/Sc20EnvironmentReader.kt
+++ b/simulator/opendc-format/src/main/kotlin/org/opendc/format/environment/sc20/Sc20EnvironmentReader.kt
@@ -29,7 +29,7 @@ import kotlinx.coroutines.CoroutineScope
 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
@@ -91,7 +91,7 @@ public class Sc20EnvironmentReader(input: InputStream, mapper: ObjectMapper = ja
                                 // For now we assume a simple linear load model with an idle draw of ~200W and a maximum
                                 // power draw of 350W.
                                 // Source: https://stackoverflow.com/questions/6128960
-                                LinearLoadPowerModel(200.0, 350.0)
+                                LinearPowerModel(350.0, 200 / 350.0)
                             )
                         }
                     }
-- 
cgit v1.2.3