Merge branch 'main' into batches_multiprocess

cms-patatrack · Nov 7, 2023 · d30ba76 · d30ba76
2 parents fdfab16 + 8cfabff
commit d30ba76
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/optimizer/objective.py b/optimizer/objective.py
@@ -9,6 +9,7 @@ def __init__(self, objective_functions, num_objectives = None) -> None:
             self.num_objectives = num_objectives
         pass
 
+
     def evaluate(self, items, worker_id=0):
         return np.array([objective_function([item for item in items], worker_id) for objective_function in self.objective_functions])
 
@@ -24,4 +25,4 @@ def evaluate(self, items, worker_id=0):
 
 class BatchObjective(Objective):
     def __init__(self, objective_functions, num_objectives=None) -> None:
-        super().__init__(objective_functions, num_objectives)
+        super().__init__(objective_functions, num_objectives)
diff --git a/tests/schaffer.py b/tests/schaffer.py
@@ -24,8 +24,10 @@ def f(params):
 optimizer.FileManager.working_dir="tmp/schaffer/"
 optimizer.FileManager.loading_enabled = True
 
-pso = optimizer.MOPSO(objective_functions=[f],lower_bounds=lb, upper_bounds=ub, 
-            num_objectives=2, num_particles=num_agents, num_iterations=num_iterations, 
+objective = optimizer.Objective([f])
+
+pso = optimizer.MOPSO(objective=objective,lower_bounds=lb, upper_bounds=ub, 
+            num_particles=num_agents, num_iterations=num_iterations, 
             inertia_weight=0.5, cognitive_coefficient=1, social_coefficient=1, 
             max_iter_no_improv=None, optimization_mode='global')