mirror/astronomy
1
0
Fork 0
mirror of https://github.com/cosinekitty/astronomy.git synced 2026-05-19 06:17:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Misc fixes for Raspberry Pi 4 build.

Browse Source 
On the Raspberry Pi 4, using latest versions of cppcheck
and pylint, a few more minor fixes were needed for eliminating
warnings.

Also had to soften a tolerance for the Kotlin unit tests.
This commit is contained in:
Don Cross
2023-06-19 16:28:34 -04:00
parent 7cf1a7eb7d
commit 63ed3746b2
7 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/python/astronomy/astronomy.py
View File

@@ -786,11 +786,11 @@ class _StarDef:
self.dec = 0.0
self.dist = 0.0 # signals that the star has not yet been defined
_StarTable = [_StarDef() for _ in range(8)]
_StarTable:List[_StarDef] = [_StarDef() for _ in range(8)]
def _GetStar(body: Body) -> Optional[_StarDef]:
if Body.Star1.value <= body.value <= Body.Star8.value:
return _StarTable[body.value - Body.Star1.value]
return _StarTable[int(body.value - Body.Star1.value)]
return None
def _UserDefinedStar(body: Body) -> Optional[_StarDef]:
@@ -867,7 +867,7 @@ def BodyCode(name: str) -> Body:
def _IsSuperiorPlanet(body: Body) -> bool:
return body in [Body.Mars, Body.Jupiter, Body.Saturn, Body.Uranus, Body.Neptune, Body.Pluto]
_PlanetOrbitalPeriod = [
_PlanetOrbitalPeriod:List[float] = [
87.969,
224.701,
_EARTH_ORBITAL_PERIOD,
@@ -944,7 +944,7 @@ def PlanetOrbitalPeriod(body: Body) -> float:
The mean orbital period of the body in days.
"""
if isinstance(body, Body) and (0 <= body.value < len(_PlanetOrbitalPeriod)):
return _PlanetOrbitalPeriod[body.value]
return _PlanetOrbitalPeriod[int(body.value)]
raise InvalidBodyError(body)
def _SynodicPeriod(body: Body) -> float:
@@ -954,7 +954,7 @@ def _SynodicPeriod(body: Body) -> float:
raise InvalidBodyError(body)
if body == Body.Moon:
return _MEAN_SYNODIC_MONTH
return abs(_EARTH_ORBITAL_PERIOD / (_EARTH_ORBITAL_PERIOD/_PlanetOrbitalPeriod[body.value] - 1.0))
return abs(_EARTH_ORBITAL_PERIOD / (_EARTH_ORBITAL_PERIOD/_PlanetOrbitalPeriod[int(body.value)] - 1.0))
def AngleBetween(a: Vector, b: Vector) -> float:
"""Calculates the angle in degrees between two vectors.
@@ -6313,7 +6313,7 @@ def _altdiff(context: _altitude_context, time: Time) -> float:
ofdate = Equator(context.body, time, context.observer, True, True)
hor = Horizon(time, context.observer, ofdate.ra, ofdate.dec, Refraction.Airless)
altitude = hor.altitude + math.degrees(math.asin(context.bodyRadiusAu / ofdate.dist))
return context.direction.value*(altitude - context.targetAltitude)
return float(context.direction.value)*(altitude - context.targetAltitude)
def _MaxAltitudeSlope(body: Body, latitude: float) -> float:
# Calculate the maximum possible rate that this body's altitude
@@ -8901,6 +8901,8 @@ def _LocalEclipse(shadow: _ShadowInfo, observer: Observer) -> LocalSolarEclipseI
t2 = shadow.time.AddDays(+PARTIAL_WINDOW)
partial_begin = _LocalEclipseTransition(observer, +1.0, _local_partial_distance, t1, shadow.time)
partial_end = _LocalEclipseTransition(observer, -1.0, _local_partial_distance, shadow.time, t2)
total_begin: Optional[EclipseEvent]
total_end: Optional[EclipseEvent]
if shadow.r < abs(shadow.k): # take absolute value of 'k' to handle annular eclipses too.
t1 = shadow.time.AddDays(-TOTAL_WINDOW)
t2 = shadow.time.AddDays(+TOTAL_WINDOW)
@@ -8908,9 +8910,9 @@ def _LocalEclipse(shadow: _ShadowInfo, observer: Observer) -> LocalSolarEclipseI
total_end = _LocalEclipseTransition(observer, -1.0, _local_total_distance, shadow.time, t2)
kind = _EclipseKindFromUmbra(shadow.k)
else:
kind = EclipseKind.Partial
total_begin = None
total_end = None
kind = EclipseKind.Partial
obscuration = 1.0 if (kind == EclipseKind.Total) else _SolarEclipseObscuration(shadow.dir, shadow.target)
return LocalSolarEclipseInfo(kind, obscuration, partial_begin, total_begin, peak, total_end, partial_end)
@@ -8948,6 +8950,8 @@ def _GeoidIntersect(shadow: _ShadowInfo) -> GlobalSolarEclipseInfo:
C = (e.x*e.x + e.y*e.y + e.z*e.z) - R*R
radic = B*B - 4*A*C
obscuration: Optional[float]
if radic > 0.0:
# Calculate the closer of the two intersection points.
# This will be on the day side of the Earth.