From 54d4ee88954c548afc092ef02c19097ba7df0af7 Mon Sep 17 00:00:00 2001 From: "Fabian P. Schmidt" Date: Sat, 2 Nov 2019 15:00:10 +0100 Subject: [PATCH] Refactor satellite into an own module --- auto_scheduler/__init__.py | 1 + auto_scheduler/satellite.py | 20 ++++++++++++++++++++ schedule_single_station.py | 24 +----------------------- 3 files changed, 22 insertions(+), 23 deletions(-) create mode 100644 auto_scheduler/satellite.py diff --git a/auto_scheduler/__init__.py b/auto_scheduler/__init__.py index aacd1be..e560419 100644 --- a/auto_scheduler/__init__.py +++ b/auto_scheduler/__init__.py @@ -1 +1,2 @@ from .tle import twolineelement +from .satellite import satellite diff --git a/auto_scheduler/satellite.py b/auto_scheduler/satellite.py new file mode 100644 index 0000000..7af0c7e --- /dev/null +++ b/auto_scheduler/satellite.py @@ -0,0 +1,20 @@ +class satellite: + """Satellite class""" + + def __init__(self, tle, transmitter, success_rate, good_count, data_count, mode): + """Define a satellite""" + + self.tle0 = tle.tle0 + self.tle1 = tle.tle1 + self.tle2 = tle.tle2 + self.id = tle.id + self.name = tle.name.strip() + self.transmitter = transmitter + self.success_rate = success_rate + self.good_count = good_count + self.data_count = data_count + self.mode = mode + + def __repr__(self): + return "%s %s %d %d %d %s %s" % (self.id, self.transmitter, self.success_rate, self.good_count, + self.data_count, self.mode, self.name) diff --git a/schedule_single_station.py b/schedule_single_station.py index b521352..c9fd906 100755 --- a/schedule_single_station.py +++ b/schedule_single_station.py @@ -12,7 +12,7 @@ from utils import get_active_transmitter_info, get_transmitter_stats, \ get_groundstation_info, get_scheduled_passes_from_network, ordered_scheduler, \ report_efficiency, find_passes, schedule_observation, read_priorities_transmitters, \ get_satellite_info, update_needed, get_priority_passes -from auto_scheduler import twolineelement +from auto_scheduler import twolineelement, satellite import settings from tqdm import tqdm import sys @@ -20,28 +20,6 @@ import sys _LOG_LEVEL_STRINGS = ['CRITICAL', 'ERROR', 'WARNING', 'INFO', 'DEBUG'] -class satellite: - """Satellite class""" - - def __init__(self, tle, transmitter, success_rate, good_count, data_count, mode): - """Define a satellite""" - - self.tle0 = tle.tle0 - self.tle1 = tle.tle1 - self.tle2 = tle.tle2 - self.id = tle.id - self.name = tle.name.strip() - self.transmitter = transmitter - self.success_rate = success_rate - self.good_count = good_count - self.data_count = data_count - self.mode = mode - - def __repr__(self): - return "%s %s %d %d %d %s %s" % (self.id, self.transmitter, self.success_rate, self.good_count, - self.data_count, self.mode, self.name) - - def _log_level_string_to_int(log_level_string): if log_level_string not in _LOG_LEVEL_STRINGS: message = 'invalid choice: {0} (choose from {1})'.format(log_level_string,