pyBADA 0.1.5__py3-none-any.whl → 0.1.6__py3-none-any.whl

pyBADA/utils.py

@@ -0,0 +1,204 @@
+import numpy as np
+import xarray as xr
+import pandas as pd
+import numbers
+from decimal import Decimal, ROUND_HALF_UP
+
+
+def _round_scalar(x, dec):
+    """Round a single scalar value using half-up rounding."""
+    quant = Decimal('1.' + '0'*dec)
+    d = Decimal(str(x))
+    return float(d.quantize(quant, rounding=ROUND_HALF_UP))
+
+
+def proper_round(num, dec=0):
+    """Forced half-up rounding, vectorized over numpy arrays, pandas, and xarray.
+
+    :param num: Input scalar, array-like, pandas Series/DataFrame, or xarray DataArray
+    :param dec: Number of decimal places
+    :returns: Rounded values with half-up rule; preserves infinities.
+    """
+    # Scalar helper handling infinities
+    def _f(v):
+        # Preserve infinities
+        try:
+            if np.isinf(v):
+                return v
+        except Exception:
+            pass
+        return _round_scalar(v, dec)
+
+    # xarray DataArray
+    if isinstance(num, xr.DataArray):
+        arr = num.data
+        rounded = np.vectorize(_f)(arr)
+        return xr.DataArray(rounded, coords=num.coords, dims=num.dims)
+
+    # pandas Series
+    if isinstance(num, pd.Series):
+        return num.map(_f)
+
+    # pandas DataFrame
+    if isinstance(num, pd.DataFrame):
+        return num.applymap(_f)
+
+    # numpy array
+    if isinstance(num, np.ndarray):
+        return np.vectorize(_f)(num)
+
+    # scalar fallback
+    return _f(num)
+
+
+def to_numpy(x):
+    """
+    Convert xarray.DataArray, pandas.Series/DataFrame, or any array-like
+    to a NumPy array of floats.
+    """
+    if isinstance(x, xr.DataArray):
+        return x.values
+    if isinstance(x, (pd.Series, pd.DataFrame)):
+        return x.to_numpy(copy=False)
+    return np.asarray(x, dtype=float)
+
+
+def _extract(x):
+    if isinstance(x, numbers.Real) and not isinstance(x, (np.generic, np.ndarray)):
+        return float(x)
+    if isinstance(x, xr.DataArray):
+        return x.data
+    if isinstance(x, (pd.Series, pd.DataFrame)):
+        return x.values
+    return np.asarray(x, dtype=float)
+
+def _broadcast(*arrays):
+    """
+    Broadcast any number of array-like inputs to a common shape.
+    - If *all* inputs are Python scalars, just return them as a tuple.
+    - If exactly two inputs, and one is 1-D while the other is N-D (N>1),
+      then align the 1-D array to whichever axis of the N-D array has the same length.
+    - Otherwise prepend leading singleton dims to match trailing-dims broadcasting.
+    """
+    # 1) Scalar passthrough
+    if all(isinstance(a, numbers.Real) and not isinstance(a, (np.generic, np.ndarray))
+           for a in arrays):
+        return tuple(arrays)
+
+    # Convert everything up front
+    arrs = [np.asarray(a) for a in arrays]
+
+    # Special‐case exactly two inputs, one 1-D and one N-D
+    if len(arrs) == 2:
+        a0, a1 = arrs
+        # identify which is 1-D and which is higher-D
+        if a0.ndim == 1 and a1.ndim > 1:
+            arrs[0] = _align_1d_to_nd(a0, a1)
+            return np.broadcast_arrays(arrs[0], a1)
+        if a1.ndim == 1 and a0.ndim > 1:
+            arrs[1] = _align_1d_to_nd(a1, a0)
+            return np.broadcast_arrays(a0, arrs[1])
+
+    # Fallback: pad all inputs with leading singleton dims
+    max_ndim = max(a.ndim for a in arrs)
+    padded = [
+        a.reshape((1,) * (max_ndim - a.ndim) + a.shape)
+        for a in arrs
+    ]
+    try:
+        return np.broadcast_arrays(*padded)
+    except ValueError:
+        shapes = [a.shape for a in arrs]
+        raise ValueError(f"Cannot broadcast input shapes {shapes}")
+
+def _align_1d_to_nd(one_d, nd):
+    """
+    Take one_d of shape (N,) and an array nd of shape (...),
+    find axis i where nd.shape[i] == N, and reshape one_d to
+    (1,1,...,N,...,1) so it lines up on that axis.
+    """
+    N = one_d.shape[0]
+    for i, dim in enumerate(nd.shape):
+        if dim == N:
+            # build a shape of length nd.ndim: all 1s except axis i holds N
+            new_shape = tuple(1 if j != i else N for j in range(nd.ndim))
+            return one_d.reshape(new_shape)
+    # no matching dimension found
+    raise ValueError(f"Cannot align 1D array of length {N} with ND shape {nd.shape}")
+
+# def _broadcast(*arrays):
+    # """
+    # Broadcast any number of array-like inputs to a common shape.
+    # Accepts Python scalars, numpy arrays, pandas Series/DataFrame, xarray DataArray (via utils._extract), and returns numpy arrays broadcasted or scalars.
+    # """
+
+    # If all inputs are Python real scalars, return them unchanged
+    # if all(isinstance(a, numbers.Real) and not isinstance(a, (np.generic, np.ndarray)) for a in arrays):
+        # return tuple(arrays)
+
+    # Convert inputs to numpy arrays and broadcast
+    # arrs = [np.asarray(a) for a in arrays]
+    # try:
+        # return np.broadcast_arrays(*arrs)
+    # except ValueError:
+        # shapes = [a.shape for a in arrs]
+        # raise ValueError(f"Cannot broadcast input shapes {shapes}")
+
+def _wrap(core, original):
+    # 1) Plain Python floats
+    if isinstance(original, numbers.Real) and not isinstance(original, (np.generic, np.ndarray)):
+        # core might be a 0-d array or numpy scalar
+        return float(np.asarray(core).item())
+
+    # xarray
+    if isinstance(original, xr.DataArray):
+        return xr.DataArray(
+            core,
+            coords=original.coords,
+            dims=original.dims,
+            name=original.name,
+            attrs=original.attrs
+        )
+
+    # pandas Series
+    if isinstance(original, pd.Series):
+        return pd.Series(core, index=original.index, name=original.name)
+
+    # pandas DataFrame
+    if isinstance(original, pd.DataFrame):
+        return pd.DataFrame(core, index=original.index, columns=original.columns)
+
+    # fallback: NumPy arrays/scalars
+    return core
+
+def _vectorized_wrapper(core_func, *args):
+    """Generic vectorized wrapper for functions with N inputs."""
+    # Extract raw arrays or scalars
+    arrs = [_extract(a) for a in args]
+    core = core_func(*arrs)
+
+    # If *all* inputs were plain Python real numbers, return a Python float
+    first = args[0]
+    if isinstance(first, numbers.Real) and not isinstance(first, (np.generic, np.ndarray)):
+        return float(np.asarray(core).item())
+
+    # xarray: if every arg was a DataArray, wrap back to DataArray
+    if isinstance(first, xr.DataArray) and all(isinstance(a, xr.DataArray) for a in args):
+        return xr.DataArray(core, coords=first.coords, dims=first.dims)
+
+    # pandas Series
+    if isinstance(first, pd.Series) and all(isinstance(a, pd.Series) for a in args):
+        return pd.Series(core, index=first.index, name=first.name)
+
+    # pandas DataFrame
+    if isinstance(first, pd.DataFrame) and all(isinstance(a, pd.DataFrame) for a in args):
+        return pd.DataFrame(core, index=first.index, columns=first.columns)
+
+    # fallback: NumPy array or scalar (leave as-is)
+    return core
+
+def checkArgument(argument, **kwargs):
+    if kwargs.get(argument) is not None:
+        return kwargs.get(argument)
+    else:
+        raise TypeError("Missing " + argument + " argument")

