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:33:04 +01:00
parent c64ad97f03
commit c43f9c3b9a
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/local_search.py
View file

@ -137,15 +137,7 @@ class TwoDotFiveOpt:
return - old_link_len + changed_links_len return - old_link_len + changed_links_len
@staticmethod @staticmethod
def loop2dot5opt(solution, instance, def loop2dot5opt(solution, instance, max_num_of_changes=10000):
max_num_of_changes=10000): # Iterate stoep2opt max_iter times (2-opt local search)
"""
@param solution:
@param instance:
@param max_num_of_changes:
@return:
"""
matrix_dist = instance.dist_matrix matrix_dist = instance.dist_matrix
actual_len = compute_lenght(solution, matrix_dist) actual_len = compute_lenght(solution, matrix_dist)
new_tsp_sequence = np.copy(np.array(solution)) new_tsp_sequence = np.copy(np.array(solution))
@ -159,5 +151,4 @@ class TwoDotFiveOpt:
else: else:
return new_tsp_sequence.tolist() return new_tsp_sequence.tolist()
# return new_tsp_sequence.tolist(), actual_len, uncross
return new_tsp_sequence.tolist() return new_tsp_sequence.tolist()