Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion conditionals/valid_baggage.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion lists/fixSnake.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

"""
def fixSnake(snake):
# TODO fiks slange
snake.reverse()
return snake

class FixSnake(unittest.TestCase):
Expand Down
8 changes: 7 additions & 1 deletion loops/countingList.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
6 changes: 5 additions & 1 deletion loops/sumList.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
11 changes: 7 additions & 4 deletions variables/IsItANumber.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@ class IsItANumberTask(unittest.TestCase):

is_number = False
def is_a_number(self, maybe_number):
## TODO SKRIV KODEN HER
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")
Expand All @@ -18,15 +21,15 @@ 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")
self.assertTrue(self.is_number, True)

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 ")
Expand Down
6 changes: 4 additions & 2 deletions variables/assignment.py
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
8 changes: 7 additions & 1 deletion variables/baggage_calculator.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import unittest

import math

"""
Norwegian beskriver reglene for bagasje slik:
Expand All @@ -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):
Expand Down
7 changes: 4 additions & 3 deletions variables/cockroach.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import math
import unittest

class CockroachTask(unittest.TestCase):
Expand All @@ -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)
Expand Down