From 63fee8c895825b52653ed4bf45cb08b2ba4f7166 Mon Sep 17 00:00:00 2001 From: Olli Graf Date: Sun, 9 Jul 2023 16:47:14 +0200 Subject: [PATCH] Fibonacci-Berechnung korrigiert. --- teil13/fib.py | 4 +++- teil13/fibserver.py | 2 +- teil16/Fib-Testdaten.xlsx | Bin 4963 -> 4995 bytes teil16/fib.py | 2 +- teil16/testfib.py | 2 +- teil16/unittestfib.py | 8 ++++---- teil18/fib_gen.py | 2 +- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/teil13/fib.py b/teil13/fib.py index bbcef23..41e2527 100644 --- a/teil13/fib.py +++ b/teil13/fib.py @@ -5,7 +5,9 @@ import sys def fib(n): # Rekursionsbedingung - if n in [0,1]: + if n == 0: + return 0 + elif n == 1: return 1 else: # Rekursionsaufruf diff --git a/teil13/fibserver.py b/teil13/fibserver.py index 2302ce9..2122094 100755 --- a/teil13/fibserver.py +++ b/teil13/fibserver.py @@ -21,7 +21,7 @@ def fib(n): # Rekursionsbedingung if n in [0,1]: - return 1 + return n else: # Rekursionsaufruf return fib(n-1) + fib(n-2) diff --git a/teil16/Fib-Testdaten.xlsx b/teil16/Fib-Testdaten.xlsx index f13a18b71ca3347bce3c0b3b74294098333f6e0b..dfcc3e94db371f272dc2bd9917199e2cf050335f 100644 GIT binary patch delta 2776 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 delta 2762 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 aLdU5uLQm1(g^