diff --git a/ov8/test_env/HM_compressed_text b/ov8/test_env/HM_compressed_text index 7da038842dbd4f35d086b57517e82a179150618e..55f35ec554422ef52d920b6941fd3b8028838b90 100644 Binary files a/ov8/test_env/HM_compressed_text and b/ov8/test_env/HM_compressed_text differ diff --git a/ov9/README.md b/ov9/README.md new file mode 100644 index 0000000000000000000000000000000000000000..68b6e7e53571a3f22e7ddeda8aca07330685c53b --- /dev/null +++ b/ov9/README.md @@ -0,0 +1 @@ +#python3 program1.py -a/-n \ No newline at end of file diff --git a/ov9/program1.py b/ov9/program1.py index 102505c801b1a6730c1ded34fb903ff307ce0d87..be390179dc9d0e84202bfeb9a471ff510a224d5c 100644 --- a/ov9/program1.py +++ b/ov9/program1.py @@ -1,4 +1,5 @@ - +from math import inf +import sys class int_points (object): def __init__(self, id, type, name): @@ -20,6 +21,14 @@ class edges (object): self.lenght = lenght self.speed = speed +class results(object): + def __init__(self, node, dist, visited): + self.node = node + self.dist = dist + self.visited = visited + + +#prep nodes with open('./test_files/noder.txt','r') as file: node_file = file.read() @@ -32,7 +41,7 @@ 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])) - +#prep edges with open('./test_files/kanter.txt','r') as file: edge_file = file.read() @@ -45,7 +54,7 @@ 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])) - +#prep intresting with open('./test_files/interessepkt.txt','r') as file: intresting_file = file.read() @@ -59,5 +68,43 @@ for i in range(len(intresting_file)): tmp_values = intresting_file[i].split() intresting_arr.append(int_points(tmp_values[0], tmp_values[1], ' '.join(tmp_values[2:]))) +res_arr = [] +def init_table(): + for i in range(len(node_file)): + res_arr.append(results(i, inf, None)) + + + + +queue = [] +def dijkstras(fra, til): + if fra == til: + print('were here') + for i in edge_arr: + if fra == i.fra: + a = [a for a in queue if a.visited == None and a.node == i.til] + if a: + queue.append(i.til) + + + + + + +def init_things(): + if len(sys.argv) > 1: + if sys.argv[1] == '-d': + #node_id + fra = 0 + til = 1 + init_table() + dijkstras(fra, til) + elif sys.argv[1] == '-a': + print('A* not yet implemented') + else: + print('Unknown argument') + else: + print('Missing argument') +init_things() \ No newline at end of file