summaryrefslogtreecommitdiff
path: root/opendc-experiments/opendc-experiments-m3sa/src
diff options
context:
space:
mode:
Diffstat (limited to 'opendc-experiments/opendc-experiments-m3sa/src')
-rw-r--r--opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/M3saAnalyzer.kt (renamed from opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/M3saAnalyzer.kt)2
-rw-r--r--opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/runner/M3SACli.kt5
-rw-r--r--opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/runner/M3SARunner.kt4
3 files changed, 8 insertions, 3 deletions
diff --git a/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/M3saAnalyzer.kt b/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/M3saAnalyzer.kt
index 6b8f8422..545ed656 100644
--- a/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/M3saAnalyzer.kt
+++ b/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/M3saAnalyzer.kt
@@ -20,6 +20,8 @@
* SOFTWARE.
*/
+package org.opendc.experiments.m3sa
+
import kotlin.io.path.Path
/**
diff --git a/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/runner/M3SACli.kt b/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/runner/M3SACli.kt
index 43597ff5..8036e5b7 100644
--- a/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/runner/M3SACli.kt
+++ b/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/runner/M3SACli.kt
@@ -22,7 +22,7 @@
@file:JvmName("M3SACli")
-package org.opendc.experiments.base.runner
+package org.opendc.experiments.m3sa.runner
import com.github.ajalt.clikt.core.CliktCommand
import com.github.ajalt.clikt.parameters.options.default
@@ -30,8 +30,9 @@ import com.github.ajalt.clikt.parameters.options.defaultLazy
import com.github.ajalt.clikt.parameters.options.option
import com.github.ajalt.clikt.parameters.types.file
import com.github.ajalt.clikt.parameters.types.int
-import m3saAnalyze
+import org.opendc.experiments.base.runner.runExperiment
import org.opendc.experiments.base.scenario.getExperiment
+import org.opendc.experiments.m3sa.m3saAnalyze
import org.opendc.experiments.m3sa.scenario.getOutputFolder
import java.io.File
diff --git a/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/runner/M3SARunner.kt b/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/runner/M3SARunner.kt
index 9a61ad17..89daf5f3 100644
--- a/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/runner/M3SARunner.kt
+++ b/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/runner/M3SARunner.kt
@@ -22,8 +22,10 @@
@file:JvmName("M3saCliKt")
-package org.opendc.experiments.base.runner
+package org.opendc.experiments.m3sa.runner
+import org.opendc.experiments.base.runner.runScenario
+import org.opendc.experiments.base.runner.setupOutputFolderStructure
import org.opendc.experiments.base.scenario.Scenario
import java.util.concurrent.ForkJoinPool