From 24acbb888260bf4684cba2e70eff07ffe490edd5 Mon Sep 17 00:00:00 2001
From: Jacob Theisen <jacobth@stud.ntnu.no>
Date: Fri, 19 Nov 2021 15:52:39 +0100
Subject: [PATCH] kjordaibakke
---
ov9/program1.py | 49 ++++++++++++++++++++++++++++++---
ov9/test_files/interessepkt.txt | 2 +-
2 files changed, 46 insertions(+), 5 deletions(-)
diff --git a/ov9/program1.py b/ov9/program1.py
index a0cd146..102505c 100644
--- a/ov9/program1.py
+++ b/ov9/program1.py
@@ -1,7 +1,5 @@
-
-
class int_points (object):
def __init__(self, id, type, name):
self.id = id
@@ -9,7 +7,8 @@ class int_points (object):
self.name = name
class nodes (object):
- def __init__(self, bredde, lengde):
+ def __init__(self, node, bredde, lengde):
+ self.node = node
self.bredde = bredde
self.lengde = lengde
@@ -19,4 +18,46 @@ class edges (object):
self.til = til
self.time = time
self.lenght = lenght
- self.speed = speed
\ No newline at end of file
+ self.speed = speed
+
+with open('./test_files/noder.txt','r') as file:
+ node_file = file.read()
+
+node_file = node_file.split()
+num_of_nodes = node_file[0]
+node_file.pop(0)
+
+node_arr = []
+for i in range(0, len(node_file), 3):
+ #nodenr breddegrad lengdegrad
+ node_arr.append(nodes(node_file[i], node_file[i+1], node_file[i+2]))
+
+
+with open('./test_files/kanter.txt','r') as file:
+ edge_file = file.read()
+
+edge_file = edge_file.split()
+num_of_edges = edge_file[0]
+edge_file.pop(0)
+
+edge_arr = []
+for i in range(0, len(edge_file), 5):
+ #franode tilnode kjøretid lengde fartsgrense
+ edge_arr.append(edges(edge_file[i], edge_file[i+1], edge_file[i+2], edge_file[i+3], edge_file[i+4]))
+
+
+with open('./test_files/interessepkt.txt','r') as file:
+ intresting_file = file.read()
+
+intresting_file = intresting_file.split('\n')
+num_of_intresting = intresting_file[0]
+intresting_file.pop(0)
+
+intresting_arr = []
+for i in range(len(intresting_file)):
+ #nodenr kode "Navn på stedet"
+ tmp_values = intresting_file[i].split()
+ intresting_arr.append(int_points(tmp_values[0], tmp_values[1], ' '.join(tmp_values[2:])))
+
+
+
diff --git a/ov9/test_files/interessepkt.txt b/ov9/test_files/interessepkt.txt
index 2a23068..d84a634 100644
--- a/ov9/test_files/interessepkt.txt
+++ b/ov9/test_files/interessepkt.txt
@@ -1374,4 +1374,4 @@
18785 4 "Ísorka Hleðslustöð"
34442 4 "Orkusalan Hleðslustöð"
26242 4 "N1 Hleðslustöð"
-46787 4 "Tesla Supercharger Hofn"
+46787 4 "Tesla Supercharger Hofn"
\ No newline at end of file
--
GitLab