diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..3332529 Binary files /dev/null and b/.DS_Store differ 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):