pyBADA 0.1.7__tar.gz → 0.1.8__tar.gz

{pybada-0.1.7 → pybada-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyBADA
-Version: 0.1.7
+Version: 0.1.8
 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>
@@ -9,25 +9,25 @@ License-File: AUTHORS
 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.3.2
-Requires-Dist: pandas>=2.3.2
-Requires-Dist: scipy>=1.16.1
+Requires-Python: >=3.12.3
+Requires-Dist: numpy>=2.4.2
+Requires-Dist: pandas>=3.0.0
+Requires-Dist: scipy>=1.17.0
 Requires-Dist: simplekml>=1.3.6
-Requires-Dist: xarray>=2025.9.0
-Requires-Dist: xlsxwriter>=3.2.5
+Requires-Dist: xarray>=2026.1.0
+Requires-Dist: xlsxwriter>=3.2.9
 Provides-Extra: dev
-Requires-Dist: build; extra == 'dev'
+Requires-Dist: build==1.4.0; extra == 'dev'
 Requires-Dist: folium==0.20.0; extra == 'dev'
-Requires-Dist: matplotlib==3.10.6; extra == 'dev'
-Requires-Dist: pre-commit==4.2.0; extra == 'dev'
-Requires-Dist: pytest==8.4.2; extra == 'dev'
+Requires-Dist: matplotlib==3.10.8; extra == 'dev'
+Requires-Dist: pre-commit==4.5.1; extra == 'dev'
+Requires-Dist: pytest==9.0.2; extra == 'dev'
 Requires-Dist: readthedocs-sphinx-search>=0.3.2; extra == 'dev'
-Requires-Dist: ruff==0.12.12; extra == 'dev'
-Requires-Dist: sphinx-gallery==0.19.0; extra == 'dev'
-Requires-Dist: sphinx-rtd-theme==3.0.2; extra == 'dev'
-Requires-Dist: sphinx==8.2.3; extra == 'dev'
-Requires-Dist: twine; extra == 'dev'
+Requires-Dist: ruff==0.15.0; extra == 'dev'
+Requires-Dist: sphinx-gallery==0.20.0; extra == 'dev'
+Requires-Dist: sphinx-rtd-theme==3.1.0; extra == 'dev'
+Requires-Dist: sphinx==9.1.0; extra == 'dev'
+Requires-Dist: twine==6.2.0; extra == 'dev'
 Description-Content-Type: text/markdown
 
 # pyBADA

pybada-0.1.8/docs/source/API_reference/badaAircraft.rst

@@ -0,0 +1,7 @@
+BadaAircraft
+============
+
+.. automodule:: pyBADA.badaAircraft
+   :members:
+   :undoc-members:
+   :show-inheritance:

pybada-0.1.8/docs/source/API_reference/myTypes.rst

@@ -0,0 +1,7 @@
+myTypes
+=======
+
+.. automodule:: pyBADA.myTypes
+   :members:
+   :undoc-members:
+   :show-inheritance:

pybada-0.1.8/docs/source/API_reference/trajectorySegments.rst

@@ -0,0 +1,7 @@
+TrajectorySegments
+==================
+
+.. automodule:: pyBADA.TrajectorySegments
+   :members:
+   :undoc-members:
+   :show-inheritance:

pybada-0.1.8/docs/source/_templates/footer.html

@@ -0,0 +1,10 @@
+{% extends "!footer.html" %}
+{%- block contentinfo %}
+{{ super }}
+
+
+
+&copy; Copyright 2024 - 2026 <img src="https://ansperformance.eu/nvctr/reference/figures/euctrl-logo-wide.svg" width="112" alt="EUROCONTROL"></a> <br>
+
+
+{% endblock %}

{pybada-0.1.7 → pybada-0.1.8}/docs/source/conf.py

@@ -52,4 +52,4 @@ modindex_common_prefix = ["pyBADA."]
 html_theme = "sphinx_rtd_theme"
 html_static_path = ["_static"]
 
-copyright = "2024, EUROCONTROL"
+copyright = "2024 - 2026, EUROCONTROL"

{pybada-0.1.7 → pybada-0.1.8}/docs/source/pyBADA.rst

@@ -9,11 +9,14 @@ API reference
    API_reference/bada3
    API_reference/bada4
    API_reference/badaH
+   API_reference/badaAircraft
    API_reference/configuration
    API_reference/constants
    API_reference/conversions
    API_reference/flightTrajectory
    API_reference/geodesic
    API_reference/magnetic
+   API_reference/myTypes
    API_reference/TCL
-   API_reference/trajectoryPrediction
+   API_reference/trajectoryPrediction
+   API_reference/trajectorySegments

{pybada-0.1.7 → pybada-0.1.8}/examples/trajectoryAC.py

@@ -9,9 +9,9 @@ from dataclasses import dataclass
 
 import matplotlib.pyplot as plt
 
-from pyBADA import TCL as TCL
 from pyBADA import atmosphere as atm
 from pyBADA import conversions as conv
+from pyBADA import trajectorySegments
 from pyBADA.bada3 import Bada3Aircraft
 from pyBADA.bada4 import Bada4Aircraft
 from pyBADA.bada4 import Parser as Bada4Parser
@@ -49,7 +49,7 @@ AC = Bada4Aircraft(
 #    filePath="/home/<USER>/ec/pybada-models/models/BADA4/4.3",
 # )
 
-# create a Flight Trajectory object to store the output from TCL segment calculations
+# create a Flight Trajectory object to store the output from trajectorySegments segment calculations
 ft = FT()
 
 # default parameters
@@ -93,7 +93,7 @@ Hp_CR = 33000  # [ft] CRUISing level
 
 # CLIMB to threshold altitude 1500ft at take-off speed
 # ------------------------------------------------
-flightTrajectory = TCL.constantSpeedRating(
+flightTrajectory = trajectorySegments.constantSpeedRating(
     AC=AC,
     speedType="CAS",
     v=conv.ms2kt(cas_cl1),
@@ -122,7 +122,7 @@ Hp, m_final, CAS_final = ft.getFinalValue(AC, ["Hp", "mass", "CAS"])
     deltaTemp=deltaTemp,
 )
 
-flightTrajectory = TCL.accDec(
+flightTrajectory = trajectorySegments.accDec(
     AC=AC,
     speedType="CAS",
     v_init=CAS_final,
@@ -142,7 +142,7 @@ ft.append(AC, flightTrajectory)
 # current values
 Hp, m_final, CAS_final = ft.getFinalValue(AC, ["Hp", "mass", "CAS"])
 
-flightTrajectory = TCL.constantSpeedRating(
+flightTrajectory = trajectorySegments.constantSpeedRating(
     AC=AC,
     speedType="CAS",
     v=CAS_final,
@@ -172,7 +172,7 @@ Hp, m_final, CAS_final = ft.getFinalValue(AC, ["Hp", "mass", "CAS"])
     deltaTemp=deltaTemp,
 )
 
-flightTrajectory = TCL.accDec(
+flightTrajectory = trajectorySegments.accDec(
     AC=AC,
     speedType="CAS",
     v_init=CAS_final,
@@ -192,7 +192,7 @@ ft.append(AC, flightTrajectory)
 # current values
 Hp, m_final, CAS_final = ft.getFinalValue(AC, ["Hp", "mass", "CAS"])
 
-flightTrajectory = TCL.constantSpeedRating(
+flightTrajectory = trajectorySegments.constantSpeedRating(
     AC=AC,
     speedType="CAS",
     v=CAS_final,
@@ -222,7 +222,7 @@ Hp, m_final, CAS_final = ft.getFinalValue(AC, ["Hp", "mass", "CAS"])
     deltaTemp=deltaTemp,
 )
 
-flightTrajectory = TCL.accDec(
+flightTrajectory = trajectorySegments.accDec(
     AC=AC,
     speedType="CAS",
     v_init=CAS_final,
@@ -242,7 +242,7 @@ ft.append(AC, flightTrajectory)
 # current values
 Hp, m_final, CAS_final = ft.getFinalValue(AC, ["Hp", "mass", "CAS"])
 
-flightTrajectory = TCL.constantSpeedRating(
+flightTrajectory = trajectorySegments.constantSpeedRating(
     AC=AC,
     speedType="CAS",
     v=CAS_final,
@@ -272,7 +272,7 @@ Hp, m_final, CAS_final = ft.getFinalValue(AC, ["Hp", "mass", "CAS"])
     deltaTemp=deltaTemp,
 )
 
-flightTrajectory = TCL.accDec(
+flightTrajectory = trajectorySegments.accDec(
     AC=AC,
     speedType="CAS",
     v_init=CAS_final,
@@ -292,7 +292,7 @@ ft.append(AC, flightTrajectory)
 # current values
 Hp, m_final, CAS_final = ft.getFinalValue(AC, ["Hp", "mass", "CAS"])
 
-flightTrajectory = TCL.constantSpeedRating(
+flightTrajectory = trajectorySegments.constantSpeedRating(
     AC=AC,
     speedType="CAS",
     v=CAS_final,
@@ -322,7 +322,7 @@ Hp, m_final, CAS_final = ft.getFinalValue(AC, ["Hp", "mass", "CAS"])
     deltaTemp=deltaTemp,
 )
 
-flightTrajectory = TCL.accDec(
+flightTrajectory = trajectorySegments.accDec(
     AC=AC,
     speedType="CAS",
     v_init=CAS_final,
@@ -342,7 +342,7 @@ ft.append(AC, flightTrajectory)
 # current values
 Hp, m_final, CAS_final = ft.getFinalValue(AC, ["Hp", "mass", "CAS"])
 
-flightTrajectory = TCL.constantSpeedRating(
+flightTrajectory = trajectorySegments.constantSpeedRating(
     AC=AC,
     speedType="CAS",
     v=CAS_final,
@@ -361,7 +361,7 @@ ft.append(AC, flightTrajectory)
 # current values
 Hp, m_final, CAS_final = ft.getFinalValue(AC, ["Hp", "mass", "CAS"])
 
-flightTrajectory = TCL.accDec(
+flightTrajectory = trajectorySegments.accDec(
     AC=AC,
     speedType="CAS",
     v_init=CAS_final,
@@ -385,7 +385,7 @@ Hp, m_final, CAS_final = ft.getFinalValue(AC, ["Hp", "mass", "CAS"])
 # calculate the crosover altitude for climb phase
 crossoverAltitude = conv.m2ft(atm.crossOver(Vcl2, Mcl))
 
-flightTrajectory = TCL.constantSpeedRating(
+flightTrajectory = trajectorySegments.constantSpeedRating(
     AC=AC,
     speedType="CAS",
     v=CAS_final,
@@ -403,7 +403,7 @@ ft.append(AC, flightTrajectory)
 # current values
 Hp, m_final = ft.getFinalValue(AC, ["Hp", "mass"])
 
-flightTrajectory = TCL.constantSpeedRating(
+flightTrajectory = trajectorySegments.constantSpeedRating(
     AC=AC,
     speedType="M",
     v=Mcl,
@@ -423,7 +423,7 @@ Hp, m_final, M_final = ft.getFinalValue(AC, ["Hp", "mass", "M"])
 
 if M_final < Mcr:
     control = target(acctarget=0.5)
-    flightTrajectory = TCL.accDec(
+    flightTrajectory = trajectorySegments.accDec(
         AC=AC,
         speedType="M",
         v_init=M_final,
@@ -443,9 +443,9 @@ if M_final < Mcr:
 # current values
 Hp, m_final = ft.getFinalValue(AC, ["Hp", "mass"])
 
-flightTrajectory = TCL.constantSpeedLevel(
+flightTrajectory = trajectorySegments.constantSpeedLevel(
     AC=AC,
-    lengthType="distance",
+    lengthType="DISTANCE",
     length=200,
     speedType="M",
     v=Mcr,
@@ -462,9 +462,9 @@ ft.append(AC, flightTrajectory)
 # current values
 Hp, m_final = ft.getFinalValue(AC, ["Hp", "mass"])
 
-flightTrajectory = TCL.constantSpeedLevel(
+flightTrajectory = trajectorySegments.constantSpeedLevel(
     AC=AC,
-    lengthType="distance",
+    lengthType="DISTANCE",
     length=200,
     step_length=50,
     maxRFL=36000,
@@ -484,7 +484,7 @@ ft.append(AC, flightTrajectory)
 # current values
 Hp, m_final, M_final = ft.getFinalValue(AC, ["Hp", "mass", "M"])
 
-flightTrajectory = TCL.accDec(
+flightTrajectory = trajectorySegments.accDec(
     AC=AC,
     speedType="M",
     v_init=M_final,
@@ -506,7 +506,7 @@ Hp, m_final = ft.getFinalValue(AC, ["Hp", "mass"])
 # calculate the crosover altitude for descend phase
 crossoverAltitude = conv.m2ft(atm.crossOver(Vdes2, Mdes))
 
-flightTrajectory = TCL.constantSpeedRating(
+flightTrajectory = trajectorySegments.constantSpeedRating(
     AC=AC,
     speedType="M",
     v=Mdes,
@@ -524,7 +524,7 @@ ft.append(AC, flightTrajectory)
 # current values
 Hp, m_final = ft.getFinalValue(AC, ["Hp", "mass"])
 
-flightTrajectory = TCL.constantSpeedRating(
+flightTrajectory = trajectorySegments.constantSpeedRating(
     AC=AC,
     speedType="CAS",
     v=conv.ms2kt(Vdes2),
@@ -554,7 +554,7 @@ Hp, m_final, CAS_final = ft.getFinalValue(AC, ["Hp", "mass", "CAS"])
     deltaTemp=deltaTemp,
 )
 
-flightTrajectory = TCL.accDec(
+flightTrajectory = trajectorySegments.accDec(
     AC=AC,
     speedType="CAS",
     v_init=CAS_final,
@@ -573,7 +573,7 @@ ft.append(AC, flightTrajectory)
 # current values
 Hp, m_final = ft.getFinalValue(AC, ["Hp", "mass"])
 
-flightTrajectory = TCL.constantSpeedRating(
+flightTrajectory = trajectorySegments.constantSpeedRating(
     AC=AC,
     speedType="CAS",
     v=conv.ms2kt(cas),
@@ -603,7 +603,7 @@ Hp, m_final, CAS_final = ft.getFinalValue(AC, ["Hp", "mass", "CAS"])
     deltaTemp=deltaTemp,
 )
 
-flightTrajectory = TCL.accDec(
+flightTrajectory = trajectorySegments.accDec(
     AC=AC,
     speedType="CAS",
     v_init=CAS_final,
@@ -622,7 +622,7 @@ ft.append(AC, flightTrajectory)
 # current values
 Hp, m_final = ft.getFinalValue(AC, ["Hp", "mass"])
 
-flightTrajectory = TCL.constantSpeedRating(
+flightTrajectory = trajectorySegments.constantSpeedRating(
     AC=AC,
     speedType="CAS",
     v=conv.ms2kt(cas),
@@ -642,7 +642,7 @@ ft.append(AC, flightTrajectory)
 Hp, m_final, CAS_final = ft.getFinalValue(AC, ["Hp", "mass", "CAS"])
 
 if AC.BADAFamily.BADA3:
-    flightTrajectory = TCL.constantSpeedSlope(
+    flightTrajectory = trajectorySegments.constantSpeedSlope(
         AC=AC,
         speedType="CAS",
         v=CAS_final,
@@ -656,7 +656,7 @@ if AC.BADAFamily.BADA3:
         deltaTemp=deltaTemp,
     )
 elif AC.BADAFamily.BADA4:
-    flightTrajectory = TCL.constantSpeedSlope(
+    flightTrajectory = trajectorySegments.constantSpeedSlope(
         AC=AC,
         speedType="CAS",
         v=CAS_final,
@@ -691,7 +691,7 @@ Hp, m_final, CAS_final = ft.getFinalValue(AC, ["Hp", "mass", "CAS"])
 )
 
 control = target(slopetarget=-3.0)
-flightTrajectory = TCL.accDec(
+flightTrajectory = trajectorySegments.accDec(
     AC=AC,
     speedType="CAS",
     v_init=CAS_final,
@@ -715,7 +715,7 @@ ft.append(AC, flightTrajectory)
 Hp, m_final, CAS_final = ft.getFinalValue(AC, ["Hp", "mass", "CAS"])
 
 if Hp > 2000:
-    flightTrajectory = TCL.constantSpeedSlope(
+    flightTrajectory = trajectorySegments.constantSpeedSlope(
         AC=AC,
         speedType="CAS",
         v=CAS_final,
@@ -749,7 +749,7 @@ Hp, m_final, CAS_final = ft.getFinalValue(AC, ["Hp", "mass", "CAS"])
 )
 
 control = target(slopetarget=-3.0)
-flightTrajectory = TCL.accDec(
+flightTrajectory = trajectorySegments.accDec(
     AC=AC,
     speedType="CAS",
     v_init=CAS_final,
@@ -773,7 +773,7 @@ ft.append(AC, flightTrajectory)
 Hp, m_final, CAS_final = ft.getFinalValue(AC, ["Hp", "mass", "CAS"])
 
 if Hp > 1500:
-    flightTrajectory = TCL.constantSpeedSlope(
+    flightTrajectory = trajectorySegments.constantSpeedSlope(
         AC=AC,
         speedType="CAS",
         v=CAS_final,
@@ -808,7 +808,7 @@ Hp, m_final, CAS_final = ft.getFinalValue(AC, ["Hp", "mass", "CAS"])
 
 control = target(slopetarget=-3.0)
 if AC.BADAFamily.BADA3:
-    flightTrajectory = TCL.accDec(
+    flightTrajectory = trajectorySegments.accDec(
         AC=AC,
         speedType="CAS",
         v_init=CAS_final,
@@ -824,7 +824,7 @@ if AC.BADAFamily.BADA3:
         deltaTemp=deltaTemp,
     )
 elif AC.BADAFamily.BADA4:
-    flightTrajectory = TCL.accDec(
+    flightTrajectory = trajectorySegments.accDec(
         AC=AC,
         speedType="CAS",
         v_init=CAS_final,
@@ -847,7 +847,7 @@ ft.append(AC, flightTrajectory)
 Hp, m_final, CAS_final = ft.getFinalValue(AC, ["Hp", "mass", "CAS"])
 
 if Hp > 1000:
-    flightTrajectory = TCL.constantSpeedSlope(
+    flightTrajectory = trajectorySegments.constantSpeedSlope(
         AC=AC,
         speedType="CAS",
         v=CAS_final,
@@ -881,7 +881,7 @@ Hp, m_final, CAS_final = ft.getFinalValue(AC, ["Hp", "mass", "CAS"])
 
 control = target(slopetarget=-3.0)
 if AC.BADAFamily.BADA3:
-    flightTrajectory = TCL.accDec(
+    flightTrajectory = trajectorySegments.accDec(
         AC=AC,
         speedType="CAS",
         v_init=CAS_final,
@@ -897,7 +897,7 @@ if AC.BADAFamily.BADA3:
         deltaTemp=deltaTemp,
     )
 elif AC.BADAFamily.BADA4:
-    flightTrajectory = TCL.accDec(
+    flightTrajectory = trajectorySegments.accDec(
         AC=AC,
         speedType="CAS",
         v_init=CAS_final,
@@ -919,7 +919,7 @@ ft.append(AC, flightTrajectory)
 # current values
 Hp, m_final, CAS_final = ft.getFinalValue(AC, ["Hp", "mass", "CAS"])
 
-flightTrajectory = TCL.constantSpeedSlope(
+flightTrajectory = trajectorySegments.constantSpeedSlope(
     AC=AC,
     speedType="CAS",
     v=CAS_final,