raj_mathe/ads1_2021
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

master > master: code - display messages überarbeitet. Jetzt bei Fehlschlag den Output weiterhin zeigen.

Browse Source
This commit is contained in:
RD 2021-10-25 11:27:07 +02:00
parent 60b27c1abe
commit 3f3ccf1059
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/algorithms/methods.py
View File

@ -80,13 +80,13 @@ def algorithmInfos(
outputs_ = outputs if isinstance(outputs, tuple) else tuple([outputs]); outputs_ = outputs if isinstance(outputs, tuple) else tuple([outputs]);
outputnames_ = outputnames if isinstance(outputnames, tuple) else tuple([outputnames]); outputnames_ = outputnames if isinstance(outputnames, tuple) else tuple([outputnames]);
outputsNamed = { outputnames_[k]: value for k, value in enumerate(outputs_) }; outputsNamed = { outputnames_[k]: value for k, value in enumerate(outputs_) };
# Postchecks
if checks and callable(postChecks):
postChecks(**inputs, **outputsNamed);
# Letzte Messages # Letzte Messages
if metrics: if metrics:
DisplayMetrics(); DisplayMetrics();
DisplayEndOfAlgorithm(**outputsNamed); DisplayEndOfAlgorithm(**outputsNamed);
# Postchecks
if checks and callable(postChecks):
postChecks(**inputs, **outputsNamed);
except Exception as e: except Exception as e:
nonnestedAlgorithms.state = state1; nonnestedAlgorithms.state = state1;
nonnestedRecursion.state = state2; nonnestedRecursion.state = state2;

6
code/setup/display.py
View File

@ -57,17 +57,17 @@ def DisplayStartOfAlgorithm(name: str, *_: Any, **inputs: Any):
logPlain('Ausführung vom Algorithmus: \033[92;1m{}\033[0m'.format(name)); logPlain('Ausführung vom Algorithmus: \033[92;1m{}\033[0m'.format(name));
logPlain('INPUTS'); logPlain('INPUTS');
for varname, value in inputs.items(): for varname, value in inputs.items():
logPlain(' - {} = {}'.format(varname, RepresentValue(value))) logPlain(' - {} = {}'.format(varname, RepresentValue(value)))
return; return;
def DisplayEndOfAlgorithm(*_: Any, **outputs: Any): def DisplayEndOfAlgorithm(*_: Any, **outputs: Any):
logPlain('OUTPUTS:') logPlain('OUTPUTS:')
for varname, value in outputs.items(): for varname, value in outputs.items():
logPlain(' - {} = {}'.format(varname, RepresentValue(value))) logPlain(' - {} = {}'.format(varname, RepresentValue(value)))
return; return;
def DisplayMetrics(): 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())); logPlain('Anzahl der Schritte: T(n) = \033[1m{}\033[0m'.format(NumberOfSteps()));
return; return;