diff --git a/quacc/evaluation/report.py b/quacc/evaluation/report.py index a774f78..696bc85 100644 --- a/quacc/evaluation/report.py +++ b/quacc/evaluation/report.py @@ -3,27 +3,10 @@ import statistics as stats import numpy as np import pandas as pd -def _in_div(s): - return "
" + s + "
\n" -def _header_footer(s): - return ( - """ - - - - - - """ + - s + - "" - ) +def _fmt_line(s): + return f"> {s} \n" + class EvaluationReport: def __init__(self, prefix=None): @@ -126,7 +109,7 @@ class EvaluationReport: @property def prevs(self): return self._prevs - + @prevs.setter def prevs(self, val): self._prevs = val @@ -134,23 +117,22 @@ class EvaluationReport: @property def target(self): return self._target - + @target.setter def target(self, val): self._target = val - def to_html(self, *metrics): - res = _in_div("target: " + self.target) - for k,v in self.prevs.items(): - res += _in_div(f"{k}: {str(v)}") - for k,v in self.times.items(): - res += _in_div(f"{k}: {v:.3f}s") + def to_md(self, *metrics): + res = _fmt_line("target: " + self.target) + for k, v in self.prevs.items(): + res += _fmt_line(f"{k}: {str(v)}") + for k, v in self.times.items(): + res += _fmt_line(f"{k}: {v:.3f}s") res += "\n" for m in metrics: res += self.get_dataframe(metrics=m).to_html() + "\n\n" - - return _header_footer(res) + return res @staticmethod def combine_reports(*args): diff --git a/quacc/main.py b/quacc/main.py index ee6be7d..fea3800 100644 --- a/quacc/main.py +++ b/quacc/main.py @@ -25,7 +25,7 @@ def estimate_comparison(): er = method.evaluate_comparison(DATASET, target=target) er.target = target with open(OUTPUT_FILE, "a") as f: - f.write(er.to_html(["acc"], ["f1"])) + f.write(er.to_md(["acc"], ["f1"])) except Exception: traceback.print_exc()