From 0c797a254c06914e4fe4eeea0e511a8cc239ffa6 Mon Sep 17 00:00:00 2001 From: Sami Alavi Date: Fri, 3 Mar 2023 20:49:02 +0500 Subject: [PATCH] simplify type annotations PEP 484 says that `float` also implicitly allows `int`, so there's no need to use `Union[int | float]`. Fixes: #450 Change-Id: Ib1aeda4c13ffabd47719c1e0886e9ebcf21a64e0 --- gnpy/core/elements.py | 2 +- gnpy/core/info.py | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gnpy/core/elements.py b/gnpy/core/elements.py index 3b8aadfe..b13727cb 100644 --- a/gnpy/core/elements.py +++ b/gnpy/core/elements.py @@ -289,7 +289,7 @@ class Roadm(_Node): f' actual pch out (dBm): {total_pch}']) def get_roadm_target_power(self, ref_carrier: ReferenceCarrier = None, - spectral_info: SpectralInformation = None) -> Union[int, float, ndarray]: + spectral_info: SpectralInformation = None) -> Union[float, ndarray]: """Computes the power in dBm for a reference carrier or for a spectral information. power is computed based on equalization target. if spectral_info baud_rate is baud_rate = [32e9, 42e9, 64e9, 42e9, 32e9], and diff --git a/gnpy/core/info.py b/gnpy/core/info.py index 1f56801a..3568860b 100644 --- a/gnpy/core/info.py +++ b/gnpy/core/info.py @@ -259,16 +259,16 @@ class SpectralInformation(object): return self -def create_arbitrary_spectral_information(frequency: Union[ndarray, Iterable, int, float], - signal: Union[int, float, ndarray, Iterable], - baud_rate: Union[int, float, ndarray, Iterable], - tx_osnr: Union[int, float, ndarray, Iterable], - delta_pdb_per_channel: Union[int, float, ndarray, Iterable] = 0., - slot_width: Union[int, float, ndarray, Iterable] = None, - roll_off: Union[int, float, ndarray, Iterable] = 0., - chromatic_dispersion: Union[int, float, ndarray, Iterable] = 0., - pmd: Union[int, float, ndarray, Iterable] = 0., - pdl: Union[int, float, ndarray, Iterable] = 0., +def create_arbitrary_spectral_information(frequency: Union[ndarray, Iterable, float], + signal: Union[float, ndarray, Iterable], + baud_rate: Union[float, ndarray, Iterable], + tx_osnr: Union[float, ndarray, Iterable], + delta_pdb_per_channel: Union[float, ndarray, Iterable] = 0., + slot_width: Union[float, ndarray, Iterable] = None, + roll_off: Union[float, ndarray, Iterable] = 0., + chromatic_dispersion: Union[float, ndarray, Iterable] = 0., + pmd: Union[float, ndarray, Iterable] = 0., + pdl: Union[float, ndarray, Iterable] = 0., ref_power: Pref = None, label: Union[str, ndarray, Iterable] = None): """This is just a wrapper around the SpectralInformation.__init__() that simplifies the creation of @@ -321,7 +321,7 @@ def create_input_spectral_information(f_min, f_max, roll_off, baud_rate, power, label=label) -def carriers_to_spectral_information(initial_spectrum: dict[Union[int, float], Carrier], power: float, +def carriers_to_spectral_information(initial_spectrum: dict[float, Carrier], power: float, ref_carrier: ReferenceCarrier) -> SpectralInformation: """Initial spectrum is a dict with key = carrier frequency, and value a Carrier object. :param initial_spectrum: indexed by frequency in Hz, with power offset (delta_pdb), baudrate, slot width,