Merged scenario and portfolio (#220)

* sync with the master branch

* rebase

* multimodel - simulation is currently run as many times as you can see a model

* factory method - handles models without given params

* removed redundant flags

* modelType

* flags removed

* implemented output into a folder

* multimodel ipynb setup - to be implemented and also ran as a python script, when the simulation occurs

* towards a mutimodel python implementation - issue observed - the saved files have same data?

* json parsing handles now lists for topology, workloads, allocaitonPolicies, powerModels

* scenarioFile inputs lists, and creates multiple combinations of scenarios

* multi-model prediction repaired, now we predict using multiple models

* commit before removing powerModel from scenario

* commit after removing powerModel from scenario

* commit after removing powerModel from scenario (and actually running)

* powermodels now can output their name and full name (with min and max)

* now we can select where to output (seed or output folder)

* input files - clear naming + output naming improved

* minimal changes

* all tests passing + json files from tests updated to the new json format

* json files from topology now accept only one power model (instead of list)

* json files from topology now accept only one power model (instead of list)

* multi and single input from tests updated to match the format

* tests passed locally

* spotless applies

* demo folder removed

1 files changed, 4 insertions, 2 deletions

diff --git a/opendc-experiments/opendc-experiments-scenario/src/main/kotlin/org/opendc/experiments/scenario/ScenarioCli.kt b/opendc-experiments/opendc-experiments-scenario/src/main/kotlin/org/opendc/experiments/scenario/ScenarioCli.kt
index 16d2915c..bd05824b 100644
--- a/opendc-experiments/opendc-experiments-scenario/src/main/kotlin/org/opendc/experiments/scenario/ScenarioCli.kt
+++ b/opendc-experiments/opendc-experiments-scenario/src/main/kotlin/org/opendc/experiments/scenario/ScenarioCli.kt
@@ -58,7 +58,9 @@ internal class ScenarioCommand : CliktCommand(name = "scenario") {
         .default(Runtime.getRuntime().availableProcessors() - 1)
 
     override fun run() {
-        val scenario = getScenario(scenarioPath)
-        runScenario(scenario, parallelism)
+        // TODO: clean the simulation-results folder?
+        val scenarios = getScenario(scenarioPath)
+        runScenario(scenarios, parallelism)
+        // TODO: implement outputResults(scenario) // this will take the results, from a folder, and output them visually
     }
 }