From 3cb51c405ad1fe47aace8dcb4de7fa5b586fe584 Mon Sep 17 00:00:00 2001
From: Jacob Theisen <jacobth@stud.ntnu.no>
Date: Tue, 23 Nov 2021 15:57:55 +0100
Subject: [PATCH] =?UTF-8?q?f=C3=B8kk?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 4 ++++
ov9/program1.py | 10 +++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore
index 64b8786..928c4e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,10 @@
/ov8/test_files/opg8-2021.pdf
/ov9/test_files/kanter.txt
+/ov9/test_files/kanter.txt.1
/ov9/test_files/noder.txt
+/ov9/test_files/noder.txt.1
/ov9/test_files/interessepkt.txt
+/ov9/test_files/interessepkt.txt.1
+
diff --git a/ov9/program1.py b/ov9/program1.py
index 591198a..6121084 100644
--- a/ov9/program1.py
+++ b/ov9/program1.py
@@ -32,7 +32,7 @@ class results(object):
#prep nodes
-with open('./test_files/noder.txt','r') as file:
+with open('./test_files/noder.txt.1','r') as file:
node_file = file.read()
node_file = node_file.split()
@@ -45,7 +45,7 @@ for i in range(0, len(node_file), 3):
node_arr.append(nodes(int(node_file[i]), float(node_file[i+1]), float(node_file[i+2])))
#prep edges
-with open('./test_files/kanter.txt','r') as file:
+with open('./test_files/kanter.txt.1','r') as file:
edge_file = file.read()
edge_file = edge_file.split()
@@ -58,7 +58,7 @@ for i in range(0, len(edge_file), 5):
edge_arr.append(edges(int(edge_file[i]), int(edge_file[i+1]), int(edge_file[i+2]), int(edge_file[i+3]), int(edge_file[i+4])))
#prep intresting
-with open('./test_files/interessepkt.txt','r') as file:
+with open('./test_files/interessepkt.txt.1','r') as file:
intresting_file = file.read()
intresting_file = intresting_file.split('\n')
@@ -163,8 +163,8 @@ def init_things():
if len(sys.argv) > 1:
if sys.argv[1] == '-d':
#node_id
- start = 20
- slutt = 400
+ start = 6368906
+ slutt = 6789998
init_table()
queue.put(0)
start_node = next(a for a in res_arr if a.node == start)
--
GitLab