diff --git a/execution/run_loop.sh b/execution/run_loop.sh index 314599d391719788b8b8320cfdfce1d59e1a08b8..9004e5b272a021467a06db532e59a2ad9e36453a 100755 --- a/execution/run_loop.sh +++ b/execution/run_loop.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3.7 import sys import os diff --git a/execution/strategies/__init__.py b/execution/strategies/__init__.py deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/execution/strategies/config.py b/execution/strategies/config.py index 65daf712ed3e8f8c6978be238e0634c38ea20e4d..f24f2ed9bfbb5a053e72019f522b5d057548a497 100644 --- a/execution/strategies/config.py +++ b/execution/strategies/config.py @@ -1,13 +1,15 @@ +from dataclasses import dataclass + +@dataclass class ExperimentConfig: """ Wrapper for the configuration of an experiment. """ - def __init__(self, use_case, dim_values, replicas, partitions, cpu_limit, memory_limit, kafka_streams_commit_interval_ms, execution_minutes, benchmarking_strategy, subexperiment_executor): - self.use_case=use_case - self.dim_values=dim_values - self.replicas=replicas - self.partitions=partitions - self.cpu_limit=cpu_limit - self.memory_limit=memory_limit - self.kafka_streams_commit_interval_ms=kafka_streams_commit_interval_ms - self.execution_minutes=execution_minutes - self.benchmarking_strategy=benchmarking_strategy - self.subexperiment_executor=subexperiment_executor \ No newline at end of file + use_case: str + dim_values: list + replicas: list + partitions: int + cpu_limit: str + memory_limit: str + kafka_streams_commit_interval_ms: int + execution_minutes: int + benchmarking_strategy: object + subexperiment_executor: object \ No newline at end of file diff --git a/execution/strategies/strategies/__init__.py b/execution/strategies/strategies/__init__.py deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/execution/strategies/strategies/config.py b/execution/strategies/strategies/config.py index 3578562123d3411cd949ab4a796d4a78afcc912e..92dfa919018169457e64c7d97b0f1eb1f0867d36 100644 --- a/execution/strategies/strategies/config.py +++ b/execution/strategies/strategies/config.py @@ -1,13 +1,15 @@ +from dataclasses import dataclass + +@dataclass class SubexperimentConfig: """ Wrapper for the configuration of a subexperiment """ - def __init__(self, use_case, counter, dim_value, replicas, partitions, cpu_limit, memory_limit, kafka_streams_commit_interval_ms, execution_minutes, subexperiment_executor): - self.use_case=use_case - self.counter=counter - self.dim_value=dim_value - self.replicas=replicas - self.partitions=partitions - self.cpu_limit=cpu_limit - self.memory_limit=memory_limit - self.kafka_streams_commit_interval_ms=kafka_streams_commit_interval_ms - self.execution_minutes=execution_minutes - self.subexperiment_executor=subexperiment_executor \ No newline at end of file + use_case: str + counter: int + dim_value: int + replicas: int + partitions: int + cpu_limit: str + memory_limit: str + kafka_streams_commit_interval_ms: int + execution_minutes: int + subexperiment_executor: object \ No newline at end of file diff --git a/execution/strategies/strategies/default_strategy.py b/execution/strategies/strategies/default_strategy.py index 5efa2a17b78378796b15867398a308f91ea2e55e..b0c559eab23f14f095ce94792d5df105a86bdd22 100644 --- a/execution/strategies/strategies/default_strategy.py +++ b/execution/strategies/strategies/default_strategy.py @@ -1,7 +1,7 @@ # Contains the default strategy that executes a subexperiment for all combinations of instances and dimension values. import os -from config import SubexperimentConfig +from .config import SubexperimentConfig def execute(config): subexperiment_counter=0 diff --git a/execution/strategies/subexperiment_execution/__init__.py b/execution/strategies/subexperiment_execution/__init__.py deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/execution/strategies/test/step_strategy_test.py b/execution/strategies/test/step_strategy_test.py new file mode 100644 index 0000000000000000000000000000000000000000..e14d5928dc7c8b62f7e398599204c04e2c60f112 --- /dev/null +++ b/execution/strategies/test/step_strategy_test.py @@ -0,0 +1,4 @@ +import strategies + +def test_strategy(): + \ No newline at end of file