a bit more efficient

Author: mackoo13

algorithm/algorithm.py

@@ -22,12 +22,12 @@ def execute(data):
  nep = 4
  nsp = 2
  ngh = 1
- max_iter = 11
+ max_iter = 9
 
  pool = [AlgorithmUtils.random_solution(data) for _ in range(n)]
 
  for i in range(max_iter):
- # print("Iter ", i)
+ print("Iter ", i)
 
  solutions_ranking = sorted(pool, key=lambda s: calculate_score(data, s), reverse=True)
  elite_solutions = solutions_ranking[0:e]

algorithm/utils.py

@@ -43,9 +43,10 @@ def random_neighbour(data, solution, radius):
  def best_in_neighbourhood(data, solution, radius, number_of_bees):
  neighbours = []
  for _ in range(number_of_bees):
- neighbours.append(AlgorithmUtils.random_neighbour(data, solution, radius))
- best_neighbour = max(neighbours, key=lambda s: calculate_score(data, s))
- return best_neighbour if calculate_score(data, best_neighbour) > calculate_score(data, solution) else solution
+ neighbour = AlgorithmUtils.random_neighbour(data, solution, radius)
+ neighbours.append((neighbour, calculate_score(data, neighbour)))
+ best_neighbour = max(neighbours, key=lambda s: calculate_score(data, s[0]))
+ return best_neighbour[0] if best_neighbour[1] > calculate_score(data, solution) else solution
 
  @staticmethod
  def free_space(data, server, solution):

main.py

@@ -1,17 +1,18 @@
-from utils.solution_checker import check_solution
 from algorithm.algorithm import Algorithm
 from parsers.input_parser import parse_input
-from utils.solution_checker import calculate_score
 
 
 def main():
- input_file = "files/example1.in"
+ # input_file = "files/videos_worth_spreading.in"
+ # input_file = "files/kittens.in"
+ # input_file = "files/example1.in"
+ input_file = "files/trending_today.in"
+
  # solution_file = "files/example1.out"
  # solution = check_solution(input_file, solution_file)
  # print(solution)
 
- algo = Algorithm(5, 3, 1, 4, 2, 1, 11)
- score = algo.execute(parse_input(input_file))
+ score = Algorithm.execute(parse_input(input_file))
  print(score)
 
 if __name__ == '__main__':