Mokudik nem rekurzivan, de nem eleg gyors az mi hazihoz...

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,15 +67,24 @@ 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)
+        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
 
-        dijkstra(route_to_calc[x], route_to_calc[x+1])
+            if(cntr > 0):
+                dijkstra(corresponding_point, route_to_calc[x+1])
 
         distance.clear()
         seen.clear()
 
-
 def calc_route_length(a, b):
     
     # X koordinata lekerese es szamolasa a pitagorasz tetelhez