Fix sampling issue

1 files changed, 9 insertions, 4 deletions

diff --git a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/trace/WorkloadSampler.kt b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/trace/WorkloadSampler.kt
index 589854b6..dd70d4f1 100644
--- a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/trace/WorkloadSampler.kt
+++ b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/trace/WorkloadSampler.kt
@@ -43,17 +43,22 @@ fun sampleWorkload(
     seed: Int
 ): List<TraceEntry<VmWorkload>> {
     return if (workload is CompositeWorkload) {
-        sampleRegularWorkload(trace, subWorkload, seed)
+        sampleRegularWorkload(trace, workload, subWorkload, seed)
     } else {
-        sampleRegularWorkload(trace, workload, seed)
+        sampleRegularWorkload(trace, workload, workload, seed)
     }
 }
 
 /**
  * Sample a regular (non-HPC) workload.
  */
-fun sampleRegularWorkload(trace: List<TraceEntry<VmWorkload>>, workload: Workload, seed: Int): List<TraceEntry<VmWorkload>> {
-    val fraction = workload.fraction
+fun sampleRegularWorkload(
+    trace: List<TraceEntry<VmWorkload>>,
+    workload: Workload,
+    subWorkload: Workload,
+    seed: Int
+): List<TraceEntry<VmWorkload>> {
+    val fraction = subWorkload.fraction
 
     val shuffled = trace.shuffled(Random(seed))
     val res = mutableListOf<TraceEntry<VmWorkload>>()