Merge branch '2.x-perf-interf' into '2.x'

Fix computation of VM interference set size

See merge request opendc/opendc-simulator!55

1 files changed, 3 insertions, 4 deletions

diff --git a/opendc/opendc-core/src/main/kotlin/com/atlarge/opendc/core/workload/PerformanceInterferenceModel.kt b/opendc/opendc-core/src/main/kotlin/com/atlarge/opendc/core/workload/PerformanceInterferenceModel.kt
index ea110934..1efe7588 100644
--- a/opendc/opendc-core/src/main/kotlin/com/atlarge/opendc/core/workload/PerformanceInterferenceModel.kt
+++ b/opendc/opendc-core/src/main/kotlin/com/atlarge/opendc/core/workload/PerformanceInterferenceModel.kt
@@ -31,12 +31,11 @@ data class PerformanceInterferenceModel(
         }
         val score = intersectingItems
             .filter { it.minServerLoad <= currentServerLoad }
-            .map { it.performanceScore }
-            .min()
+            .minBy { it.performanceScore }
 
         // Apply performance penalty to (on average) only one of the VMs
-        return if (score != null && Random.nextInt(items.size) == 0) {
-            score
+        return if (score != null && Random.nextInt(score.workloadNames.size) == 0) {
+            score.performanceScore
         } else {
             1.0
         }