mirror of https://gitlab.com/pamhyr/pamhyr2
Result: Fix solver name.
parent
381bc37d13
commit
26d1d63edb
|
|
@ -71,6 +71,13 @@ class Results(SQLSubModel):
|
||||||
def is_valid(self):
|
def is_valid(self):
|
||||||
return ("timestamps" in self._meta_data)
|
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):
|
def get(self, key):
|
||||||
return self._meta_data[key]
|
return self._meta_data[key]
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -80,7 +80,9 @@ class TableModel(PamhyrTableModel):
|
||||||
return f"{v:.4f}"
|
return f"{v:.4f}"
|
||||||
elif self._opt_data == "solver":
|
elif self._opt_data == "solver":
|
||||||
if self._headers[column] == "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)
|
return str(v)
|
||||||
elif self._opt_data == "raw_data":
|
elif self._opt_data == "raw_data":
|
||||||
p = self._lst[row]
|
p = self._lst[row]
|
||||||
|
|
|
||||||
|
|
@ -95,10 +95,11 @@ class ResultsWindow(PamhyrWindow):
|
||||||
|
|
||||||
if trad is None:
|
if trad is None:
|
||||||
trad = ResultsTranslate()
|
trad = ResultsTranslate()
|
||||||
|
|
||||||
name = (
|
name = (
|
||||||
trad[self._pamhyr_name] + " - "
|
trad[self._pamhyr_name] + " - "
|
||||||
+ study.name + " - "
|
+ study.name + " - "
|
||||||
+ " - ".join([s.name for s in self._solvers])
|
+ " - ".join([r.solver_name for r in self._results])
|
||||||
)
|
)
|
||||||
|
|
||||||
super(ResultsWindow, self).__init__(
|
super(ResultsWindow, self).__init__(
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue