Merge pull request #281 from gemini-hlsw/SCHED-408

Sched 408: Add Selection to schedule method

scheduler/core/builder/builder.py

@@ -34,5 +34,5 @@ def build_selector(collector: Collector, num_nights_to_schedule: int):
         return Selector(collector=collector, num_nights_to_schedule=num_nights_to_schedule)
 
     @staticmethod
-    def build_optimizer(selection: Selection, blueprint: OptimizerBlueprint) -> Optimizer:
-        return Optimizer(selection, algorithm=blueprint.algorithm)
+    def build_optimizer(blueprint: OptimizerBlueprint) -> Optimizer:
+        return Optimizer(algorithm=blueprint.algorithm)

scheduler/core/components/optimizer/__init__.py

@@ -19,18 +19,20 @@ class Optimizer:
     All algorithms need to follow the same structure to create a Plan
     """
 
-    def __init__(self, selection: Selection, algorithm=None):
-        self.algorithm = algorithm.setup(selection)
+    def __init__(self, algorithm=None):
+        self.algorithm = algorithm
+        self.selection = None
+        self.period = None
+        self.night_events = None
+
+    def schedule(self, selection: Selection) -> List[Plans]:
+        # Create set of plans for the amount of nights
+        self.selection = selection
+        self.algorithm.setup(selection)
         self.night_events = selection.night_events
         # TODO: Assumes that all sites schedule the same amount of nights
         # if num_nights_optimize is None:
         self.period = len(list(self.night_events.values())[0].time_grid)
-        self.selection: Selection = selection
-        # else:
-        #     self.period = num_nights_optimize
-
-    def schedule(self) -> List[Plans]:
-        # Create set of plans for the amount of nights
         nights = [Plans(self.night_events, night) for night in range(self.period)]
         self.algorithm.schedule(nights)
         return nights

scheduler/core/service/service.py

@@ -51,8 +51,8 @@ def __call__(self):
         selection = selector.select(sites=self.sites)
 
         # Execute the Optimizer.
-        optimizer = self.builder.build_optimizer(selection, Blueprints.optimizer)
-        plans = optimizer.schedule()
+        optimizer = self.builder.build_optimizer(Blueprints.optimizer)
+        plans = optimizer.schedule(selection)
 
         # Calculate plans stats
         plan_summary = calculate_plans_stats(plans, collector, selection)
@@ -134,10 +134,10 @@ def calculate_plans_stats(all_plans: List[Plans],
                 plan.alt_degs.append(alt_degs)
 
             plan.night_stats = NightStats(f'{plan.time_left()} min',
-                                          plan_score,
-                                          Conditions.most_restrictive_conditions(plan_conditions),
-                                          n_toos,
-                                          completion_fraction)
+                                            plan_score,
+                                            Conditions.most_restrictive_conditions(plan_conditions),
+                                            n_toos,
+                                            completion_fraction)
             n_toos = 0
             plan_score = 0
             plan_conditions = []

scheduler/scripts/run_greedymax.py

@@ -156,15 +156,14 @@
         "GreedyMax"
     )
     optimizer = SchedulerBuilder.build_optimizer(
-        selection=selection,
         blueprint=optimizer_blueprint
     )
 
     # TODO: pass these as parameters
     optimizer.period = 1  # number of nights for which to make plans in a single pass
     # optimizer_blueprint.algorithm.show_plots = True # show plots
 
-    plans = optimizer.schedule()
+    plans = optimizer.schedule(selection)
     print_plans(plans)
     print('')
 

scheduler/scripts/run_scheduler.py

@@ -156,10 +156,9 @@
         "DUMMY"
     )
     optimizer = SchedulerBuilder.build_optimizer(
-        selection=selection,
         blueprint=optimizer_blueprint
     )
-    plans = optimizer.schedule()
+    plans = optimizer.schedule(selection)
     print_plans(plans)
 
     # Example for Bryan: