Commit 817a39a8 authored by Aliaume Lopez's avatar Aliaume Lopez

Prout prout mothefaka !

parent 2cb60db7
...@@ -372,4 +372,4 @@ def test_separation_on_file (filename): ...@@ -372,4 +372,4 @@ def test_separation_on_file (filename):
test_separation_on_file("rd100") test_separation_on_file("brazil58")
from collections import deque from collections import deque
from city import GeoCoord, GeoCity, Euc_2D from city import GeoCoord, GeoCity, Euc_2D, Explicit_2D
from graph import Graph from graph import Graph
import logging import logging
...@@ -330,7 +330,7 @@ def read_tsp_file(path): ...@@ -330,7 +330,7 @@ def read_tsp_file(path):
g = Graph (tsp["NODES"], None) g = Graph (tsp["NODES"], None)
elif tsp["DISPLAY"] == []: elif tsp["DISPLAY"] == []:
# raise ValueError ("Matrice ... impossible à parser") # 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: else:
# raise ValueError ("Matrice ... impossible à parser") # raise ValueError ("Matrice ... impossible à parser")
g = Graph (tsp["DISPLAY"], tsp["MATRIX"]) g = Graph (tsp["DISPLAY"], tsp["MATRIX"])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment