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

pyBADA/bada3.py

@@ -1,32 +1,19 @@
 """Generic BADA3 aircraft performance module."""
 
-from math import sqrt, isnan, asin, atan
-import numpy as np
-
 import os
-from datetime import date
 import xml.etree.ElementTree as ET
+from datetime import date
+from math import asin, atan, isnan, sqrt
+
+import numpy as np
 import pandas as pd
 
-from pyBADA import constants as const
-from pyBADA import conversions as conv
+from pyBADA import utils
 from pyBADA import atmosphere as atm
 from pyBADA import configuration as configuration
-from pyBADA.aircraft import Airplane, BadaFamily, Bada
-
-
-def proper_round(num, dec=0):
-    num = str(num)[: str(num).index(".") + dec + 2]
-    if num[-1] >= "5":
-        return float(num[: -2 - (not dec)] + str(int(num[-2 - (not dec)]) + 1))
-    return float(num[:-1])
-
-
-def checkArgument(argument, **kwargs):
-    if kwargs.get(argument) is not None:
-        return kwargs.get(argument)
-    else:
-        raise TypeError("Missing " + argument + " argument")
+from pyBADA import constants as const
+from pyBADA import conversions as conv
+from pyBADA.aircraft import Airplane, Bada, BadaFamily
 
 
 class Parser:
@@ -1758,11 +1745,11 @@ class BADA3(Airplane, Bada):
 
         elif rating == "ADAPTED":
             # ADAPTED
-            ROCD = checkArgument("ROCD", **kwargs)
-            mass = checkArgument("mass", **kwargs)
-            v = checkArgument("v", **kwargs)
-            acc = checkArgument("acc", **kwargs)
-            Drag = checkArgument("Drag", **kwargs)
+            ROCD = utils.checkArgument("ROCD", **kwargs)
+            mass = utils.checkArgument("mass", **kwargs)
+            v = utils.checkArgument("v", **kwargs)
+            acc = utils.checkArgument("acc", **kwargs)
+            Drag = utils.checkArgument("Drag", **kwargs)
             T = self.TAdapted(
                 h=h,
                 DeltaTemp=DeltaTemp,
@@ -3895,22 +3882,22 @@ class PTD(BADA3):
                 * 60
             )
 
