updated logging and added logging for batteries (#301)

* Updated logging

* removed DoubleThresholdBatteryPolicy.java

3 files changed, 8 insertions, 7 deletions

diff --git a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ScenarioRunner.kt b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ScenarioRunner.kt
index 56278bf2..7cbce23a 100644
--- a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ScenarioRunner.kt
+++ b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ScenarioRunner.kt
@@ -98,7 +98,7 @@ public fun runScenario(
             val startTimeLong = workload.minOf { it.submissionTime }.toEpochMilli()
             val startTime = Duration.ofMillis(startTimeLong)
 
-            val topology = clusterTopology(scenario.topologySpec.pathToFile, Random(seed))
+            val topology = clusterTopology(scenario.topologySpec.pathToFile)
             provisioner.runSteps(
                 setupComputeService(
                     serviceDomain,
@@ -131,7 +131,6 @@ public fun runScenario(
  * @param scenario The scenario being run.
  * @param seed The seed of the current run
  * @param startTime The start time of the simulation given by the workload trace.
- * @param carbonTrace The carbon trace used to determine carbon emissions.
  */
 public fun addExportModel(
     provisioner: Provisioner,
diff --git a/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/BatteryTest.kt b/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/BatteryTest.kt
index 3161a9a1..a85c84f3 100644
--- a/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/BatteryTest.kt
+++ b/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/BatteryTest.kt
@@ -271,6 +271,8 @@ class BatteryTest {
         val topology = createTopology("batteries/experiment1.json")
         val monitor = runTest(topology, workload, failureModelSpec = failureModelSpec)
 
+        println(monitor.hostEnergyUsages["H01"])
+
         assertAll(
             { assertEquals((960 * 1000) + 5000, monitor.maxTimestamp) { "Total runtime incorrect" } },
             {
diff --git a/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/TestingUtils.kt b/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/TestingUtils.kt
index df45f374..408e1496 100644
--- a/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/TestingUtils.kt
+++ b/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/TestingUtils.kt
@@ -34,10 +34,10 @@ import org.opendc.compute.simulator.scheduler.filters.VCpuFilter
 import org.opendc.compute.simulator.scheduler.weights.CoreRamWeigher
 import org.opendc.compute.simulator.service.ComputeService
 import org.opendc.compute.simulator.telemetry.ComputeMonitor
-import org.opendc.compute.simulator.telemetry.table.HostTableReader
-import org.opendc.compute.simulator.telemetry.table.PowerSourceTableReader
-import org.opendc.compute.simulator.telemetry.table.ServiceTableReader
-import org.opendc.compute.simulator.telemetry.table.TaskTableReader
+import org.opendc.compute.simulator.telemetry.table.host.HostTableReader
+import org.opendc.compute.simulator.telemetry.table.powerSource.PowerSourceTableReader
+import org.opendc.compute.simulator.telemetry.table.service.ServiceTableReader
+import org.opendc.compute.simulator.telemetry.table.task.TaskTableReader
 import org.opendc.compute.topology.clusterTopology
 import org.opendc.compute.topology.specs.ClusterSpec
 import org.opendc.compute.workload.Task
@@ -182,7 +182,7 @@ class TestComputeMonitor : ComputeMonitor {
     var hostEnergyUsages = mutableMapOf<String, ArrayList<Double>>()
 
     override fun record(reader: HostTableReader) {
-        val hostName: String = reader.host.name
+        val hostName: String = reader.hostInfo.name
 
         if (!(hostName in hostCpuDemands)) {
             hostIdleTimes[hostName] = ArrayList()