Code bizarre
C'est quoi cette disjonction de cas ?
if tsp["EDGE_WEIGHT_TYPE"] == "EUC_2D" or tsp["DISPLAY_DATA_TYPE"] == "TWOD_DISPLAY":
cities.append(read_euc_2d_city(words, i))
elif tsp["EDGE_WEIGHT_TYPE"] == "EUC_3D":
cities.append(read_euc_3d_city(words, i))
elif tsp["EDGE_WEIGHT_TYPE"] == "MAX_2D":
cities.append(read_max_2d_city(words, i))
elif tsp["EDGE_WEIGHT_TYPE"] == "MAX_3D":
cities.append(read_max_3d_city(words, i))
elif tsp["EDGE_WEIGHT_TYPE"] == "MAN_2D":
cities.append(read_man_2d_city(words, i))
elif tsp["EDGE_WEIGHT_TYPE"] == "MAN_3D":
cities.append(read_man_3d_city(words, i))
elif tsp["EDGE_WEIGHT_TYPE"] == "GEO":
cities.append(read_geo_city(words, i))
elif tsp["EDGE_WEIGHT_TYPE"] == "EXPLICIT":
if tsp["DISPLAY_DATA_TYPE"] == "TWOD_DISPLAY" or tsp["NODE_COORD_TYPE"] == "TWOD_COORDS":
cities.append(read_explicit_2d_city(words, i))
elif tsp["NODE_COORD_TYPE"] == "TWOD_COORDS":
cities.append(read_explicit_3d_city(words, i))
else:
print("Unmatched coordinate type: " + tsp["EDGE_WEIGHT_TYPE"])
C'est trop bizarre ... le node coord type n'a aucun intérêt quand le edge weight est explicit ....