From 26d1d63edbfbe28d2476a01e65cbe1f4402eacb2 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Tue, 23 Sep 2025 16:08:38 +0200 Subject: [PATCH] Result: Fix solver name. --- src/Model/Results/Results.py | 7 +++++++ src/View/Results/Table.py | 4 +++- src/View/Results/Window.py | 3 ++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/Model/Results/Results.py b/src/Model/Results/Results.py index 0c3b19ad..0e693e6f 100644 --- a/src/Model/Results/Results.py +++ b/src/Model/Results/Results.py @@ -71,6 +71,13 @@ class Results(SQLSubModel): def is_valid(self): return ("timestamps" in self._meta_data) + @property + def solver_name(self): + if self._solver is None: + return self._meta_data["solver_name"] + + return self._solver.name + def get(self, key): return self._meta_data[key] diff --git a/src/View/Results/Table.py b/src/View/Results/Table.py index 759269b2..45482c38 100644 --- a/src/View/Results/Table.py +++ b/src/View/Results/Table.py @@ -80,7 +80,9 @@ class TableModel(PamhyrTableModel): return f"{v:.4f}" elif self._opt_data == "solver": if self._headers[column] == "solver": - v = self._lst[row].name + v = self._lst[row] + if v is None: + v = self._data[0].solver_name return str(v) elif self._opt_data == "raw_data": p = self._lst[row] diff --git a/src/View/Results/Window.py b/src/View/Results/Window.py index 4475aa82..999648fa 100644 --- a/src/View/Results/Window.py +++ b/src/View/Results/Window.py @@ -95,10 +95,11 @@ class ResultsWindow(PamhyrWindow): if trad is None: trad = ResultsTranslate() + name = ( trad[self._pamhyr_name] + " - " + study.name + " - " - + " - ".join([s.name for s in self._solvers]) + + " - ".join([r.solver_name for r in self._results]) ) super(ResultsWindow, self).__init__(