From 48cedf7107a1992575b9d7db3f8130807db196da Mon Sep 17 00:00:00 2001
From: Georgios Andreadis <info@gandreadis.com>
Date: Tue, 19 May 2020 21:16:16 +0200
Subject: Fix issue

---
 .../src/main/kotlin/com/atlarge/opendc/experiments/sc20/Main.kt   | 8 ++------
 .../kotlin/com/atlarge/opendc/experiments/sc20/experiment/Run.kt  | 1 +
 .../opendc/experiments/sc20/trace/Sc20RawParquetTraceReader.kt    | 8 ++++++++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/Main.kt b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/Main.kt
index 21cd2eca..8d2e9ba8 100644
--- a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/Main.kt
+++ b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/Main.kt
@@ -96,12 +96,8 @@ class ExperimentCli : CliktCommand(name = "sc20-experiment") {
      */
     private val portfolios by option("--portfolio")
         .choice(
-            "hor-ver" to { experiment: Experiment, i: Int ->
-                HorVerPortfolio(
-                    experiment,
-                    i
-                )
-            } as (Experiment, Int) -> Portfolio,
+            "hor-ver" to { experiment: Experiment, i: Int -> HorVerPortfolio(experiment, i) }
+                as (Experiment, Int) -> Portfolio,
             "more-velocity" to { experiment, i -> MoreVelocityPortfolio(experiment, i) },
             "composite-workload" to { experiment, i -> CompositeWorkloadPortfolio(experiment, i) },
             "operational-phenomena" to { experiment, i -> OperationalPhenomenaPortfolio(experiment, i) },
diff --git a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/experiment/Run.kt b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/experiment/Run.kt
index 49941cf4..9928f223 100644
--- a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/experiment/Run.kt
+++ b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/experiment/Run.kt
@@ -100,6 +100,7 @@ public data class Run(override val parent: Scenario, val id: Int, val seed: Int)
                 }
             }
         }
+
         val performanceInterferenceModel = experiment.performanceInterferenceModel
             ?.takeIf { parent.operationalPhenomena.hasInterference }
             ?.construct(seeder) ?: emptyMap()
diff --git a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/trace/Sc20RawParquetTraceReader.kt b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/trace/Sc20RawParquetTraceReader.kt
index b390a753..652f7746 100644
--- a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/trace/Sc20RawParquetTraceReader.kt
+++ b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/trace/Sc20RawParquetTraceReader.kt
@@ -98,7 +98,12 @@ class Sc20RawParquetTraceReader(private val path: File) {
         return try {
             while (true) {
                 val record = metaReader.read() ?: break
+
                 val id = record["id"].toString()
+                if (!fragments.containsKey(id)) {
+                    continue
+                }
+
                 val submissionTime = record["submissionTime"] as Long
                 val endTime = record["endTime"] as Long
                 val maxCores = record["maxCores"] as Int
@@ -127,6 +132,9 @@ class Sc20RawParquetTraceReader(private val path: File) {
             }
 
             entries
+        } catch (e: Exception) {
+            e.printStackTrace()
+            throw e
         } finally {
             metaReader.close()
         }
-- 
cgit v1.2.3