Skip to content

Changed how Schedulers get their Schedule. #219

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.

Sign up for GitHub

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

Merged
bmorris3 merged 1 commit into from
Aug 15, 2016
Merged

Changed how Schedulers get their Schedule. #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 13 additions & 32 deletions astroplan/scheduling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ def __init__(self, start_time, end_time, constraints=None):
self.start_time = start_time
self.end_time = end_time
self.slots = [Slot(start_time, end_time)]
self.constraints = constraints
self.slew_duration = 4*u.min
# TODO: replace/overwrite slew_duration with Transitioner calls
self.observer = None
Expand All @@ -181,12 +180,6 @@ def __repr__(self):
return 'Schedule containing ' + str(len(self.observing_blocks)) + \
' observing blocks between ' + str(self.slots[0].start.iso) + \
' and ' + str(self.slots[-1].end.iso)

def apply_constraints(self):
# this needs to be able to handle being passed constraints
# that are targeted and non-targeted, use the non-targeted
# and place targeted (e.g. MoonSep) somewhere they can be used
raise NotImplementedError

@property
def observing_blocks(self):
Expand Down Expand Up @@ -287,12 +280,6 @@ def change_slot_block(self, slot_index, new_block=None):
if self.slots[slot_index + 1].block:
raise IndexError('slot afterwards is full')
self.slots[slot_index + 1].start = new_end

@classmethod
def from_constraints(cls, start_time, end_time, constraints):
sch = cls(start_time, end_time, constraints=constraints)
sch.apply_constraints()
return sch


class Slot(object):
Expand Down Expand Up @@ -347,15 +334,11 @@ class Scheduler(object):
__metaclass__ = ABCMeta

@u.quantity_input(gap_time=u.second, time_resolution=u.second)
def __init__(self, start_time, end_time, constraints, observer,
transitioner=None, gap_time=5*u.min, time_resolution=20*u.second):
def __init__(self, constraints, observer, transitioner=None,
gap_time=5*u.min, time_resolution=20*u.second):
"""
Parameters
----------
start_time : `~astropy.time.Time`
the start of the observation scheduling window.
end_time : `~astropy.time.Time`
the end of the observation scheduling window.
constraints : sequence of `~astroplan.constraints.Constraint`
The constraints to apply to *every* observing block. Note that
constraints for specific blocks can go on each block individually.
Expand All @@ -371,36 +354,33 @@ def __init__(self, start_time, end_time, constraints, observer,
will have a duration that is a multiple of it.
"""
self.constraints = constraints
self.start_time = start_time
self.end_time = end_time
self.observer = observer
self.transitioner = transitioner
self.gap_time = gap_time
self.time_resolution = time_resolution
# make a schedule object, when apply_constraints works, add constraints
self.schedule = Schedule(self.start_time, self.end_time,
# constraints=self.constraints
)
self.schedule.observer = self.observer

def __call__(self, blocks):
def __call__(self, blocks, schedule):
"""
Parameters
----------
blocks : list of `~astroplan.scheduling.ObservingBlock` objects
The observing blocks to schedule. Note that the input
`~astroplan.scheduling.ObservingBlock` objects will *not* be
modified - new ones will be created and returned.
schedule : `~astroplan.scheduling.Schedule` object
A schedule that the blocks will be scheduled in. At this time
the ``schedule`` must be empty, only defined by a start and
end time.

Returns
-------
schedule : `~astroplan.scheduling.Schedule`
A schedule objects which consists of `~astroplan.scheduling.Slot`
objects with and wihtout populated ``block`` objects containing either
objects with and without populated ``block`` objects containing either
`~astroplan.scheduling.TransitionBlock` or `~astroplan.scheduling.ObservingBlock`
objects with populated ``start_time`` and ``end_time`` or ``duration`` attributes
"""

self.schedule = schedule
# these are *shallow* copies
copied_blocks = [copy.copy(block) for block in blocks]
schedule = self._make_schedule(copied_blocks)
Expand Down Expand Up @@ -449,6 +429,7 @@ def from_timespan(cls, center_time, duration, **kwargs):
end_time = center_time + duration / 2.
return cls(start_time, end_time, **kwargs)


class SequentialScheduler(Scheduler):
"""
A scheduler that does "stupid simple sequential scheduling". That is, it
Expand All @@ -467,8 +448,8 @@ def _make_schedule(self, blocks):
b._duration_offsets = u.Quantity([0*u.second, b.duration/2,
b.duration])
b.observer = self.observer
current_time = self.start_time
while (len(blocks) > 0) and (current_time < self.end_time):
current_time = self.schedule.start_time
while (len(blocks) > 0) and (current_time < self.schedule.end_time):
# first compute the value of all the constraints for each block
# given the current starting time
block_transitions = []
Expand Down Expand Up @@ -549,7 +530,7 @@ def _make_schedule(self, blocks):
# Generate grid of time slots, and a mask for previous observations

time_resolution = self.time_resolution
times = time_grid_from_range([self.start_time, self.end_time],
times = time_grid_from_range([self.schedule.start_time, self.schedule.end_time],
time_resolution=time_resolution)
is_open_time = np.ones(len(times), bool)

Expand Down
11 changes: 6 additions & 5 deletions astroplan/tests/test_scheduling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,10 @@ def test_priority_scheduler():
blocks = [ObservingBlock(t, 55*u.minute, i) for i, t in enumerate(targets)]
start_time = Time('2016-02-06 00:00:00')
end_time = start_time + 24*u.hour
scheduler = PriorityScheduler(start_time, end_time, transitioner=transitioner,
scheduler = PriorityScheduler(transitioner=transitioner,
constraints=constraints, observer=apo)
schedule = scheduler(blocks)
schedule = Schedule(start_time, end_time)
scheduler(blocks, schedule)
assert len(schedule.observing_blocks) == 3
assert all(np.abs(block.end_time - block.start_time - block.duration) <
1*u.second for block in schedule.scheduled_blocks)
Expand All @@ -56,10 +57,10 @@ def test_sequential_scheduler():
blocks = [ObservingBlock(t, 55 * u.minute, i) for i, t in enumerate(targets)]
start_time = Time('2016-02-06 00:00:00')
end_time = start_time + 24 * u.hour
scheduler = SequentialScheduler(start_time, end_time,
constraints=constraints, observer=apo,
scheduler = SequentialScheduler(constraints=constraints, observer=apo,
transitioner=transitioner)
schedule = scheduler(blocks)
schedule = Schedule(start_time, end_time)
scheduler(blocks, schedule)
assert len(schedule.observing_blocks) > 0
assert all(np.abs(block.end_time - block.start_time - block.duration) <
1*u.second for block in schedule.scheduled_blocks)
Expand Down