Address compilation warnings

6 files changed, 11 insertions, 15 deletions

diff --git a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/Main.kt b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/Main.kt
index b7bb0c23..8916261b 100644
--- a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/Main.kt
+++ b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/Main.kt
@@ -41,7 +41,6 @@ import org.opendc.experiments.sc20.runner.internal.DefaultExperimentRunner
 import org.opendc.format.trace.sc20.Sc20PerformanceInterferenceReader
 import org.opendc.format.trace.sc20.Sc20VmPlacementReader
 import java.io.File
-import java.io.InputStream
 
 /**
  * The logger for this experiment.
@@ -74,7 +73,7 @@ public class ExperimentCli : CliktCommand(name = "sc20-experiment") {
         help = "path to the performance interference file"
     )
         .file(canBeDir = false)
-        .convert { it.inputStream() as InputStream }
+        .convert { it.inputStream() }
 
     /**
      * The path to the original VM placements file.
diff --git a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/ExperimentHelpers.kt b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/ExperimentHelpers.kt
index 37e5d176..09f44199 100644
--- a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/ExperimentHelpers.kt
+++ b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/ExperimentHelpers.kt
@@ -227,8 +227,7 @@ public suspend fun processTrace(
     reader: TraceReader<VmWorkload>,
     scheduler: SimVirtProvisioningService,
     chan: Channel<Unit>,
-    monitor: ExperimentMonitor,
-    vmPlacements: Map<String, String> = emptyMap()
+    monitor: ExperimentMonitor
 ) {
     try {
         var submitted = 0
diff --git a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/Run.kt b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/Run.kt
index 7a5b84e0..660fc882 100644
--- a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/Run.kt
+++ b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/Run.kt
@@ -131,8 +131,7 @@ public data class Run(override val parent: Scenario, val id: Int, val seed: Int)
                 trace,
                 scheduler,
                 chan,
-                monitor,
-                experiment.vmPlacements
+                monitor
             )
 
             logger.debug("SUBMIT=${scheduler.submittedVms}")
diff --git a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/monitor/ParquetExperimentMonitor.kt b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/monitor/ParquetExperimentMonitor.kt
index 6ff3b518..3eb9362c 100644
--- a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/monitor/ParquetExperimentMonitor.kt
+++ b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/monitor/ParquetExperimentMonitor.kt
@@ -57,7 +57,7 @@ public class ParquetExperimentMonitor(base: File, partition: String, bufferSize:
             startTime = time
 
             // Update timestamp of initial event
-            currentHostEvent.replaceAll { k, v -> v.copy(timestamp = startTime) }
+            currentHostEvent.replaceAll { _, v -> v.copy(timestamp = startTime) }
         }
     }
 
diff --git a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/trace/Sc20TraceConverter.kt b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/trace/Sc20TraceConverter.kt
index dd6b15d0..bb2a75ee 100644
--- a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/trace/Sc20TraceConverter.kt
+++ b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/trace/Sc20TraceConverter.kt
@@ -187,11 +187,11 @@ public class SolvinityConversion : TraceConversion("Solvinity") {
             .filterNot { it.isDirectory }
             .filter { it.extension == "csv" || it.extension == "txt" }
             .toList()
-            .forEach { vmFile ->
+            .forEach file@{ vmFile ->
                 BufferedReader(FileReader(vmFile)).use { reader ->
                     reader.lineSequence()
                         .chunked(128)
-                        .forEachIndexed { idx, lines ->
+                        .forEach { lines ->
                             for (line in lines) {
                                 // Ignore comments in the trace
                                 if (line.startsWith("#") || line.isBlank()) {
@@ -212,7 +212,7 @@ public class SolvinityConversion : TraceConversion("Solvinity") {
                                 if (timestamp < minTimestamp) {
                                     minTimestamp = timestamp
                                 }
-                                return@forEach
+                                return@file
                             }
                         }
                 }
@@ -229,13 +229,13 @@ public class SolvinityConversion : TraceConversion("Solvinity") {
             .filterNot { it.isDirectory }
             .filter { it.extension == "csv" || it.extension == "txt" }
             .toList()
-            .forEachIndexed { idx, vmFile ->
+            .forEach { vmFile ->
                 println(vmFile)
 
                 var vmId = ""
                 var maxCores = -1
                 var requiredMemory = -1L
-                var cores = -1
+                var cores: Int
                 var minTime = Long.MAX_VALUE
 
                 val flopsFragments = sequence {
@@ -353,13 +353,13 @@ public class BitbrainsConversion : TraceConversion("Bitbrains") {
             .filterNot { it.isDirectory }
             .filter { it.extension == "csv" || it.extension == "txt" }
             .toList()
-            .forEachIndexed { idx, vmFile ->
+            .forEach { vmFile ->
                 println(vmFile)
 
                 var vmId = ""
                 var maxCores = -1
                 var requiredMemory = -1L
-                var cores = -1
+                var cores: Int
                 var minTime = Long.MAX_VALUE
 
                 val flopsFragments = sequence {
diff --git a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/trace/WorkloadSampler.kt b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/trace/WorkloadSampler.kt
index fa225cb0..a8b83aef 100644
--- a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/trace/WorkloadSampler.kt
+++ b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/trace/WorkloadSampler.kt
@@ -143,7 +143,6 @@ public fun sampleHpcWorkload(
 
     if (sampleOnLoad) {
         var currentLoad = 0.0
-        var i = 0
         for (entry in hpcSequence) {
             val entryLoad = entry.workload.image.tags.getValue("total-load") as Double
             if ((currentLoad + entryLoad) / totalLoad > fraction) {