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

7 files changed, 0 insertions, 187 deletions

diff --git a/opendc-experiments/opendc-experiments-portfolio/src/main/resources/bitbrains-small/interference-model.json b/opendc-experiments/opendc-experiments-portfolio/src/main/resources/bitbrains-small/interference-model.json
deleted file mode 100644
index 51fc6366..00000000
--- a/opendc-experiments/opendc-experiments-portfolio/src/main/resources/bitbrains-small/interference-model.json
+++ /dev/null
@@ -1,21 +0,0 @@
-[
-    {
-        "vms": [
-            "141",
-            "379",
-            "851",
-            "116"
-        ],
-        "minServerLoad": 0.0,
-        "performanceScore": 0.8830158730158756
-    },
-    {
-        "vms": [
-            "205",
-            "116",
-            "463"
-        ],
-        "minServerLoad": 0.0,
-        "performanceScore": 0.7133055555552751
-    }
-]
diff --git a/opendc-experiments/opendc-experiments-portfolio/src/main/resources/bitbrains-small/trace/meta.parquet b/opendc-experiments/opendc-experiments-portfolio/src/main/resources/bitbrains-small/trace/meta.parquet
deleted file mode 100644
index 9cded35f..00000000
--- a/opendc-experiments/opendc-experiments-portfolio/src/main/resources/bitbrains-small/trace/meta.parquet
+++ /dev/null
diff --git a/opendc-experiments/opendc-experiments-portfolio/src/main/resources/bitbrains-small/trace/trace.parquet b/opendc-experiments/opendc-experiments-portfolio/src/main/resources/bitbrains-small/trace/trace.parquet
deleted file mode 100644
index 9d953956..00000000
--- a/opendc-experiments/opendc-experiments-portfolio/src/main/resources/bitbrains-small/trace/trace.parquet
+++ /dev/null
diff --git a/opendc-experiments/opendc-experiments-portfolio/src/main/resources/env/multi.json b/opendc-experiments/opendc-experiments-portfolio/src/main/resources/env/multi.json
deleted file mode 100644
index 721005b0..00000000
--- a/opendc-experiments/opendc-experiments-portfolio/src/main/resources/env/multi.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "clusters":
-    [
-        {
-            "name": "C01",
-            "hosts" :
-            [
-                {
-                    "name": "H01",
-                    "cpus":
-                    [
-                        {
-                            "coreCount": 32,
-                            "coreSpeed": 3200
-                        }
-                    ],
-                    "memory": {
-                        "memorySize": 256000
-                    }
-                }
-            ]
-        },
-        {
-            "name": "C02",
-            "hosts" :
-            [
-                {
-                    "name": "H02",
-                    "count": 6,
-                    "cpus":
-                    [
-                        {
-                            "coreCount": 8,
-                            "coreSpeed": 2930
-                        }
-                    ],
-                    "memory": {
-                        "memorySize": 64000
-                    }
-                }
-            ]
-        },
-        {
-            "name": "C03",
-            "hosts" :
-            [
-                {
-                    "name": "H03",
-                    "count": 2,
-                    "cpus":
-                    [
-                        {
-                            "coreCount": 16,
-                            "coreSpeed": 3200
-                        }
-                    ],
-                    "memory": {
-                        "memorySize": 128000
-                    }
-                }
-            ]
-        }
-    ]
-}
-
-
diff --git a/opendc-experiments/opendc-experiments-portfolio/src/main/resources/env/single.json b/opendc-experiments/opendc-experiments-portfolio/src/main/resources/env/single.json
deleted file mode 100644
index a1c8d95a..00000000
--- a/opendc-experiments/opendc-experiments-portfolio/src/main/resources/env/single.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "clusters":
-    [
-        {
-            "name": "C01",
-            "hosts" :
-            [
-                {
-                    "name": "H01",
-                    "cpus":
-                    [
-                        {
-                            "coreCount": 8,
-                            "coreSpeed": 3200
-                        }
-                    ],
-                    "memory": {
-                        "memorySize": 128000
-                    }
-                }
-            ]
-        }
-    ]
-}
-
-
diff --git a/opendc-experiments/opendc-experiments-portfolio/src/main/resources/log4j2.xml b/opendc-experiments/opendc-experiments-portfolio/src/main/resources/log4j2.xml
deleted file mode 100644
index e479f2ca..00000000
--- a/opendc-experiments/opendc-experiments-portfolio/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ MIT License
-  ~
-  ~ Copyright (c) 2020 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
-  ~ in the Software without restriction, including without limitation the rights
-  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  ~ copies of the Software, and to permit persons to whom the Software is
-  ~ furnished to do so, subject to the following conditions:
-  ~
-  ~ The above copyright notice and this permission notice shall be included in all
-  ~ copies or substantial portions of the Software.
-  ~
-  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  ~ SOFTWARE.
-  -->
-
-<Configuration status="WARN">
-    <Appenders>
-        <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%highlight{%-5level}] %logger{36} - %msg%n" disableAnsi="false"/>
-        </Console>
-    </Appenders>
-    <Loggers>
-        <Logger name="org.opendc" level="warn" additivity="false">
-            <AppenderRef ref="Console"/>
-        </Logger>
-        <Logger name="org.apache.hadoop" level="warn" additivity="false">
-            <AppenderRef ref="Console"/>
-        </Logger>
-        <Root level="error">
-            <AppenderRef ref="Console"/>
-        </Root>
-    </Loggers>
-</Configuration>
diff --git a/opendc-experiments/opendc-experiments-portfolio/src/main/resources/portfolio.json b/opendc-experiments/opendc-experiments-portfolio/src/main/resources/portfolio.json
deleted file mode 100644
index a1320b39..00000000
--- a/opendc-experiments/opendc-experiments-portfolio/src/main/resources/portfolio.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "scenarios": [
-        {
-            "runs": 5,
-            "topology": {
-                "pathToFile": "resources/env/single.json"
-            },
-            "workload": {
-                "pathToFile": "resources/bitbrains-small",
-                "type": "ComputeWorkload"
-            },
-            "allocationPolicy": {
-                "policyType": "Mem"
-            }
-        },
-        {
-            "runs": 5,
-            "name": "TESTTTT",
-            "topology": {
-                "pathToFile": "resources/env/single.json"
-            },
-            "workload": {
-                "pathToFile": "resources/bitbrains-small",
-                "type": "ComputeWorkload"
-            },
-            "allocationPolicy": {
-                "policyType": "Mem"
-            }
-        }
-    ]
-}