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

Remove selected solution from dataset properly

This commit is contained in:
coolneng 2021-04-12 12:58:23 +02:00
parent 04c92add44
commit a81756e93b
Signed by: coolneng
GPG Key ID: 9893DA236405AF57
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/processing.py
View File

@ -29,20 +29,22 @@ def get_furthest_element(element, data):
furthest_index = element_df["distance"].astype(float).idxmax() furthest_index = element_df["distance"].astype(float).idxmax()
furthest_row = data.iloc[furthest_index] furthest_row = data.iloc[furthest_index]
furthest_point = get_different_element(original=element, row=furthest_row) furthest_point = get_different_element(original=element, row=furthest_row)
furthest_element = {"point": furthest_point, "distance": furthest_row["distance"]} return {"point": furthest_point, "distance": furthest_row["distance"]}
return furthest_element, furthest_index
def remove_solution_dataset(data, solution):
return data.query(f"source != {solution} and destination != {solution}")
# FIXME Remove duplicated elements properly
def greedy_algorithm(n, m, data): def greedy_algorithm(n, m, data):
solutions = DataFrame(columns=["point", "distance"]) solutions = DataFrame(columns=["point", "distance"])
first_solution = get_first_solution(n, data) first_solution = get_first_solution(n, data)
solutions = solutions.append(first_solution, ignore_index=True) solutions = solutions.append(first_solution, ignore_index=True)
for _ in range(m): for _ in range(m):
last_solution = solutions["point"].tail(n=1) last_solution = int(solutions["point"].tail(n=1))
centroid, index = get_furthest_element(element=int(last_solution), data=data) centroid = get_furthest_element(element=last_solution, data=data)
solutions = solutions.append(dict(centroid), ignore_index=True) solutions = solutions.append(dict(centroid), ignore_index=True)
data = data.drop(index) data = remove_solution_dataset(data=data, solution=last_solution)
return solutions return solutions
@ -72,9 +74,11 @@ def execute_algorithm(choice, n, m, data):
def show_results(solutions): def show_results(solutions):
distance_sum = solutions["distance"].sum() distance_sum = solutions["distance"].sum()
duplicates = solutions.duplicated()
print(solutions) print(solutions)
print("Total distance: " + str(distance_sum)) print("Total distance: " + str(distance_sum))
print(solutions.duplicated()) if solutions[duplicates].empty:
print("No duplicates found")
def usage(argv): def usage(argv):