-            FL_complet.append(proper_round(FL))
-            T_complet.append(theta * const.temp_0)
-            p_complet.append(delta * const.p_0)
-            rho_complet.append(sigma * const.rho_0)
-            a_complet.append(a)
-            TAS_complet.append(conv.ms2kt(tas))
-            CAS_complet.append(conv.ms2kt(cas))
-            M_complet.append(M)
-            mass_complet.append(mass)
-            Thrust_complet.append(Thrust)
-            Drag_complet.append(Drag)
-            ff_comlet.append(ff)
-            ESF_complet.append(ESF)
-            ROCD_complet.append(ROCD)
-            TDC_complet.append(TDC)
-            PWC_complet.append(CPowRed)
+            FL_complet.append(utils.proper_round(FL))
+            T_complet.append(utils.proper_round(theta * const.temp_0))
+            p_complet.append(utils.proper_round(delta * const.p_0))
+            rho_complet.append(utils.proper_round(sigma * const.rho_0,3))
+            a_complet.append(utils.proper_round(a))
+            TAS_complet.append(utils.proper_round(conv.ms2kt(tas),2))
+            CAS_complet.append(utils.proper_round(conv.ms2kt(cas),2))
+            M_complet.append(utils.proper_round(M,2))
+            mass_complet.append(utils.proper_round(mass))
+            Thrust_complet.append(utils.proper_round(Thrust))
+            Drag_complet.append(utils.proper_round(Drag))
+            ff_comlet.append(utils.proper_round(ff,1))
+            ESF_complet.append(utils.proper_round(ESF,2))
+            ROCD_complet.append(utils.proper_round(ROCD))
+            TDC_complet.append(utils.proper_round(TDC))
+            PWC_complet.append(utils.proper_round(CPowRed,2))
 
         CLList = [
             FL_complet,
@@ -4082,22 +4069,22 @@ class PTD(BADA3):
             else:
                 gamma = conv.rad2deg(asin(dhdt / tas))
 
-            FL_complet.append(proper_round(FL))
-            T_complet.append(theta * const.temp_0)
-            p_complet.append(delta * const.p_0)
-            rho_complet.append(sigma * const.rho_0)
-            a_complet.append(a)
-            TAS_complet.append(conv.ms2kt(tas))
-            CAS_complet.append(conv.ms2kt(cas))
-            M_complet.append(M)
-            mass_complet.append(mass)
-            Thrust_complet.append(Thrust)
-            Drag_complet.append(Drag)
-            ff_comlet.append(ff)
-            ESF_complet.append(ESF)
-            ROCD_complet.append(-1 * ROCD)
-            TDC_complet.append(TDC)
-            gamma_complet.append(gamma)
+            FL_complet.append(utils.proper_round(FL))
+            T_complet.append(utils.proper_round(theta * const.temp_0))
+            p_complet.append(utils.proper_round(delta * const.p_0))
+            rho_complet.append(utils.proper_round(sigma * const.rho_0,3))
+            a_complet.append(utils.proper_round(a))
+            TAS_complet.append(utils.proper_round(conv.ms2kt(tas),2))
+            CAS_complet.append(utils.proper_round(conv.ms2kt(cas),2))
+            M_complet.append(utils.proper_round(M,2))
+            mass_complet.append(utils.proper_round(mass))
+            Thrust_complet.append(utils.proper_round(Thrust))
+            Drag_complet.append(utils.proper_round(Drag))
+            ff_comlet.append(utils.proper_round(ff,1))
+            ESF_complet.append(utils.proper_round(ESF,2))
+            ROCD_complet.append(utils.proper_round(-1 * ROCD))
+            TDC_complet.append(utils.proper_round(TDC))
+            gamma_complet.append(utils.proper_round(gamma,2))
 
         DESList = [
             FL_complet,
@@ -4320,7 +4307,7 @@ class PTF(BADA3):
         DESList = Nan2Zero(DESList)
 
         for k in range(0, len(altitudeList)):
-            FL = proper_round(altitudeList[k] / 100)
+            FL = utils.proper_round(altitudeList[k] / 100)
             if FL < 30:
                 file.write(
                     "%3.0f |                           |  %3.0f   %5.0f %5.0f %5.0f   %5.1f  |  %3.0f  %5.0f  %5.1f  \n"
@@ -4428,10 +4415,10 @@ class PTF(BADA3):
                     self.ff(flightPhase="Cruise", v=tas, h=H_m, T=Thrust) * 60
                 )
 
-            TAS_CR_complet.append(conv.ms2kt(tas_nominal))
-            FF_CR_LO_complet.append(ff[0])
-            FF_CR_NOM_complet.append(ff[1])
-            FF_CR_HI_complet.append(ff[2])
+            TAS_CR_complet.append(utils.proper_round(conv.ms2kt(tas_nominal)))
+            FF_CR_LO_complet.append(utils.proper_round(ff[0],1))
+            FF_CR_NOM_complet.append(utils.proper_round(ff[1],1))
+            FF_CR_HI_complet.append(utils.proper_round(ff[2],1))
 
         CRList = [
             TAS_CR_complet,
@@ -4552,11 +4539,11 @@ class PTF(BADA3):
                 tas_list.append(tas)
                 ff_list.append(ff)
 
-            TAS_CL_complet.append(conv.ms2kt(tas_list[1]))
-            ROCD_CL_LO_complet.append(ROC[0])
-            ROCD_CL_NOM_complet.append(ROC[1])
-            ROCD_CL_HI_complet.append(ROC[2])
-            FF_CL_NOM_complet.append(ff_list[1])
+            TAS_CL_complet.append(utils.proper_round(conv.ms2kt(tas_list[1])))
+            ROCD_CL_LO_complet.append(utils.proper_round(ROC[0]))
+            ROCD_CL_NOM_complet.append(utils.proper_round(ROC[1]))
+            ROCD_CL_HI_complet.append(utils.proper_round(ROC[2]))
+            FF_CL_NOM_complet.append(utils.proper_round(ff_list[1],1))
 
         CLList = [
             TAS_CL_complet,
@@ -4693,9 +4680,9 @@ class PTF(BADA3):
                 * 60
             )
 
-            TAS_DES_complet.append(conv.ms2kt(tas_nominal))
-            ROCD_DES_NOM_complet.append(ROCD)
-            FF_DES_NOM_complet.append(ff_nominal)
+            TAS_DES_complet.append(utils.proper_round(conv.ms2kt(tas_nominal)))
+            ROCD_DES_NOM_complet.append(utils.proper_round(ROCD))
+            FF_DES_NOM_complet.append(utils.proper_round(ff_nominal,1))
 
         DESList = [TAS_DES_complet, ROCD_DES_NOM_complet, FF_DES_NOM_complet]