diff --git a/simrunner/data_config.json b/simrunner/data_config.json index 1e6e44559b56d4e1c7b56c0e146c33a6ca59ce7f..e4747bfa3b576d06ca039c081b79da42d0de0f78 100644 --- a/simrunner/data_config.json +++ b/simrunner/data_config.json @@ -1,13 +1,13 @@ { "data_set_1":{ - "--posixDataDir": "protokoll", + "--posixDataDir": "fehler_test", "-n": "15", "-s": "2M", "-i": "0.1s", "-N": "4"}, "data_set_2":{ "--posixDataDir": "protokoll", - "-q": "20", + "-q": "error test parameter", "-n": "20", "-s": "1M", "-i": "0.1s", diff --git a/simrunner/simrunner.py b/simrunner/simrunner.py index 2ecd09a289ae6771754aca59e84728dd5509a729..e3db2a4d1f341d46b2a62b5d2c19732790f0860f 100644 --- a/simrunner/simrunner.py +++ b/simrunner/simrunner.py @@ -44,7 +44,7 @@ def run_sim(e_list, d_path, s_path): print(output) print(errors) if return_code > 0: - print(return_code) + print("return code: ", return_code) # --- MAIN --- diff --git a/visualizer/README.md b/visualizer/README.md index 16c373097c0b36f04179634bddb0941746f8816c..1dfb65840a8de5e8f25897d63caff95bbf646351 100644 --- a/visualizer/README.md +++ b/visualizer/README.md @@ -1,15 +1,15 @@ -Install the controller and its dependencies +Install the visualizer and its dependencies by following these instructions: Please make sure that you are using Python 3.9 or higher. Please make sure that you have installed setuptools for python3 if not: - sudo apt install python3-setuptools + apt install python3-setuptools or pip install setuptools -1. Navigate to /detectorwritesim/controller +1. Navigate to /detectorwritesim/visualizer 2. Create a new Python3.9 or higher virtual environment: python3 -m venv visualizerenv 3. Activate the environment: @@ -18,6 +18,6 @@ if not: python3 setup.py install Now you have completed the setup process, -you can start the controller by entering the following command: +you can start the visualizer by entering the following command: visualizer_run \ No newline at end of file diff --git a/visualizer/data_folder_path.json b/visualizer/data_folder_path.json deleted file mode 100644 index b6517ca0658af9b7cc751b68314927dd3e348a40..0000000000000000000000000000000000000000 --- a/visualizer/data_folder_path.json +++ /dev/null @@ -1 +0,0 @@ -"/home/user/Projekt/detectorwritesim/output1" \ No newline at end of file diff --git a/visualizer/setup.py b/visualizer/setup.py index 3f77028f9b4a8964cdcdd5dcef1c9c698921d170..4d7212de8850e070866f6ebae6f01fbfb953b850 100644 --- a/visualizer/setup.py +++ b/visualizer/setup.py @@ -11,6 +11,7 @@ setup( 'pandas', 'seaborn', 'matplotlib', + 'scipy' ], entry_points={ 'console_scripts': [ diff --git a/visualizer/visualizer/SeabornPlotter.py b/visualizer/visualizer/SeabornPlotter.py index 4fe138cd1bcb1fdc634a639ea35a674ec8f0e77a..11fcdc55676f601ba21e99006727bb7273d7dc7f 100644 --- a/visualizer/visualizer/SeabornPlotter.py +++ b/visualizer/visualizer/SeabornPlotter.py @@ -1,6 +1,7 @@ import numpy as np import matplotlib.pyplot as plt import seaborn as sns +from scipy.stats import iqr class SeabornPlotter: @@ -22,10 +23,11 @@ class SeabornPlotter: y_bins = [y_start + (y_step * i) for i in range(int((y_end - y_start) / y_step) + 1)] f, ax = plt.subplots(figsize=(16, 20)) - sns.scatterplot(x=x, y=y, s=5, color=".15", hue=list(self.dataframe.index.get_level_values(0))) - sns.histplot(x=x, y=y, bins=[x_bins, y_bins], pthresh=.1, cmap="coolwarm") - ax.set_xscale('log') + sns.violinplot(x=x, y=y, s=5, color=".15", palette="light:b", inner="points", hue=list(self.dataframe.index.get_level_values(0))) + #sns.histplot(x=x, y=y, bins=[x_bins, y_bins], pthresh=.1, cmap="coolwarm") + #ax.set_xscale('log') ax.set_yscale('log') plt.tight_layout() plt.show() +