diff --git a/visualizer/visualizer/DataFrameCreator.py b/visualizer/visualizer/DataFrameCreator.py index 4eaabcc238ec83c41dd322e8017b36620a59ce04..38d09a142527ef7efd5a8f7639af59817d0292c5 100644 --- a/visualizer/visualizer/DataFrameCreator.py +++ b/visualizer/visualizer/DataFrameCreator.py @@ -15,64 +15,38 @@ class DataFrameCreator: merged_dfs[outer_key] = merged_dataframe_sorted return merged_dfs - def read_data(self, root, _, folder): - dataframe, dataframe_type, dataframe_name = "", "", "" - for filename in folder: - if filename.endswith('.dat'): - file_path = os.path.join(root, filename) - dataframe_name = os.path.splitext(filename)[0] - dataframe_type = dataframe_name.split('-')[1] - dataframe = pd.read_csv(file_path, delimiter=" ", header=0) - return dataframe, dataframe_type, dataframe_name - - def create_dataframe_long(self, root, _, folder): + def create(self): dfs = {} - for filename in folder: - if filename.endswith('.dat'): - dataframe, dataframe_type, dataframe_name = self.read_data(root, _, folder) - if dataframe_type in dfs: - inner_dict = dfs[dataframe_type] - if dataframe_name in inner_dict: - inner_dict[dataframe_name] = pd.concat([inner_dict[dataframe_name], dataframe], - ignore_index=True) + for root, _, folder in os.walk(self.folder_path): + if os.path.basename(root) == "statistics": + print("this was statistic") + continue + elif os.path.basename(root) == "Data_Set_Long": + print("this was long") + continue + for filename in folder: + if filename.endswith('.dat'): + file_path = os.path.join(root, filename) + dataframe_name = os.path.splitext(filename)[0] + dataframe_type = dataframe_name.split('-')[1] + dataframe = pd.read_csv(file_path, delimiter=" ", header=0) + + if dataframe_type in dfs: + inner_dict = dfs[dataframe_type] + if dataframe_name in inner_dict: + # DataFrame hinzufügen + inner_dict[dataframe_name] = pd.concat([inner_dict[dataframe_name], dataframe], + ignore_index=True) + else: + inner_dict[dataframe_name] = dataframe else: - inner_dict[dataframe_name] = dataframe - else: - dfs[dataframe_type] = { - dataframe_name: dataframe - } - print(dfs) - return dfs - - def create_dataframe_statistics(self, root, _, folder): - print("statistics" + root + folder) + dfs[dataframe_type] = { + dataframe_name: dataframe + } - def create_dataframes_various(self, root, _, folder): - dfs = {} - - dataframe, dataframe_type, dataframe_name = self.read_data(root, _, folder) - if dataframe_type in dfs: - inner_dict = dfs[dataframe_type] - if dataframe_name in inner_dict: - inner_dict[dataframe_name] = pd.concat([inner_dict[dataframe_name], dataframe], ignore_index=True) - else: - inner_dict[dataframe_name] = dataframe - else: - dfs[dataframe_type] = { - dataframe_name: dataframe - } merged_dfs = self._merge_dataframes(dfs) + return merged_dfs - def create(self): - various_frames = {} - for root, _, folder in os.walk(self.folder_path): - if os.path.basename(root) == "statistics": - statistic_frames = self.create_dataframe_statistics(root, _, folder) - elif os.path.basename(root) == "Data_Set_Long": - long_frames = self.create_dataframe_long(root, _, folder) - else: - self.create_dataframes_various(root, _, folder) - return various_frames diff --git a/visualizer/visualizer/SeabornPlotter.py b/visualizer/visualizer/SeabornPlotter.py index 186aae4e92b7b9e76c4d89678f7d0e25a48b1f5a..cb9e077bab82b3e343961ccc56bd89d1866b2844 100644 --- a/visualizer/visualizer/SeabornPlotter.py +++ b/visualizer/visualizer/SeabornPlotter.py @@ -45,18 +45,6 @@ class SeabornPlotter: plt.grid(True) plt.xticks(rotation=45) - @staticmethod - def plot_histogram_long(x, y, title, bins_x, bins_y): - f, ax = plt.subplots(figsize=(16, 9)) - sns.histplot(x=x, y=y, color="blue", bins=[bins_x, bins_y]) - ax.set_xscale('log') - ax.set_yscale('log') - ax.set_xlabel("Data size [Bytes]") - ax.set_ylabel("Time/Event [s]") - plt.title(title) - plt.grid(True) - plt.xticks(rotation=45) - def plot(self): df = self.dataframe diff --git a/visualizer/visualizer/main.py b/visualizer/visualizer/main.py index 0742a25ce68c01b7cadee6cbf6d9a4971813a25d..56dde96a987db9e7666a7c23dea33459ecda4c85 100644 --- a/visualizer/visualizer/main.py +++ b/visualizer/visualizer/main.py @@ -17,11 +17,11 @@ def main(): # Import Data creator = DataFrameCreator(data_path) dataframes = creator.create() + for frame in dataframes.keys(): if not dataframes[frame].empty: # Setup Plotter frame_name = frame - print(frame_name) plotter = SeabornPlotter(dataframes[frame], frame_name) # Plotter run