chavalitros
/
MH-P1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor fitness calculation using combinations

This commit is contained in:
coolneng 2021-05-19 20:43:14 +02:00
parent 9a4831e31e
commit 550f0bb043
Signed by: coolneng
GPG Key ID: 9893DA236405AF57
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main.py
View File

@ -3,6 +3,7 @@ from greedy import greedy_algorithm
from local_search import local_search from local_search import local_search
from sys import argv from sys import argv
from time import time from time import time
from itertools import combinations
def execute_algorithm(choice, n, m, data): def execute_algorithm(choice, n, m, data):
@ -25,13 +26,14 @@ def get_row_distance(source, destination, data):
def get_fitness(solutions, data): def get_fitness(solutions, data):
counter = 0 counter = 0
for i in range(len(solutions) - 1): comb = combinations(solutions.index, r=2)
for j in range(i + 1, len(solutions)): for index in list(comb):
counter += get_row_distance( elements = solutions.loc[index, :]
source=solutions["point"].iloc[i], counter += get_row_distance(
destination=solutions["point"].iloc[j], source=elements["point"].head(n=1).values[0],
data=data, destination=elements["point"].tail(n=1).values[0],
) data=data,
)
return counter return counter