harness: Perform several improvements

This commit performs several improvements to the OpenDC harness and modules utilizing the harness.

3 files changed, 9 insertions, 18 deletions

diff --git a/simulator/opendc-experiments/opendc-experiments-sc18/.gitignore b/simulator/opendc-experiments/opendc-experiments-sc18/.gitignore
new file mode 100644
index 00000000..ba64707c
--- /dev/null
+++ b/simulator/opendc-experiments/opendc-experiments-sc18/.gitignore
@@ -0,0 +1,2 @@
+input/
+output/
diff --git a/simulator/opendc-experiments/opendc-experiments-sc18/build.gradle.kts b/simulator/opendc-experiments/opendc-experiments-sc18/build.gradle.kts
index b6b35694..00aa0395 100644
--- a/simulator/opendc-experiments/opendc-experiments-sc18/build.gradle.kts
+++ b/simulator/opendc-experiments/opendc-experiments-sc18/build.gradle.kts
@@ -20,31 +20,20 @@
  * SOFTWARE.
  */
 
-description = "Experiments for the TPDS paper"
+description = "Experiments for the SC18 article"
 
 /* Build configuration */
 plugins {
-    `kotlin-library-convention`
-    application
-}
-
-application {
-    mainClass.set("org.opendc.harness.runner.console.ConsoleRunnerKt")
+    `kotlin-library-conventions`
+    `experiment-conventions`
 }
 
 dependencies {
+    api(platform(project(":opendc-platform")))
     api(project(":opendc-core"))
     api(project(":opendc-harness"))
     implementation(project(":opendc-format"))
     implementation(project(":opendc-workflows"))
     implementation(project(":opendc-simulator:opendc-simulator-core"))
     implementation(project(":opendc-compute:opendc-compute-simulator"))
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.9.8") {
-        exclude("org.jetbrains.kotlin", module = "kotlin-reflect")
-    }
-    implementation(kotlin("reflect"))
-
-    testImplementation("org.junit.jupiter:junit-jupiter-api:${Library.JUNIT_JUPITER}")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${Library.JUNIT_JUPITER}")
-    testImplementation("org.junit.platform:junit-platform-launcher:${Library.JUNIT_PLATFORM}")
 }
diff --git a/simulator/opendc-experiments/opendc-experiments-sc18/src/main/kotlin/org/opendc/experiments/sc18/UnderspecificationExperiment.kt b/simulator/opendc-experiments/opendc-experiments-sc18/src/main/kotlin/org/opendc/experiments/sc18/UnderspecificationExperiment.kt
index 6d2c0ec7..fc979363 100644
--- a/simulator/opendc-experiments/opendc-experiments-sc18/src/main/kotlin/org/opendc/experiments/sc18/UnderspecificationExperiment.kt
+++ b/simulator/opendc-experiments/opendc-experiments-sc18/src/main/kotlin/org/opendc/experiments/sc18/UnderspecificationExperiment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 AtLarge Research
+ * Copyright (c) 2021 AtLarge Research
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -55,12 +55,12 @@ public class UnderspecificationExperiment : Experiment("underspecification") {
     /**
      * The workflow traces to test.
      */
-    private val trace: String by anyOf("traces/chronos_exp_noscaler_ca.gwf")
+    private val trace: String by anyOf("input/traces/chronos_exp_noscaler_ca.gwf")
 
     /**
      * The datacenter environments to test.
      */
-    private val environment: String by anyOf("environments/base.json")
+    private val environment: String by anyOf("input/environments/base.json")
 
     @OptIn(ExperimentalCoroutinesApi::class)
     override fun doRun(repeat: Int) {