maggicl/AICup
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

local

Browse source
This commit is contained in:
UmbertoJr 2019-11-18 11:51:20 +01:00
parent e21034d9ca
commit 9024e5d574
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/local_search.py
View file

@ -93,10 +93,12 @@ class TwoDotFiveOpt:
@staticmethod @staticmethod
def shift_gain1(i, j, tsp_sequence, matrix_dist): def shift_gain1(i, j, tsp_sequence, matrix_dist):
old_link_len = (matrix_dist[tsp_sequence[i], tsp_sequence[i - 1]] + matrix_dist[ old_link_len = (matrix_dist[tsp_sequence[i], tsp_sequence[i - 1]] +
tsp_s equence[i], tsp_sequence[i + 1]] + matrix_dist[tsp_sequence[j], tsp_sequence[j + 1]]) matrix_dist[tsp_sequence[i], tsp_sequence[i + 1]] +
changed_links_len = (matrix_dist[tsp_sequence[i - 1], tsp_sequence[i + 1]] + matrix_dist[ matrix_dist[tsp_sequence[j], tsp_sequence[j + 1]])
tsp_sequence[i], tsp_sequence[j]] + matrix_dist[tsp_sequence[i], tsp_sequence[j + 1]]) changed_links_len = (matrix_dist[tsp_sequence[i - 1], tsp_sequence[i + 1]] +
matrix_dist[tsp_sequence[i], tsp_sequence[j]]
+ matrix_dist[tsp_sequence[i], tsp_sequence[j + 1]])
return - old_link_len + changed_links_len return - old_link_len + changed_links_len
@staticmethod @staticmethod