Skip to content

Commit

Permalink
Black format attempt 2
Browse files Browse the repository at this point in the history
  • Loading branch information
Tim Smit committed Feb 8, 2024
1 parent f6e1de5 commit c31c38c
Show file tree
Hide file tree
Showing 18 changed files with 696 additions and 59 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import pandas as pd
import numpy as np
import pandas as pd


def get_known_actor_comms_status(values):
Expand Down
2 changes: 0 additions & 2 deletions paseos/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
from .utils.reference_frame import ReferenceFrame
from .utils.set_log_level import set_log_level
from .visualization.plot import plot, PlotType
from .communication.link_model import LinkModel


set_log_level("WARNING")

Expand Down
20 changes: 10 additions & 10 deletions paseos/actors/actor_builder.py
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
from typing import Callable, Any

from loguru import logger
import numpy as np
from dotmap import DotMap
import pykep as pk
from dotmap import DotMap
from loguru import logger
from skyfield.api import wgs84

from paseos.geometric_model.geometric_model import GeometricModel
from .base_actor import BaseActor
from .spacecraft_actor import SpacecraftActor
from .ground_station_actor import GroundstationActor
from .spacecraft_actor import SpacecraftActor
from ..central_body.central_body import CentralBody
from ..thermal.thermal_model import ThermalModel
from ..power.power_device_type import PowerDeviceType
from ..radiation.radiation_model import RadiationModel
from ..communication.device_type import DeviceType
from ..communication.radio_transmitter_model import RadioTransmitterModel
from ..communication.radio_receiver_model import RadioReceiverModel
from ..communication.optical_transmitter_model import OpticalTransmitterModel
from ..communication.optical_receiver_model import OpticalReceiverModel
from paseos.geometric_model.geometric_model import GeometricModel
from ..communication.optical_transmitter_model import OpticalTransmitterModel
from ..communication.radio_receiver_model import RadioReceiverModel
from ..communication.radio_transmitter_model import RadioTransmitterModel
from ..power.power_device_type import PowerDeviceType
from ..radiation.radiation_model import RadiationModel
from ..thermal.thermal_model import ThermalModel


class ActorBuilder:
Expand Down
7 changes: 4 additions & 3 deletions paseos/actors/base_actor.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
from abc import ABC
from typing import Callable, Any

from loguru import logger
import pykep as pk
import numpy as np
import pykep as pk
from dotmap import DotMap
from ..central_body.is_in_line_of_sight import is_in_line_of_sight
from loguru import logger

from ..central_body.central_body import CentralBody
from ..central_body.is_in_line_of_sight import is_in_line_of_sight


class BaseActor(ABC):
Expand Down
6 changes: 3 additions & 3 deletions paseos/communication/link_model.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import numpy as np
import math

from loguru import logger

from .receiver_model import ReceiverModel
from .transmitter_model import TransmitterModel
from .device_type import *
from ..actors.base_actor import BaseActor
import math


class LinkModel:
Expand Down
8 changes: 4 additions & 4 deletions paseos/communication/optical_link_model.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import numpy as np
import math

from loguru import logger

from .link_model import LinkModel
from .optical_receiver_model import OpticalReceiverModel
from .optical_transmitter_model import OpticalTransmitterModel
from .link_model import LinkModel
from .device_type import *
from ..actors.base_actor import BaseActor
import math


class OpticalLinkModel(LinkModel):
Expand Down
1 change: 1 addition & 0 deletions paseos/communication/optical_receiver_model.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from loguru import logger

from .receiver_model import ReceiverModel
from ..utils.gain_calc import calc_optical_gain_from_wavelength_diameter

Expand Down
6 changes: 4 additions & 2 deletions paseos/communication/optical_transmitter_model.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import math

from loguru import logger
from ..utils.gain_calc import calc_gain_from_fwhm

from .transmitter_model import TransmitterModel
import math
from ..utils.gain_calc import calc_gain_from_fwhm


class OpticalTransmitterModel(TransmitterModel):
Expand Down
10 changes: 4 additions & 6 deletions paseos/communication/radio_link_model.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
import numpy as np
import math

from loguru import logger

from .link_model import LinkModel
from .radio_receiver_model import RadioReceiverModel
from .radio_transmitter_model import RadioTransmitterModel
from .link_model import LinkModel
from ..actors.spacecraft_actor import SpacecraftActor
from ..actors.ground_station_actor import GroundstationActor
from ..actors.base_actor import BaseActor

import math


