summaryrefslogtreecommitdiff
path: root/opendc/opendc-core
diff options
context:
space:
mode:
authorFabian Mastenbroek <mail.fabianm@gmail.com>2020-03-11 20:02:27 +0100
committerFabian Mastenbroek <mail.fabianm@gmail.com>2020-03-11 20:02:27 +0100
commit7665c089ac44166f284d5757087ea1e7b3bc0a2d (patch)
tree7c1bbb69ea19014d3bf3848ce143cfdbd2289ca2 /opendc/opendc-core
parent0655127dcd945289f045d8e04304e6a050e2a2f9 (diff)
parentd1d9e059cb83c1d8cf01e704136d0af2b6564e5b (diff)
Merge branch '2.x-sc20-setup' into '2.x'
Pass all relevant SC20 parameters as arguments See merge request opendc/opendc-simulator!39
Diffstat (limited to 'opendc/opendc-core')
-rw-r--r--opendc/opendc-core/src/main/kotlin/com/atlarge/opendc/core/workload/PerformanceInterferenceModel.kt2
1 files changed, 1 insertions, 1 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 5e0928b7..bc9b0b06 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
@@ -17,7 +17,7 @@ data class PerformanceInterferenceModel(
val items: Set<PerformanceInterferenceModelItem>
) {
fun apply(colocatedWorkloads: Set<Resource>): Double {
- val colocatedWorkloadIds = colocatedWorkloads.map { it.uid }
+ val colocatedWorkloadIds = colocatedWorkloads.map { it.name }
val intersectingItems = items.filter { item ->
colocatedWorkloadIds.intersect(item.workloadIds).size > 1
}