From f6401f0dfc286a9fbd7210ecbe30c95abee9cff9 Mon Sep 17 00:00:00 2001 From: raj_mathe Date: Mon, 20 Jun 2022 16:49:46 +0200 Subject: [PATCH] woche12 > master: code py - assets --- code/python/assets/commands.yaml | 29 +++++++++++++++++------------ code/python/assets/config.yaml | 22 +++++++++++++--------- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/code/python/assets/commands.yaml b/code/python/assets/commands.yaml index 791ff66..523fa64 100644 --- a/code/python/assets/commands.yaml +++ b/code/python/assets/commands.yaml @@ -89,10 +89,8 @@ algorithm: BRANCH-AND-BOUND max-cost: 10 items: [a, b, c, d, e] - costs: - [3, 4, 5, 2, 1] - values: - [8, 7, 8, 3, 2] + costs: [3, 4, 5, 2, 1] + values: [8, 7, 8, 3, 2] - name: RUCKSACK algorithm: BRANCH-AND-BOUND max-cost: 460 @@ -103,10 +101,8 @@ 'Schokolade', 'Apfelringe', ] - costs: - [220, 80, 140, 90, 100] - values: - [100, 10, 70, 80, 100] + costs: [220, 80, 140, 90, 100] + values: [100, 10, 70, 80, 100] - name: RUCKSACK algorithm: BRANCH-AND-BOUND max-cost: 90 @@ -117,7 +113,16 @@ 'Hirse', 'Sellerie', ] - costs: - [30, 10, 50, 10, 80] - values: - [17, 14, 17, 5, 25] + costs: [30, 10, 50, 10, 80] + values: [17, 14, 17, 5, 25] + +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# Beispiele für Seminarwoche 12 +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +- name: EUKLID + numbers: + - 2017 + - 58 +- name: POLLARD-RHO + number: 534767 diff --git a/code/python/assets/config.yaml b/code/python/assets/config.yaml index a18cf06..75becb8 100644 --- a/code/python/assets/config.yaml +++ b/code/python/assets/config.yaml @@ -26,13 +26,17 @@ options: verbose: - COSTS - MOVES - # show: [] - show: - # - ATOMS - - TREE + show: [] + # show: + # - ATOMS + # - TREE rucksack: - verbose: true - # show: [] - show: - - ALL-WEIGHTS - - ALL-SUMS + verbose: *ref_verbose + show: [] + # show: + # - ALL-WEIGHTS + # - ALL-SUMS + euklid: + verbose: *ref_verbose + pollard-rho: + verbose: *ref_verbose