fri/p1
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

05_nacrtovanje_poti

Browse Source
This commit is contained in:
Gašper Dobrovoljc
2023-11-16 16:18:51 +01:00
parent 39771d36ce
commit 1cfcb7328b
9 changed files with 310 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
04_angelcin_zapis/__init__.py Normal file
View File

2
04_angelcin_zapis/naloga.py
View File

@@ -5,7 +5,7 @@ def koordinate(s):
return (int(start), int(start) + len(dolzina) - 1)
def vrstica(s):
(stev, *ovire) = s.strip().split()
(stev, *ovire) = s.split()
return list(map(lambda ovira: (*koordinate(ovira), int(stev[1:-1])), ovire))
def preberi(s):

78
04_angelcin_zapis/naloga_test.py
View File

@@ -1,5 +1,7 @@
from .naloga import *
import unittest
from naloga import *
class Obvezna(unittest.TestCase):
def test_koordinate(self):
@@ -9,44 +11,78 @@ class Obvezna(unittest.TestCase):
self.assertEqual((123, 125), koordinate("123---"))
def test_vrstica(self):
self.assertEqual([(1, 3, 4), (5, 11, 4), (15, 15, 4)], vrstica(" (4) 1--- 5------- 15-"))
self.assertEqual(
[(1, 3, 4), (5, 11, 4), (15, 15, 4)], vrstica(" (4) 1--- 5------- 15-")
)
self.assertEqual([(989, 991, 1234)], vrstica("(1234) 989---"))
def test_preberi(self):
self.assertEqual([(5, 6, 4),
(90, 100, 13), (5, 8, 13), (19, 21, 13),
(9, 11, 5), (19, 20, 5), (30, 34, 5),
(9, 11, 4),
(22, 25, 13), (17, 19, 13)], preberi(
""" (4) 5--
self.assertEqual(
[
(5, 6, 4),
(90, 100, 13),
(5, 8, 13),
(19, 21, 13),
(9, 11, 5),
(19, 20, 5),
(30, 34, 5),
(9, 11, 4),
(22, 25, 13),
(17, 19, 13),
],
preberi(
""" (4) 5--
(13) 90----------- 5---- 19---
(5) 9--- 19-- 30-----
(4) 9---
(13) 22---- 17---
"""))
"""
),
)
def test_intervali(self):
self.assertEqual(["6-----", "12-", "20---", "98-----"], intervali([(6, 10), (12, 12), (20, 22), (98, 102)]))
self.assertEqual(
["6-----", "12-", "20---", "98-----"],
intervali([(6, 10), (12, 12), (20, 22), (98, 102)]),
)
def test_zapisi_vrstico(self):
self.assertEqual("(5) 6----- 12-", zapisi_vrstico(5, [(6, 10), (12, 12)]).rstrip("\n"))
self.assertEqual("(8) 6----- 12- 20--- 98-----", zapisi_vrstico(8, [(6, 10), (12, 12), (20, 22), (98, 102)]).rstrip("\n"))
self.assertEqual("(8) 6----- 12- 20--- 98-----", zapisi_vrstico(8, [(6, 10), (12, 12), (20, 22), (98, 102)]).rstrip("\n"))
self.assertEqual(
"(5) 6----- 12-", zapisi_vrstico(5, [(6, 10), (12, 12)]).rstrip("\n")
)
self.assertEqual(
"(8) 6----- 12- 20--- 98-----",
zapisi_vrstico(8, [(6, 10), (12, 12), (20, 22), (98, 102)]).rstrip("\n"),
)
self.assertEqual(
"(8) 6----- 12- 20--- 98-----",
zapisi_vrstico(8, [(6, 10), (12, 12), (20, 22), (98, 102)]).rstrip("\n"),
)
class Dodatna(unittest.TestCase):
def test_zapisi(self):
ovire = [(5, 6, 4),
(90, 100, 13), (5, 8, 13), (9, 11, 13),
(9, 11, 5), (19, 20, 5), (30, 34, 5),
(9, 11, 4),
(22, 25, 13), (17, 19, 13)]
ovire = [
(5, 6, 4),
(90, 100, 13),
(5, 8, 13),
(9, 11, 13),
(9, 11, 5),
(19, 20, 5),
(30, 34, 5),
(9, 11, 4),
(22, 25, 13),
(17, 19, 13),
]
kopija_ovir = ovire.copy()
self.assertEqual("""(4) 5-- 9---
self.assertEqual(
"""(4) 5-- 9---
(5) 9--- 19-- 30-----
(13) 5---- 9--- 17--- 22---- 90-----------""", zapisi(ovire).rstrip("\n"))
(13) 5---- 9--- 17--- 22---- 90-----------""",
zapisi(ovire).rstrip("\n"),
)
self.assertEqual(ovire, kopija_ovir, "Pusti seznam `ovire` pri miru")
if __name__ == "__main__":
unittest.main()
unittest.main()