class RadioLinkModel(LinkModel):
"""This class defines a link model, containing one transmitter and one receiver."""
Expand Down
6 changes: 4 additions & 2 deletions paseos/communication/radio_receiver_model.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import math

from loguru import logger
from ..utils.gain_calc import calc_radio_gain_from_wavelength_diameter

from .receiver_model import ReceiverModel
import math
from ..utils.gain_calc import calc_radio_gain_from_wavelength_diameter


class RadioReceiverModel(ReceiverModel):
Expand Down
4 changes: 3 additions & 1 deletion paseos/communication/radio_transmitter_model.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import math

from loguru import logger
from ..utils.gain_calc import calc_radio_gain_from_wavelength_diameter

from .transmitter_model import TransmitterModel
from ..utils.gain_calc import calc_radio_gain_from_wavelength_diameter


class RadioTransmitterModel(TransmitterModel):
Expand Down
6 changes: 3 additions & 3 deletions paseos/paseos.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import types
import asyncio
import sys
import types

import pykep as pk
from dotmap import DotMap
from loguru import logger
import pykep as pk

from paseos.actors.base_actor import BaseActor
from paseos.activities.activity_manager import ActivityManager
from paseos.actors.base_actor import BaseActor
from paseos.utils.operations_monitor import OperationsMonitor


Expand Down
25 changes: 12 additions & 13 deletions paseos/tests/communication_test.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
"""Tests to check the communication models creation and calculation function(s)"""
import numpy as np
import pykep as pk
import pytest

from paseos.communication.transmitter_model import TransmitterModel
from paseos.communication.radio_transmitter_model import RadioTransmitterModel
from paseos.communication.optical_transmitter_model import OpticalTransmitterModel
from paseos.communication.receiver_model import ReceiverModel
from paseos.communication.radio_receiver_model import RadioReceiverModel
from paseos.communication.optical_receiver_model import OpticalReceiverModel
from paseos.communication.radio_link_model import RadioLinkModel
from paseos.communication.optical_link_model import OpticalLinkModel
from paseos.actors.spacecraft_actor import SpacecraftActor
from paseos.actors.ground_station_actor import GroundstationActor
from paseos.actors.actor_builder import ActorBuilder
from paseos.actors.ground_station_actor import GroundstationActor
from paseos.actors.spacecraft_actor import SpacecraftActor
from paseos.communication.device_type import DeviceType

import pykep as pk
import numpy as np
from paseos.communication.optical_link_model import OpticalLinkModel
from paseos.communication.optical_receiver_model import OpticalReceiverModel
from paseos.communication.optical_transmitter_model import OpticalTransmitterModel
from paseos.communication.radio_link_model import RadioLinkModel
from paseos.communication.radio_receiver_model import RadioReceiverModel
from paseos.communication.radio_transmitter_model import RadioTransmitterModel
from paseos.communication.receiver_model import ReceiverModel
from paseos.communication.transmitter_model import TransmitterModel


def test_link_creation():
Expand Down
4 changes: 2 additions & 2 deletions paseos/tests/link_budget_test.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
"""Test to check the gain_calc function(s)"""
import numpy as np
import pytest

from paseos.utils.gain_calc import (
calc_radio_gain_from_wavelength_diameter,
calc_gain_from_fwhm,
)

import numpy as np


def test_gain_calculation():
with pytest.raises(AssertionError, match="Wavelength needs to be larger than 0."):
Expand Down
2 changes: 0 additions & 2 deletions paseos/utils/gain_calc.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import math
import os
from skyfield.api import load


def calc_radio_gain_from_wavelength_diameter(
Expand Down
6 changes: 4 additions & 2 deletions paseos/utils/link_budget_calc.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import pykep as pk
import os

import numpy as np
import pykep as pk
from skyfield.api import load

from .sky_field_sky_coordinate import SkyfieldSkyCoordinate
from ..actors.spacecraft_actor import SpacecraftActor
from ..actors.ground_station_actor import GroundstationActor
from ..actors.spacecraft_actor import SpacecraftActor

_SKYFIELD_EARTH_PATH = os.path.join(
os.path.dirname(__file__) + "/../resources/", "de421.bsp"
Expand Down
6 changes: 3 additions & 3 deletions paseos/utils/operations_monitor.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import csv

from loguru import logger
from dotmap import DotMap
import pykep as pk
import matplotlib.pyplot as plt
import pykep as pk
from dotmap import DotMap
from loguru import logger

from paseos.actors.base_actor import BaseActor

Expand Down

0 comments on commit c31c38c

Please sign in to comment.