diff --git a/GG2DP5_hf01.zip b/GG2DP5_hf01.zip
index 25b7423e61914151b2e2538fbd2e2ff232668e39..e9faf25b8660fd58272dcb02dabaa23997e81489 100644
Binary files a/GG2DP5_hf01.zip and b/GG2DP5_hf01.zip differ
diff --git a/input4 b/input4
index 7a12b0ff9eb59d6ece003952836ec69b93839429..50086a2e9fe4a9dd8f517eac63473b78bd7dce21 100644
--- a/input4
+++ b/input4
@@ -910,4 +910,4 @@
52 489
-128 298
159 409
--14 42
\ No newline at end of file
+-14 42
diff --git a/mi_GG2DP5_hf1.py b/mi_GG2DP5_hf1.py
index 7d2962703d4a15683d3560eb260cba8e293a713e..71a6853e8b651e20695d0111d9bbbbd56e5fe81a 100644
--- a/mi_GG2DP5_hf1.py
+++ b/mi_GG2DP5_hf1.py
@@ -52,29 +52,6 @@ def dijkstra(a, b):
if( length + distance[a] < distance[route_between_points[i]]):
distance[route_between_points[i]] = length + distance[a]
-
- minimum_distance = math.inf
- corresponding_point = None
- cntr = 0
- i = 0
- #print("*** debug: " + str(len(seen)), file=sys.stderr)
- for i in range(0, len(seen), 1):
- #print("*** debug: " + str(distance[i]), file=sys.stderr)
- #print("*** debug: " + str(seen[i]), file=sys.stderr)
- #print("*** /debug ******* ", file=sys.stderr)
- if(seen[i] == 0 and (distance[i] != None)): #Meghivni ra a dijkstra algoritmust rekurzivan, ha mar szamoltuk, de ne jartunk meg benne
- cntr += 1
- #print("*** debug: talalt pontot amiben meg nem volt", file=sys.stderr)
- if(distance[i] < minimum_distance): # Es legkisebb a tavolsaga eddig
- minimum_distance = distance[i]
- corresponding_point = i
-
- if(cntr > 0):
- dijkstra(corresponding_point, b)
-
-
-
-
def route_search():
asd = len(point_coordinates)
asd = asd/2
@@ -90,14 +67,23 @@ def route_search():
for i in range(asd):
seen.append(0)
- #print("**** debug: " + str(distance), file=sys.stderr)
- #print("**** debug: " + str(seen), file=sys.stderr)
-
- dijkstra(route_to_calc[x], route_to_calc[x+1])
+ for y in range(map_config[1]):
+ minimum_distance = math.inf
+ corresponding_point = None
+ cntr = 0
+ i = 0
+ for i in range(0, len(seen), 1):
+ if(seen[i] == 0 and (distance[i] != None)): #Meghivni ra a dijkstra algoritmust rekurzivan, ha mar szamoltuk, de ne jartunk meg benne
+ cntr += 1
+ if(distance[i] < minimum_distance): # Es legkisebb a tavolsaga eddig
+ minimum_distance = distance[i]
+ corresponding_point = i
+
+ if(cntr > 0):
+ dijkstra(corresponding_point, route_to_calc[x+1])
distance.clear()
seen.clear()
-
def calc_route_length(a, b):