From 8ced4d893c5a770b1a2a4f33603d8d49e57a7ca3 Mon Sep 17 00:00:00 2001 From: IceWafflez Date: Wed, 8 Sep 2021 10:54:16 +0200 Subject: [PATCH 1/2] s --- conditionals/valid_baggage.py | 7 ++++++- lists/fixSnake.py | 2 +- loops/countingList.py | 8 +++++++- loops/sumList.py | 6 +++++- variables/IsItANumber.py | 6 +++++- variables/assignment.py | 6 ++++-- variables/baggage_calculator.py | 8 +++++++- variables/cockroach.py | 7 ++++--- 8 files changed, 39 insertions(+), 11 deletions(-) diff --git a/conditionals/valid_baggage.py b/conditionals/valid_baggage.py index b9e5678..c5f68f5 100644 --- a/conditionals/valid_baggage.py +++ b/conditionals/valid_baggage.py @@ -11,7 +11,12 @@ """ def gyldig_bagasje(vekt): - gyldig = True + if vekt > 32: + gyldig = False + elif vekt < 2: + gyldig = False + else: + gyldig = True return gyldig class BaggageValidator(unittest.TestCase): diff --git a/lists/fixSnake.py b/lists/fixSnake.py index 76cc72b..ae878bb 100644 --- a/lists/fixSnake.py +++ b/lists/fixSnake.py @@ -9,7 +9,7 @@ """ def fixSnake(snake): - # TODO fiks slange + snake.reverse() return snake class FixSnake(unittest.TestCase): diff --git a/loops/countingList.py b/loops/countingList.py index 9338286..5867c30 100644 --- a/loops/countingList.py +++ b/loops/countingList.py @@ -8,7 +8,13 @@ """ def telle_sauer(antall): - return [] + add = 0 + tom= [] + for i in range (antall): + add = add +1 + tom.append(add) + + return tom class CountingList(unittest.TestCase): def test(self): diff --git a/loops/sumList.py b/loops/sumList.py index 453991f..9ba32ed 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 + sum = 0 + for i in liste: + if i > 0: + sum = sum + i + return sum class CountingList(unittest.TestCase): def basic_test_cases(self): diff --git a/variables/IsItANumber.py b/variables/IsItANumber.py index 7697332..c61cdaf 100644 --- a/variables/IsItANumber.py +++ b/variables/IsItANumber.py @@ -8,7 +8,11 @@ class IsItANumberTask(unittest.TestCase): is_number = False def is_a_number(self, maybe_number): - ## TODO SKRIV KODEN HER + a = self.is_number + if (self.maybe_number.isnumeric() == True): + return True + else: + return False is_number = False def test_true(self): diff --git a/variables/assignment.py b/variables/assignment.py index c2a5ac0..f24b3ad 100644 --- a/variables/assignment.py +++ b/variables/assignment.py @@ -1,13 +1,15 @@ import unittest +navn = "Elvebakken" +navn = navn + " VGS" class AssignmentTask(unittest.TestCase): """ I denne oppgaven blir ikke variabelen som skal ha navnet på skolen opprettet riktig. Finner du feilen? """ - navn == "Elvebakken" - navn == navn + " VGS" + navn = "Elvebakken" + navn = navn + " VGS" def test(self): self.assertEquals(navn, "Elvebakken VGS") diff --git a/variables/baggage_calculator.py b/variables/baggage_calculator.py index e7f65bc..8096711 100644 --- a/variables/baggage_calculator.py +++ b/variables/baggage_calculator.py @@ -1,5 +1,5 @@ import unittest - +import math """ Norwegian beskriver reglene for bagasje slik: @@ -12,6 +12,12 @@ """ def bagasje_overvekt(vekt): pris = 0 + if vekt > 23: + a = math.ceil(vekt) + ekstra_pris = 135 + ekstra_kilo = a - 23 + pris = ekstra_pris * ekstra_kilo + return pris class BaggageCalc(unittest.TestCase): diff --git a/variables/cockroach.py b/variables/cockroach.py index a67f51a..bdf83e4 100644 --- a/variables/cockroach.py +++ b/variables/cockroach.py @@ -1,3 +1,4 @@ +import math import unittest class CockroachTask(unittest.TestCase): @@ -13,9 +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 - - + self.cm_i_sekundet = math.floor(kilometer_i_timen *27.7778) + return self.cm_i_sekundet + def test(self): self.calculate(1.08) self.assertEquals(self.cm_i_sekundet, 30) From db4abe476d9fc62cfb017138378bbc169933b4bb Mon Sep 17 00:00:00 2001 From: IceWafflez Date: Wed, 8 Sep 2021 11:29:21 +0200 Subject: [PATCH 2/2] ferdig --- variables/IsItANumber.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/variables/IsItANumber.py b/variables/IsItANumber.py index c61cdaf..c282298 100644 --- a/variables/IsItANumber.py +++ b/variables/IsItANumber.py @@ -8,12 +8,11 @@ class IsItANumberTask(unittest.TestCase): is_number = False def is_a_number(self, maybe_number): - a = self.is_number - if (self.maybe_number.isnumeric() == True): - return True - else: - return False - is_number = False + try: + float(maybe_number) + self.is_number = True + except: + self.is_number = False def test_true(self): self.is_a_number("1") @@ -22,7 +21,7 @@ def test_true(self): def test_false(self): self.is_a_number("Tekst") - self.assertTrue(self.is_number, False) + self.assertFalse(self.is_number, False) def test_pi(self): self.is_a_number("3.14") @@ -30,7 +29,7 @@ def test_pi(self): def test_spaces(self): self.is_a_number("3 4") - self.assertTrue(self.is_number, False) + self.assertFalse(self.is_number, False) def test_untrimmed(self): self.is_a_number("3 ")