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

master > master: code py - enum option zum Anzeigen aller Summen

Browse Source
This commit is contained in:
RD 2022-06-15 10:07:37 +02:00
parent 22fe6c6d4a
commit 22801148a6
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/python/assets/config.yaml
View File

@ -32,3 +32,4 @@ options:
verbose: true verbose: true
show: show:
- ALL-WEIGHTS - ALL-WEIGHTS
- ALL-SUMS

1
code/python/models/config-schema.yaml
View File

@ -166,3 +166,4 @@ components:
type: string type: string
enum: enum:
- ALL-WEIGHTS - ALL-WEIGHTS
- ALL-SUMS

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

@ -98,16 +98,19 @@ def display_rucksack(
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
def display_branch_and_bound(values: np.ndarray, steps: List[Step]) -> str: def display_branch_and_bound(values: np.ndarray, steps: List[Step]) -> str:
# füge Summen-Ausdrücke für Greedy-Alg hinzu: show_options = config.OPTIONS.rucksack.show;
show_all_sums = (EnumRucksackShow.all_sums in show_options);
rows = []; rows = [];
used_choices = []; used_choices = [];
index_soln = max([-1] + [ i for i, step in enumerate(steps) if step.move == EnumBranchAndBoundMove.BOUND ]); index_soln = max([-1] + [ i for i, step in enumerate(steps) if step.move == EnumBranchAndBoundMove.BOUND ]);
for i, step in enumerate(steps): for i, step in enumerate(steps):
if step.choice in used_choices: if show_all_sums or step.choice not in used_choices:
expr = f'{step.bound_subtree:g}'; # Füge Summen-Ausdrücke für Greedy-Alg hinzu:
else:
used_choices.append(step.choice); used_choices.append(step.choice);
expr = display_sum(choice=step.choice, values=values, as_maximum=False, order=step.order, indexes=step.indexes); expr = display_sum(choice=step.choice, values=values, as_maximum=False, order=step.order, indexes=step.indexes);
else:
expr = f'{step.bound_subtree:g}';
pad_str = ('' if step.pad == MaskValue.UNSET else step.pad.value); pad_str = ('' if step.pad == MaskValue.UNSET else step.pad.value);
move_str = ('' if step.move == EnumBranchAndBoundMove.NONE else step.move.value); move_str = ('' if step.move == EnumBranchAndBoundMove.NONE else step.move.value);
if i == index_soln: if i == index_soln: