-
-
Notifications
You must be signed in to change notification settings - Fork 118
PriorityScheduler: Update _get_filled_indices() to avoid 'block already occupied' ValueError #550
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
0723f3e
ff6bcd5
ecca3b5
c28a852
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,6 +8,7 @@ | |
|
||
import copy | ||
from abc import ABCMeta, abstractmethod | ||
import warnings | ||
|
||
import numpy as np | ||
|
||
|
@@ -18,6 +19,7 @@ | |
from .utils import time_grid_from_range, stride_array | ||
from .constraints import AltitudeConstraint | ||
from .target import get_skycoord | ||
from .exceptions import AstroplanWarning | ||
|
||
__all__ = ['ObservingBlock', 'TransitionBlock', 'Schedule', 'Slot', | ||
'Scheduler', 'SequentialScheduler', 'PriorityScheduler', | ||
|
@@ -705,15 +707,21 @@ def __init__(self, *args, **kwargs): | |
|
||
def _get_filled_indices(self, times): | ||
is_open_time = np.ones(len(times), bool) | ||
times_resolution = np.min(times[1:] - times[:-1]) | ||
# close times that are already filled | ||
pre_filled = np.array([[block.start_time, block.end_time] for | ||
block in self.schedule.scheduled_blocks if | ||
isinstance(block, ObservingBlock)]) | ||
for start_end in pre_filled: | ||
filled = np.where((start_end[0] < times) & (times < start_end[1])) | ||
if len(filled[0]) > 0: | ||
is_open_time[filled[0]] = False | ||
is_open_time[min(filled[0]) - 1] = False | ||
if start_end[1] - start_end[0] <= times_resolution: | ||
warnings.warn( | ||
"Unexpected behavior may occur when the time " | ||
f"resolution ({times_resolution.to(u.second)}) " | ||
"is not smaller than the block duration " | ||
f"({np.diff(start_end)[0].to(u.second)}).", AstroplanWarning | ||
) | ||
filled = np.where((start_end[0]-0.5*u.second < times) & (times < start_end[1])) | ||
is_open_time[filled[0]] = False | ||
Comment on lines
+723
to
+724
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'd bet that fixing There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Including such a warning is probably good. Currently, I can't imagine a scenario where both
Because in general I think we should mark "as filled" on one side when equal. Given that this is likely akin to floating point comparisons, subtracting a tolerance here seems logical. The addition of "<=" may provide further clarity to our intentions. |
||
return is_open_time | ||
|
||
def _make_schedule(self, blocks): | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you accept this change, you'll also need to add the following import to this file: