From 934c79ac2fa92bb7746637c40d9a3690475ebed1 Mon Sep 17 00:00:00 2001 From: raj_mathe Date: Wed, 15 Jun 2022 12:44:18 +0200 Subject: [PATCH] master > master: code py - cleanup von assets --- code/python/assets/commands.yaml | 18 ++++++++++++------ code/python/assets/config.yaml | 3 +++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/code/python/assets/commands.yaml b/code/python/assets/commands.yaml index d6776ac..2e15e95 100644 --- a/code/python/assets/commands.yaml +++ b/code/python/assets/commands.yaml @@ -75,20 +75,26 @@ # Beispiele für Vorlesung + Seminarwoche 11 (VL + Blatt 10) # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- &rucksack_1 - name: RUCKSACK +- name: RUCKSACK algorithm: GREEDY - allow-fractional: false + allow-fractional: true + # allow-fractional: false max-cost: 10 items: [a, b, c, d, e] costs: [3, 4, 5, 2, 1] values: [8, 7, 8, 3, 2] -- <<: *rucksack_1 - allow-fractional: true -- <<: *rucksack_1 +- name: RUCKSACK algorithm: BRANCH-AND-BOUND + allow-fractional: true + # allow-fractional: false + max-cost: 10 + items: [a, b, c, d, e] + costs: + [3, 4, 5, 2, 1] + values: + [8, 7, 8, 3, 2] - name: RUCKSACK algorithm: BRANCH-AND-BOUND max-cost: 460 diff --git a/code/python/assets/config.yaml b/code/python/assets/config.yaml index 71fc71e..a18cf06 100644 --- a/code/python/assets/config.yaml +++ b/code/python/assets/config.yaml @@ -22,14 +22,17 @@ options: diagonal: 0 horizontal: 1 vertical: 2 + # verbose: [] verbose: - COSTS - MOVES + # show: [] show: # - ATOMS - TREE rucksack: verbose: true + # show: [] show: - ALL-WEIGHTS - ALL-SUMS