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

local

This commit is contained in:
UmbertoJr 2019-11-18 11:34:31 +01:00
parent c43f9c3b9a
commit e21034d9ca
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/local_search.py
View File

@ -11,13 +11,6 @@ class TwoOpt:
@staticmethod @staticmethod
def step2opt(solution, matrix_dist, distance): def step2opt(solution, matrix_dist, distance):
"""
One step of 2opt, one double loop and return first improved sequence
@param solution:
@param matrix_dist:
@param distance:
@return:
"""
seq_length = len(solution) - 1 seq_length = len(solution) - 1
tsp_sequence = np.array(solution) tsp_sequence = np.array(solution)
uncrosses = 0 uncrosses = 0
@ -46,15 +39,7 @@ class TwoOpt:
return - old_link_len + changed_links_len return - old_link_len + changed_links_len
@staticmethod @staticmethod
def loop2opt(solution, instance, def loop2opt(solution, instance, max_num_of_uncrosses=10000):
max_num_of_uncrosses=10000): # Iterate step2opt max_iter times (2-opt local search)
"""
@param solution:
@param instance:
@param max_num_of_uncrosses:
@return:
"""
matrix_dist = instance.dist_matrix matrix_dist = instance.dist_matrix
new_len = compute_lenght(solution, matrix_dist) new_len = compute_lenght(solution, matrix_dist)
new_tsp_sequence = np.copy(np.array(solution)) new_tsp_sequence = np.copy(np.array(solution))
@ -75,13 +60,6 @@ class TwoDotFiveOpt:
@staticmethod @staticmethod
def step2dot5opt(solution, matrix_dist, distance): def step2dot5opt(solution, matrix_dist, distance):
"""
One step of 2opt, one double loop and return first improved sequence
@param solution:
@param matrix_dist:
@param distance:
@return:
"""
seq_length = len(solution) - 2 seq_length = len(solution) - 2
tsp_sequence = np.array(solution) tsp_sequence = np.array(solution)
uncrosses = 0 uncrosses = 0
@ -116,7 +94,7 @@ 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]] + matrix_dist[
tsp_sequence[i], tsp_sequence[i + 1]] + matrix_dist[tsp_sequence[j], tsp_sequence[j + 1]]) tsp_s equence[i], tsp_sequence[i + 1]] + matrix_dist[tsp_sequence[j], tsp_sequence[j + 1]])
changed_links_len = (matrix_dist[tsp_sequence[i - 1], tsp_sequence[i + 1]] + matrix_dist[ 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]]) 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