From 63d20186490a845301313beb6877630e2f8e182f Mon Sep 17 00:00:00 2001 From: Johannes Date: Wed, 8 Sep 2021 10:10:53 +0200 Subject: [PATCH 1/3] BOOO --- .DS_Store | Bin 0 -> 6148 bytes conditionals/valid_baggage.py | 5 +++-- lists/fixSnake.py | 3 ++- loops/countingList.py | 6 +++++- loops/sumList.py | 6 +++++- variables/IsItANumber.py | 7 ++++++- variables/assignment.py | 6 +++--- variables/baggage_calculator.py | 13 +++++++++---- variables/cockroach.py | 5 ++++- 9 files changed, 37 insertions(+), 14 deletions(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..31b3c14a215c478d0c11dc0937eca7452a02bde3 GIT binary patch literal 6148 zcmeHKyG{c^47A~j2%40X`vsBsgC$Ce)cgPnK@n2KNhtK!@i}~AGJYf?w@OQa#*#g^ zYtNo;it}1TbpEw@6q$<11a2tb7Fx5sd1E)ZW2knV7W8`i`j(0?5Wc73;eXK03Jzxo49u502Dhzv}F3Jj{|h@m+-XwZ?bSw92@UDV%< zbMnoa6N={Gp~cHZYak;PpaPc)+{SWh{eKC+GXGzaxS|47;9n`A-QsyM$0ucPZ9dL= uZGpeQPlj4ANAOk*^j3_8wc>|gb;X{MuZcsT)3NV#ATI)@3yli=g#t%QpeHE+ literal 0 HcmV?d00001 diff --git a/conditionals/valid_baggage.py b/conditionals/valid_baggage.py index b9e5678..437655f 100644 --- a/conditionals/valid_baggage.py +++ b/conditionals/valid_baggage.py @@ -11,8 +11,9 @@ """ def gyldig_bagasje(vekt): - gyldig = True - return gyldig + if vekt < 32 and vekt > 2: + return True + return False class BaggageValidator(unittest.TestCase): def test_underweight(self): diff --git a/lists/fixSnake.py b/lists/fixSnake.py index 76cc72b..55d7a40 100644 --- a/lists/fixSnake.py +++ b/lists/fixSnake.py @@ -9,8 +9,9 @@ """ def fixSnake(snake): + # TODO fiks slange - return snake + return list(reversed(snake)) class FixSnake(unittest.TestCase): def test(self): diff --git a/loops/countingList.py b/loops/countingList.py index 9338286..07934ec 100644 --- a/loops/countingList.py +++ b/loops/countingList.py @@ -8,7 +8,11 @@ """ def telle_sauer(antall): - return [] + ListSau = [] + for tall in range(antall): + ListSau.append(tall + 1) + print(ListSau) + return ListSau class CountingList(unittest.TestCase): def test(self): diff --git a/loops/sumList.py b/loops/sumList.py index 453991f..ee52d9d 100644 --- a/loops/sumList.py +++ b/loops/sumList.py @@ -6,7 +6,11 @@ Hvis listen er tom skal svaret være 0. """ def positive_sum(liste): - return 0 + num = 0 + for x in liste: + if x > 0: + num + x + return num class CountingList(unittest.TestCase): def basic_test_cases(self): diff --git a/variables/IsItANumber.py b/variables/IsItANumber.py index 7697332..5537618 100644 --- a/variables/IsItANumber.py +++ b/variables/IsItANumber.py @@ -8,8 +8,13 @@ class IsItANumberTask(unittest.TestCase): is_number = False def is_a_number(self, maybe_number): + try: + float(maybe_number) + except: + self.is_number = False + else: + self.is_number = True ## TODO SKRIV KODEN HER - is_number = False def test_true(self): self.is_a_number("1") diff --git a/variables/assignment.py b/variables/assignment.py index c2a5ac0..c278e2b 100644 --- a/variables/assignment.py +++ b/variables/assignment.py @@ -6,11 +6,11 @@ class AssignmentTask(unittest.TestCase): """ - navn == "Elvebakken" - navn == navn + " VGS" + navn = "Elvebakken" + navn = navn + " VGS" def test(self): - self.assertEquals(navn, "Elvebakken VGS") + self.assertEqual(AssignmentTask.navn, "Elvebakken VGS") if __name__ == '__main__': diff --git a/variables/baggage_calculator.py b/variables/baggage_calculator.py index e7f65bc..8778463 100644 --- a/variables/baggage_calculator.py +++ b/variables/baggage_calculator.py @@ -1,4 +1,5 @@ import unittest +import math """ @@ -11,15 +12,19 @@ Prisen er per begynte kilo rundet oppover. """ def bagasje_overvekt(vekt): - pris = 0 - return pris + if vekt > 23: + print("Pris " + str(math.ceil(vekt - 23) * 135)) + return math.ceil(vekt - 23) * 135 + else: + print("Pris " + "0") + return 0 class BaggageCalc(unittest.TestCase): def test_underweight(self): - self.assertEquals(bagasje_overvekt(5.5), 0) + self.assertEqual(bagasje_overvekt(5.5), 0) def test_overweight(self): - self.assertEquals(bagasje_overvekt(30), 945) + self.assertEqual(bagasje_overvekt(30), 945) def test_rounded(self): self.assertEqual(bagasje_overvekt(23.5), 135) diff --git a/variables/cockroach.py b/variables/cockroach.py index a67f51a..0e9178b 100644 --- a/variables/cockroach.py +++ b/variables/cockroach.py @@ -1,4 +1,5 @@ import unittest +import math class CockroachTask(unittest.TestCase): """ @@ -13,7 +14,9 @@ class CockroachTask(unittest.TestCase): cm_i_sekundet = 0 def calculate(self, kilometer_i_timen): - self.cm_i_sekundet = 0 # TODO skriv koden her + floatkm = kilometer_i_timen + kmcm = math.floor(floatkm * 100000 / 60 / 60) + self.cm_i_sekundet = kmcm # TODO skriv koden her def test(self): From 76953b4416c1fe43483cee5668dce4f53d53f9a4 Mon Sep 17 00:00:00 2001 From: Johannes Date: Thu, 9 Sep 2021 09:56:53 +0200 Subject: [PATCH 2/3] Testing Terminal --- .DS_Store | Bin 6148 -> 6148 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/.DS_Store b/.DS_Store index 31b3c14a215c478d0c11dc0937eca7452a02bde3..a2c05cab16ba89cc81726e989ce571cc65f6fbb8 100644 GIT binary patch literal 6148 zcmeHKO-chX7=6)-;}237f*``2px_Ngoh}4*VGp2fr?$nZGx)cjy?5{m9>PnwaqSs& zqwh;1%w#GEf=J0%l9x%|mwexACusnvz1w65XaWdW1RKk&rkIRNso9+EStlx);~>rY zy)^6bStj)674QoDZw2JtZJ>oA#<+3b-(8NiKD6m1mcMx94snSLR~R@xkB(1(e)Uu3 zs}{G8?a~@GemdOg^s`B>BQRBsGs)uE?mNNr>(|t}=^^IVYkM zi?q8)aqZ-@?c~3pJ^J)!U$r2u2nQgL>;=rLO?Q2D`Pft^fKHL+Kz!77K&yp(*1^G_J~CF_gVI zDC5rY$npz=#vMwp%z5m}%HB|vy?Cfl)1e}RzV-@u1*!_no5!Y{|LyPZ|5YddCJ*u~2NHo+2aD!~pBb1|lqz`B`E%i*X3DY;53W-ptOy&jD1kS&-v9 V^JIPzLq>+lHayasV? Date: Fri, 10 Sep 2021 11:15:52 +0200 Subject: [PATCH 3/3] Added a few buttons --- .DS_Store | Bin 6148 -> 6148 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/.DS_Store b/.DS_Store index a2c05cab16ba89cc81726e989ce571cc65f6fbb8..3332529770ae429de347137020e4347649cfbaac 100644 GIT binary patch delta 31 ncmZoMXfc@J&&abeU^g=(&tx8!_|3+wSC}R?oY>6H@s}R}pcD#= delta 225 zcmZoMXfc@J&nUPtU^g?P;A9?__<9b8WK`&xlb@WFlb^)Ez#zcDz^Dhrvj4#VD8j&i zp*|9>>lEaP=vs_Ru&&^N4p%7JFK?bs=o6}fs LGHqt(_{$Ff;odoH