Marto/Kolesarjenje_Po_Manhattnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ocena 6 - fin

Browse Source
This commit is contained in:
Martin Vrhovšek 2024-12-05 16:11:55 +01:00
parent 24ad9e7b8b
commit 03681ab939
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
program.py
View File

@ -51,8 +51,11 @@ def generiraj_tuples_povezava(povezava):
z0 = x0 z0 = x0
z1 = x1 z1 = x1
for ipsilon in range(z0, z1 + 1): for i in range(z0, z1 + 1):
r = (x0, ipsilon) if x0 == x1:
r = (x0, i)
else:
r = (i, y0)
pov.append(r) pov.append(r)
return pov return pov
@ -60,19 +63,15 @@ def generiraj_tuples_povezava(povezava):
def secisce(povezava1, povezava2): def secisce(povezava1, povezava2):
if not pravilna(povezava1) and not pravilna(povezava2): return None if not pravilna(povezava1) and not pravilna(povezava2): return None
povezava1 = urejena(povezava1)
povezava2 = urejena(povezava2)
pov1 = generiraj_tuples_povezava(urejena(povezava1)) pov1 = generiraj_tuples_povezava(urejena(povezava1))
pov2 = generiraj_tuples_povezava(urejena(povezava2)) pov2 = generiraj_tuples_povezava(urejena(povezava2))
for i in pov1:
for j in pov2:
if i == j:
return i
return None
print(povezava1)
print(pov1)
def main(): def main():
povezave = [ povezave = [
@ -97,6 +96,6 @@ def main():
# print(povezave_tocke(3, 15, povezave)) # print(povezave_tocke(3, 15, povezave))
print(secisce((10, 20, 10, 25), (8, 22, 18, 22))) print(secisce((10, 20, 10, 25), (8, 22, 18, 22)))
# print(secisce((8, 20, 18, 20), (1, 25, 0, 25))) print(secisce((8, 20, 18, 20), (1, 25, 0, 25)))
main() main()