spacecruft
/
satnogs-network
1
0
Fork 0
Code Releases Activity

base/scheduling: Make division operations "true division"-safe 

Use explicit typecast to float to prevent ambiguous division operation
in the first two cases. In the last case (timdelta, int), the python2
timedelta doesn't support the division operator (this was intruduced
in python 3.2). Use old_div instead.

This change clarifies that true division is the desired behaviour
in these three code locations.

Signed-off-by: Fabian P. Schmidt <kerel@mailbox.org>
merge-requests/852/head
Fabian P. Schmidt 2019-12-31 15:45:06 +01:00 committed by Alfredos-Panagiotis Damkalis
parent f774025a6f
commit a7692b4627
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
network/base/scheduling.py
View File

@ -7,6 +7,7 @@ from datetime import timedelta
import ephem
from django.conf import settings
from django.utils.timezone import make_aware, now, utc
from past.utils import old_div
from network.base.models import LatestTle, Observation, Satellite
from network.base.perms import schedule_stations_perms
@ -146,7 +147,7 @@ def create_station_windows(scheduled_obs, overlapped, pass_params, observer, sat
create_station_window(
window_start, window_end, get_azimuth(observer, satellite, window_start),
get_azimuth(observer, satellite, window_end), altitude, tle, True, True,
min(1, 1 - (window_duration / initial_duration))
min(1, 1 - (float(window_duration) / float(initial_duration)))
)
)
elif overlapped == 2:
@ -164,7 +165,7 @@ def create_station_windows(scheduled_obs, overlapped, pass_params, observer, sat
create_station_window(
pass_params['rise_time'], pass_params['set_time'], pass_params['rise_az'],
pass_params['set_az'], pass_params['tca_alt'], tle, duration_validity, True,
min(1, 1 - (window_duration / initial_duration))
min(1, 1 - (float(window_duration) / float(initial_duration)))
)
)
else:
@ -301,7 +302,9 @@ def create_new_observation(station, transmitter, start, end, author):
observer.lat = str(station.lat)
observer.elevation = station.alt
mid_pass_time = start + (end - start) / 2
# Replace with the following after Python 3 migration:
# mid_pass_time = start + (end - start) / 2
mid_pass_time = start + old_div((end - start), 2)
rise_azimuth = get_azimuth(observer, sat_ephem, start)
rise_altitude = get_altitude(observer, sat_ephem, start)