addition of parsers arguments is now in different file. Algorithm.execute now takes arguments.

Author: apiechowicz

algorithm/algorithm.py

@@ -3,9 +3,8 @@
 
 
 class Algorithm:
-
  @staticmethod
- def execute(data):
+ def execute(data, n, m, e, nep, nsp, ngh, iterations):
 
  """
  Pomaga myslenie o rozwiazaniach jako o kwiatkach. Kazda pszczola siedzi w danym momencie na jednym konkretnym
@@ -21,18 +20,10 @@ def execute(data):
  max_iter - liczba iteracji
  """
 
- n = 25
- m = 9
- e = 3
- nep = 9
- nsp = 3
- ngh = 1
- max_iter = 1000
-
  # inicjalizujemy pule losowymi rozwiazaniami
  pool = [AlgorithmUtils.random_solution(data) for _ in range(n)]
 
- for i in range(max_iter):
+ for i in range(iterations):
  print("Iter ", i)
 
  # dla kazdego rozwiazania obliczamy wynik - ukladamy je od najlepszych do najgorszych
@@ -54,11 +45,11 @@ def execute(data):
  for gs in good_solutions:
  pool.append(AlgorithmUtils.best_in_neighbourhood(data, gs, ngh, nsp))
  # dla pszczol ktore byly slabe wybieramy dla nich nowe, calkowicie losowe rozwiazania (leca gdzie indziej)
- for _ in range(n-m):
+ for _ in range(n - m):
  pool.append(AlgorithmUtils.random_solution(data))
 
- # podsumowujac - jesli np. n=5, m=3, e=1, to zawsze na koniec iteracji 1 pszczola pochodzi z obszaru
- # elitarnego, 2 z dobrych, a 2 sa losowane od nowa.
+  # podsumowujac - jesli np. n=5, m=3, e=1, to zawsze na koniec iteracji 1 pszczola pochodzi z obszaru
+  # elitarnego, 2 z dobrych, a 2 sa losowane od nowa.
 
  pool = sorted(pool, key=lambda s: calculate_score(data, s), reverse=True)
  return pool[0]

main.py

@@ -1,21 +1,21 @@
 import time
 from argparse import ArgumentParser
-from os.path import join
-
-from os import getcwd
 
 from algorithm.algorithm import Algorithm
 from parsers.input_parser import parse_input
 from parsers.output_builder import save_solution
+from utils.argument_parser_util import add_parser_arguments
 from utils.solution_checker import check_solution
 
 
 def main():
- input_file = args.i
- output_file = args.o
+ input_file, output_file = args.i, args.o
+ n, m, e = args.n, args.m, args.e
+ nep, nsp, ngh = args.nep, args.nsp, args.ngh
+ iterations = args.max
 
  before = time.time()
- best_solution = Algorithm.execute(parse_input(input_file))
+ best_solution = Algorithm.execute(parse_input(input_file), n, m, e, nep, nsp, ngh, iterations)
  save_solution(best_solution, output_file)
  score = check_solution(input_file, output_file)
  after = time.time()
@@ -29,14 +29,6 @@ def main():
 
 if __name__ == "__main__":
  parser = ArgumentParser(description="Distributed cache problem solver.")
-
- default_input_filename = "me_at_the_zoo.in"
- parser.add_argument("-i", "-input_file", help="Path to input file.", type=str,
- default=join(getcwd(), "files", default_input_filename))
-
- default_output_filename = "solution.out"
- parser.add_argument("-o", "-output_file", help="Path to output file.", type=str,
- default=join(getcwd(), "files", default_output_filename))
-
+ add_parser_arguments(parser)
  args = parser.parse_args()
  main()

utils/argument_parser_util.py

@@ -0,0 +1,41 @@
+from os.path import join
+
+from os import getcwd
+
+
+def add_parser_arguments(parser):
+ default_input_filename = "me_at_the_zoo.in"
+ parser.add_argument("-i", "-input_file", help="Path to input file.", type=str,
+ default=join(getcwd(), "files", default_input_filename))
+
+ default_output_filename = "solution.out"
+ parser.add_argument("-o", "-output_file", help="Path to output file.", type=str,
+ default=join(getcwd(), "files", default_output_filename))
+
+ default_n = 25
+ parser.add_argument("-n", "-bees", help="Amount of bees.", type=int,
+ default=default_n)
+
+ default_m = 9
+ parser.add_argument("-m", "-good_solutions", help="Amount of good solutions.", type=int,
+ default=default_m)
+
+ default_e = 3
+ parser.add_argument("-e", "-elite_solutions", help="Amount of elite solutions.", type=int,
+ default=default_e)
+
+ default_nep = 9
+ parser.add_argument("-nep", help="???", type=int,
+ default=default_nep)
+
+ default_nsp = 3
+ parser.add_argument("-nsp", help="???", type=int,
+ default=default_nsp)
+
+ default_ngh = 1
+ parser.add_argument("-ngh", help="Neighborhood radius.", type=int,
+ default=default_ngh)
+
+ default_max_iter = 1000
+ parser.add_argument("-max", "-iterations", help="Amount of iterations.", type=int,
+ default=default_max_iter)