lorenzo.volpi
/
QuAcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

times refactored

This commit is contained in:
Lorenzo Volpi 2023-11-26 16:31:40 +01:00
parent 58661e7f93
commit fdde2cc20f
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
quacc/evaluation/report.py
View File

@ -75,6 +75,7 @@ class CompReport:
train_prev: np.ndarray = None, train_prev: np.ndarray = None,
valid_prev: np.ndarray = None, valid_prev: np.ndarray = None,
times=None, times=None,
g_time=None,
): ):
if isinstance(datas, pd.DataFrame): if isinstance(datas, pd.DataFrame):
self._data: pd.DataFrame = datas self._data: pd.DataFrame = datas
@ -90,9 +91,14 @@ class CompReport:
.sort_index(axis=0, level=0) .sort_index(axis=0, level=0)
) )
if times is None:
self.times = {er.name: er.time for er in datas}
else:
self.times = times
self.times["tot"] = g_time
self.train_prev = train_prev self.train_prev = train_prev
self.valid_prev = valid_prev self.valid_prev = valid_prev
self.times = times
@property @property
def prevs(self) -> np.ndarray: def prevs(self) -> np.ndarray:
@ -130,9 +136,10 @@ class CompReport:
df = CompReport( df = CompReport(
_join, _join,
self.name if hasattr(self, "name") else "default", self.name if hasattr(self, "name") else "default",
self.train_prev, train_prev=self.train_prev,
self.valid_prev, valid_prev=self.valid_prev,
self.times | other.times, times=self.times | other.times,
g_time=self.times["tot"] + other.times["tot"],
) )
return df return df