Prout prout mothefaka !

new_separation.py

@@ -372,4 +372,4 @@ def test_separation_on_file (filename):
     
     
     
-test_separation_on_file("rd100")
+test_separation_on_file("brazil58")

parser.py

 from collections import deque
-from city        import GeoCoord, GeoCity, Euc_2D
+from city        import GeoCoord, GeoCity, Euc_2D, Explicit_2D
 from graph       import Graph
 import logging
 
@@ -330,7 +330,7 @@ def read_tsp_file(path):
         g = Graph (tsp["NODES"], None)
     elif tsp["DISPLAY"] == []:
         # raise ValueError ("Matrice ... impossible à parser")
-        g = Graph ([ Euc_2D (number=i) for i in range (len (tsp["MATRIX"])) ], tsp["MATRIX"])
+        g = Graph ([Explicit_2D  (number=i) for i in range (len (tsp["MATRIX"])) ], tsp["MATRIX"])
     else:
         # raise ValueError ("Matrice ... impossible à parser")
         g = Graph (tsp["DISPLAY"], tsp["MATRIX"])