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

master > master: code py - darstellung

Browse Source 
- erzwinge `+`-Vorzeichen
- Spaltennamen ausführlicher (`b` -> `bound`)
- pad-Spalte ganz rechts, um als optional zu verdeutlichen
This commit is contained in:
RD 2022-06-14 20:10:54 +02:00
parent a9eb961eec
commit 92f038d4dd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/python/src/algorithms/rucksack/display.py
View File

@ -95,17 +95,17 @@ def display_branch_and_bound(
else: else:
used_choices.append(choice); used_choices.append(choice);
expr = display_sum(choice=choice, values=values, as_maximum=False, order=order); expr = display_sum(choice=choice, values=values, as_maximum=False, order=order);
rows.append((f'{lb_estimate:g}', expr, ('' if pad == MaskValue.UNSET else pad.value), S)); rows.append((f'{lb_estimate:+g}', expr, S, ('' if pad == MaskValue.UNSET else pad.value)));
table = pd.DataFrame(rows) \ table = pd.DataFrame(rows) \
.rename(columns={0: 'b', 1: 'g(TOP(S))', 2: 'pad?', 3: 'S'}) \ .rename(columns={0: 'bound', 1: 'g(TOP(S))', 2: 'S', 3: 'pad?'}) \
.reset_index(drop=True); .reset_index(drop=True);
# benutze pandas-Dataframe + tabulate, um schöner darzustellen: # benutze pandas-Dataframe + tabulate, um schöner darzustellen:
repr = tabulate( repr = tabulate(
table, table,
headers=['b', 'g(TOP(S))', 'pad?', 'S'], headers=['bound', 'g(TOP(S))', 'S — stack', 'pad?'],
showindex=False, showindex=False,
colalign=('left', 'left', 'center', 'right'), colalign=('left', 'left', 'right', 'center'),
tablefmt='rst' tablefmt='rst'
); );
return repr; return repr;