diff --git a/umbra/controller.py b/umbra/controller.py index 7d2086256a502ff240754059a52567debf8671f4..b14759587912935a66daa19b9b5eabbd59e15c20 100644 --- a/umbra/controller.py +++ b/umbra/controller.py @@ -154,14 +154,13 @@ class Controller: if not self._model.analysis_complete(): self._view.update_message('no comparison') else: - if self._model.multi_results: - path = self._view.ask_save_location() - results = self._model.multi_results - self._filewriter.write_multiple(path, results) - self._view.update_message('saved') - elif not self._model.multi_results \ - and not self._model.analysis_results: - self._view.update_message('nonexistent') + path = self._view.ask_save_location() + mistake_results = self._model.create_mistake_frame() + delay_results = self._model.create_delay_frame() + self._view.update_message('saved') + self._filewriter.write_frame(path, mistake_results, 'mistakes.csv') + self._filewriter.write_frame(path, delay_results, 'delay.csv') + #self._view.update_message('nonexistent') def _read_folder(self): """ diff --git a/umbra/filereader.py b/umbra/filereader.py index 930d56c2c5aa7aa6bebcc9b050aedc55e047511a..2e7018ad3c406480843b5dafde18f83fc0120e22 100644 --- a/umbra/filereader.py +++ b/umbra/filereader.py @@ -108,7 +108,7 @@ class FileWriter(ABC): pass @abstractmethod - def write(self): + def write(self, path, results): pass @abstractmethod @@ -125,7 +125,7 @@ class TxtWriter(FileWriter): Write a .txt file of analysis results. Args: path: string of paths - result: the results, type unknown + results: the results, type unknown """ # For now assume source, shadow, stat format @@ -188,6 +188,9 @@ class CSVWriter(FileWriter): path = self._participant_path(dir, key) self.write(path, results) + def write_frame(self, path, results, result_type): + results.to_csv(path+result_type) + def _participant_path(self, dir, key): """ Create a path for the appropriate participant.