{pybada-0.1.5.dist-info → pybada-0.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyBADA
-Version: 0.1.5
+Version: 0.1.6
 Summary: Aircraft performance modelling, trajectory prediction and optimisation, and visualisation with EUROCONTROL's BADA.
 Project-URL: Homepage, https://github.com/eurocontrol-bada/pybada
 Author-email: Henrich Glaser-Opitz <henrich.glaser-opitz@eurocontrol.int>, Antonio Vivace <antonio.vivace@eurocontrol.int>
@@ -10,17 +10,18 @@ License-File: LICENCE.txt
 Classifier: License :: OSI Approved :: European Union Public Licence 1.2 (EUPL 1.2)
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.12
-Requires-Dist: numpy>=2.2.3
-Requires-Dist: pandas>=2.2.3
-Requires-Dist: scipy>=1.15.2
+Requires-Dist: numpy>=2.3.2
+Requires-Dist: pandas>=2.3.1
+Requires-Dist: scipy>=1.16.1
 Requires-Dist: simplekml>=1.3.6
-Requires-Dist: xlsxwriter>=3.2.2
+Requires-Dist: xarray>=2025.7.1
+Requires-Dist: xlsxwriter>=3.2.5
 Provides-Extra: dev
 Requires-Dist: build; extra == 'dev'
-Requires-Dist: folium==0.19.5; extra == 'dev'
-Requires-Dist: matplotlib==3.10.1; extra == 'dev'
-Requires-Dist: pre-commit==4.1.0; extra == 'dev'
-Requires-Dist: pytest==8.3.5; extra == 'dev'
+Requires-Dist: folium==0.20.0; extra == 'dev'
+Requires-Dist: matplotlib==3.10.5; extra == 'dev'
+Requires-Dist: pre-commit==4.2.0; extra == 'dev'
+Requires-Dist: pytest==8.4.1; extra == 'dev'
 Requires-Dist: readthedocs-sphinx-search>=0.3.2; extra == 'dev'
 Requires-Dist: ruff==0.11.5; extra == 'dev'
 Requires-Dist: sphinx-gallery==0.19.0; extra == 'dev'
@@ -33,10 +34,10 @@ Description-Content-Type: text/markdown
 
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 <a href="https://github.com/eurocontrol-bada/pybada/blob/main/LICENCE.txt"><img alt="License: EUPL" src="https://img.shields.io/badge/license-EUPL-3785D1.svg"></a>
-<a href="https://pypi.org/project/pyBADA"><img alt="Released on PyPi" src="https://img.shields.io/pypi/v/pyBADA.svg"></a>
-![Python 3.12](https://img.shields.io/badge/Python-3.12-3776AB.svg?logo=python&logoColor=white)
+<a href="https://pypi.org/project/pyBADA"><img alt="Released on PyPi" src="https://img.shields.io/pypi/v/pyBADA.svg"></a> <img alt="PyPI - Downloads" src="https://img.shields.io/pypi/dw/pybada"> ![Python 3.12](https://img.shields.io/badge/Python-3.12-3776AB.svg?logo=python&logoColor=white)
 <a href="https://github.com/eurocontrol-bada/pybada"><img alt="Code style: black" src="https://img.shields.io/badge/code%20style-black-000000.svg"></a>
 [![Run unit tests](https://github.com/eurocontrol-bada/pybada/actions/workflows/pytest.yml/badge.svg)](https://github.com/eurocontrol-bada/pybada/actions/workflows/pytest.yml)
+![X (formerly Twitter) Follow](https://img.shields.io/twitter/follow/pyBADA_dev?style=social&label=Follow%20%40pyBADA_dev)
 
 This package provides aircraft performance modelling, trajectory prediction and optimisation, and visualisation with [BADA](https://www.eurocontrol.int/model/bada) in Python.
 
@@ -89,4 +90,5 @@ You won't receive support for it, but you can pass the flag `--ignore-requires-p
 
 BADA and pyBADA are developed and maintained by [EUROCONTROL](https://www.eurocontrol.int/model/bada).
 
-This project is released under the European Union Public License v1.2 - see the [LICENSE](https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12) file for details.
+This project is released under the European Union Public License v1.2 - see the [LICENCE](https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12) file for details.
+See the [Amendment to the EUPL](./AMENDMENT_TO_EUPL_license.md) for additional terms.

{pybada-0.1.5.dist-info → pybada-0.1.6.dist-info}/RECORD

@@ -1,17 +1,18 @@
-pyBADA/TCL.py,sha256=K6L_E0BchttNDWrAfDfuHWk3-ux7mvgeONpr2OkQNgw,373689
+pyBADA/TCL.py,sha256=0X6giDdZi-T5pr1l0x5zBoVkS5MjrxYVWZq-O6UAxsA,373536
 pyBADA/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyBADA/aircraft.py,sha256=VTXMyTm9Gw-EQpNTL9Q8-Mzp2wXE9S2mjJLHvSF-AZs,13009
-pyBADA/atmosphere.py,sha256=audmiVJR1fdraeorWBpYqQTlFn_uZVRWcC9ex-Nr9Jw,11348
-pyBADA/bada3.py,sha256=FYeZb2uX6NqHJVjJhT5wMhcOObosRr2A8QZXn-uOY6s,186277
-pyBADA/bada4.py,sha256=PjP26gEn45Ebajm4TR9FhKMUDQuIlBXOANSCjeS7NsY,222266
-pyBADA/badaH.py,sha256=rF7gE5-tsemGDKwkUpiPazw5vdLpMkBNuXpI_22z0S8,153349
-pyBADA/configuration.py,sha256=66OCBBYJhXF4quCHDK47YA9yOftuPdrbvbn88P-531E,6505
+pyBADA/aircraft.py,sha256=VBgavT6CO05W941ts3Rm93SC-wUZcx8QbEey1QPxiZ0,13009
+pyBADA/atmosphere.py,sha256=6aYd6bwXcN_HcoHk77-dMMFkoNTT7XUPiCVpRiurUtY,19589
+pyBADA/bada3.py,sha256=r342J8qcoO7Otp2CzYdItRABVcjVWyl142XJ1-inu9I,186825
+pyBADA/bada4.py,sha256=O2ruf7I2oIFp3NeNcabLriFci48TFTJ5RKNfhyXEpPg,223355
+pyBADA/badaH.py,sha256=9PQWky2tE876rXrK9VlPKnQOJlCvi8bpqquOVZQeDDY,153049
+pyBADA/configuration.py,sha256=j4PxLEByx5hP-JDV7FegqgzS0Tk_6rVBrs8DJC42o-Y,6506
 pyBADA/constants.py,sha256=zJhiLcG49Ab2i-c_mHNCmfLpecmQozvIOjX71aVB5KE,952
-pyBADA/conversions.py,sha256=grIokt50KOTaINsmMDWyCJvMpt-_U3FgC9ZNg_aqC1g,3252
-pyBADA/flightTrajectory.py,sha256=XEbohC3NGLaDymSLyqyzM9h3D6Tzns2iHLx9uGAMs-U,38483
-pyBADA/geodesic.py,sha256=jTEphU_H9D10lgi1Pm77OSsT7icApniaNtSSVHTjZXo,30721
-pyBADA/magnetic.py,sha256=O5Ki4ViSqvznl08gZRM90mBbkkpAMR6PR0hKc-FY8yg,4996
-pyBADA/trajectoryPrediction.py,sha256=jC-FxEhD3C_hP5nRutZndYtrat14NIKMVG30Aiq0XJ4,6945
+pyBADA/conversions.py,sha256=pfOPAgpQmHPOLUPnOnUTAo2lxj5XE0dZ_dWTzYbsy7M,4358
+pyBADA/flightTrajectory.py,sha256=g8J18o17lUmcF7cd4bHvBUn9el6ywn1628biDF2LAsQ,38484
+pyBADA/geodesic.py,sha256=sC1GTqDkrdFNhzTr8xn4tdEqbdoIijvRmKSsL1ObyOw,34626
+pyBADA/magnetic.py,sha256=svmwNEwfuiDIQChQxmfqNd9tyNHjnAK1lYsTYy_RYio,4997
+pyBADA/trajectoryPrediction.py,sha256=8mkwRoXcmUyw1UlRbg-gRLE5BmSlubI3h_c8aPpKS6A,6946
+pyBADA/utils.py,sha256=ULW1n_Rm30kGrBGG97-yd8V1SJQw8Y6NdEVIEq_xVhc,7029
 pyBADA/data/magneticDeclinationGridData.json,sha256=ffmLcxdDwFwJqV4WPyMM5SWt60tMj8xsLh5IHYkpO3U,5390918
 pyBADA/aircraft/BADA3/DUMMY/BADA.GPF,sha256=1Am9yU8v9nnIpvJt-XhJRz4APOkRzfNPujKAy3UCYg0,9831
 pyBADA/aircraft/BADA3/DUMMY/BZJT__.APF,sha256=wGyXK-ro1S6YhC4wp2nMQKi0JGYLvTunNjO6x_YbhW4,2523
@@ -90,8 +91,8 @@ pyBADA/aircraft/BADAH/DUMMY/DUMH/DUMH_ISA.PTF,sha256=aEthZF1xztp6QSHYEwU5tH4HF8x
 pyBADA/aircraft/BADAH/DUMMY/DUMH/LRC.OPT,sha256=7WecIu4kfw5nM_ADih06Hb8pCoxLVsEdHHJTqQrx4hg,10123
 pyBADA/aircraft/BADAH/DUMMY/DUMH/MEC.OPT,sha256=yKczjH6lZqTplmcV79tZLvwXmHM2F9bYoB2gIM8hBpg,10123
 pyBADA/aircraft/BADAH/DUMMY/DUMH/MRC.OPT,sha256=fTGqt0P9xgt9Q4sKPlL0CZi9aj73prAPlXj1dpWHSOk,10123
-pybada-0.1.5.dist-info/METADATA,sha256=68gtFyLFR_5FgbJNOZ5S3TndHeD5PGv4ALBcX6iXjFw,3539
-pybada-0.1.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pybada-0.1.5.dist-info/licenses/AUTHORS,sha256=iCKpU7CHp2sB4u5hkS2WyMJHLzL0gfMm-bobd7QDmzE,108
-pybada-0.1.5.dist-info/licenses/LICENCE.txt,sha256=RpvAZSjULHvoTR_esTlucJ08-zdQydnoqQLbqOh9Ub8,13826
-pybada-0.1.5.dist-info/RECORD,,
+pybada-0.1.6.dist-info/METADATA,sha256=aG80WMHd3JzEGGPQNBXGeNZnkXhCmcRAIIFQyACxn60,3853
+pybada-0.1.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pybada-0.1.6.dist-info/licenses/AUTHORS,sha256=iCKpU7CHp2sB4u5hkS2WyMJHLzL0gfMm-bobd7QDmzE,108
+pybada-0.1.6.dist-info/licenses/LICENCE.txt,sha256=RpvAZSjULHvoTR_esTlucJ08-zdQydnoqQLbqOh9Ub8,13826
+pybada-0.1.6.dist-info/RECORD,,