return solution

Author: mackoo13

algorithm/algorithm.py

@@ -27,13 +27,13 @@ def execute(data):
  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))
+ solutions_ranking = sorted(pool, key=lambda s: calculate_score(data, s), reverse=True)
  elite_solutions = solutions_ranking[0:e]
  good_solutions = solutions_ranking[e:m]
 
- AlgorithmUtils.print_solution_pool(solutions_ranking)
+ # AlgorithmUtils.print_solution_pool(solutions_ranking)
 
  pool = []
  for es in elite_solutions:
@@ -42,3 +42,6 @@ def execute(data):
  pool.append(AlgorithmUtils.best_in_neighbourhood(data, gs, ngh, nsp))
  for _ in range(n-m):
  pool.append(AlgorithmUtils.random_solution(data))
+
+ print(pool[0])
+ return calculate_score(data, pool[0])

algorithm/utils.py

@@ -8,7 +8,8 @@ class AlgorithmUtils:
  def random_solution(data):
  res = dict()
  for ids in range(data.amount_of_cache_servers):
- res[ids] = [0]
+ random_video = random.randint(0, len(data.videos_sizes)-1)
+ res[ids] = [random_video] if data.videos_sizes[random_video] <= data.cache_size else []
  return res
 
  @staticmethod
@@ -18,7 +19,7 @@ def print_solution_pool(pool):
  @staticmethod
  def random_neighbour(data, solution, radius):
 
- res = solution.copy()
+ res = AlgorithmUtils.solution_copy(solution)
  if radius == 0:
  return res
 
@@ -43,9 +44,19 @@ 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 = min(neighbours, key=lambda s: calculate_score(data, s))
- return best_neighbour if calculate_score(data, best_neighbour) < calculate_score(data, solution) else solution
+ 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
 
  @staticmethod
  def free_space(data, server, solution):
- return 999
+ res = data.cache_size
+ for v in solution[server]:
+ res -= data.videos_sizes[v]
+ return res
+
+ @staticmethod
+ def solution_copy(solution):
+ res = dict()
+ for s in solution:
+ res[s] = solution[s][:]
+ return res

main.py

@@ -1,16 +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"
- solution_file = "files/example1.out"
- solution = check_solution(input_file, solution_file)
- print(solution)
+ # solution_file = "files/example1.out"
+ # solution = check_solution(input_file, solution_file)
+ # print(solution)
 
  algo = Algorithm(5, 3, 1, 4, 2, 1, 11)
- algo.execute(parse_input(input_file))
+ score = algo.execute(parse_input(input_file))
+ print(score)
 
 if __name__ == '__main__':
  main()