From 3f3ccf1059f31fe26ce77fbe3750f8f04eb398ee Mon Sep 17 00:00:00 2001 From: raj_mathe Date: Mon, 25 Oct 2021 11:27:07 +0200 Subject: [PATCH] =?UTF-8?q?master=20>=20master:=20code=20-=20display=20mes?= =?UTF-8?q?sages=20=C3=BCberarbeitet.=20Jetzt=20bei=20Fehlschlag=20den=20O?= =?UTF-8?q?utput=20weiterhin=20zeigen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/algorithms/methods.py | 6 +++--- code/setup/display.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/algorithms/methods.py b/code/algorithms/methods.py index 0a578a5..d894881 100644 --- a/code/algorithms/methods.py +++ b/code/algorithms/methods.py @@ -80,13 +80,13 @@ def algorithmInfos( outputs_ = outputs if isinstance(outputs, tuple) else tuple([outputs]); outputnames_ = outputnames if isinstance(outputnames, tuple) else tuple([outputnames]); outputsNamed = { outputnames_[k]: value for k, value in enumerate(outputs_) }; - # Postchecks - if checks and callable(postChecks): - postChecks(**inputs, **outputsNamed); # Letzte Messages if metrics: DisplayMetrics(); DisplayEndOfAlgorithm(**outputsNamed); + # Postchecks + if checks and callable(postChecks): + postChecks(**inputs, **outputsNamed); except Exception as e: nonnestedAlgorithms.state = state1; nonnestedRecursion.state = state2; diff --git a/code/setup/display.py b/code/setup/display.py index 0f3d933..ccd6a42 100644 --- a/code/setup/display.py +++ b/code/setup/display.py @@ -57,17 +57,17 @@ def DisplayStartOfAlgorithm(name: str, *_: Any, **inputs: Any): logPlain('Ausführung vom Algorithmus: \033[92;1m{}\033[0m'.format(name)); logPlain('INPUTS'); for varname, value in inputs.items(): - logPlain(' - {} = {}'.format(varname, RepresentValue(value))) + logPlain(' - {} = {}'.format(varname, RepresentValue(value))) return; def DisplayEndOfAlgorithm(*_: Any, **outputs: Any): logPlain('OUTPUTS:') for varname, value in outputs.items(): - logPlain(' - {} = {}'.format(varname, RepresentValue(value))) + logPlain(' - {} = {}'.format(varname, RepresentValue(value))) return; def DisplayMetrics(): - logPlain('Dauer der Ausführung: t = \033[1m{}\033[0m'.format(TimeElapsed())); + logPlain('Dauer der Ausführung: t = \033[1m{}\033[0m'.format(TimeElapsed())); logPlain('Anzahl der Schritte: T(n) = \033[1m{}\033[0m'.format(NumberOfSteps())); return;