From ec73210b675fd90568c5193e6ae6ef82ce81be6c Mon Sep 17 00:00:00 2001 From: Dante Niewenhuis Date: Tue, 26 Nov 2024 11:09:21 +0100 Subject: Streamlined the FlowNetwork for better performance (#273) --- .../org/opendc/experiments/m3sa/runner/M3SARunner.kt | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'opendc-experiments/opendc-experiments-m3sa') 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 0068738a..49bbdb96 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 @@ -25,9 +25,7 @@ package org.opendc.experiments.m3sa.runner import org.opendc.experiments.base.experiment.Scenario -import org.opendc.experiments.base.runner.runScenario import org.opendc.experiments.base.runner.setupOutputFolderStructure -import java.util.concurrent.ForkJoinPool /** * Run scenario when no pool is available for parallel execution @@ -39,22 +37,7 @@ public fun runExperiment( experiment: List, parallelism: Int, ) { - val ansiReset = "\u001B[0m" - val ansiGreen = "\u001B[32m" - val ansiBlue = "\u001B[34m" - setupOutputFolderStructure(experiment[0].outputFolder) - for (scenario in experiment) { - val pool = ForkJoinPool(parallelism) - println( - "\n\n$ansiGreen================================================================================$ansiReset", - ) - println("$ansiBlue Running scenario: ${scenario.name} $ansiReset") - println("$ansiGreen================================================================================$ansiReset") - runScenario( - scenario, - pool, - ) - } + runExperiment(experiment, parallelism) } -- cgit v1.2.3