Skip to content

fix for the errors with numpy1.7 #232

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

fix for the errors with numpy1.7 #232

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
8 changes: 4 additions & 4 deletions astroplan/scheduling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,8 +671,8 @@ def _make_schedule(self, blocks):
end_idx = times_indices + start_idx
# this may make some OBs get sub-optimal scheduling, but it closes gaps
# TODO: determine a reasonable range inside which it gets shifted
if tb.duration > new_start_time - tb.start_time or \
np.abs(new_start_time - tb.end_time) < self.gap_time:
if (new_start_time - tb.start_time < tb.duration or
np.abs(new_start_time - tb.end_time) < self.gap_time):
new_start_time = tb.end_time
start_time_idx = end_idx
self.schedule.insert_slot(tb.start_time, tb)
Expand All @@ -688,8 +688,8 @@ def _make_schedule(self, blocks):
start_idx = self.schedule.slots[slot_index - 2].block.end_idx
end_idx = times_indices + start_idx
self.schedule.change_slot_block(slot_index - 1, new_block=tb)
if tb.duration > new_start_time - tb.start_time or \
np.abs(new_start_time - tb.end_time) < self.gap_time:
if (new_start_time - tb.start_time < tb.duration or
np.abs(new_start_time - tb.end_time) < self.gap_time):
new_start_time = tb.end_time
start_time_idx = end_idx
is_open_time[start_idx: end_idx] = False
Expand Down