mirror/astronomy
1
0
Fork 0
mirror of https://github.com/cosinekitty/astronomy.git synced 2026-03-05 15:18:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Python: converted remaining enumerated types from IntEnum to Enum.

Browse Source 
Also added @enum.unique decorator to these types as a
sanity check that their values are all unique.
This commit is contained in:
Don Cross
2020-05-07 21:20:12 -04:00
parent 85cdeee357
commit bc69e723f2
3 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/python/astronomy.py
View File

@@ -3580,7 +3580,7 @@ def Equator(body, time, observer, ofdate, aberration):
return _vector2radec(datevect)
@enum.unique
class Refraction(enum.IntEnum):
class Refraction(enum.Enum):
"""Selects if/how to correct for atmospheric refraction.
Some functions allow enabling or disabling atmospheric refraction
@@ -3678,8 +3678,8 @@ def Horizon(time, observer, ra, dec, refraction):
optionally corrected for atmospheric refraction. See remarks above
for more details.
"""
if not (Refraction.Airless <= refraction <= Refraction.JplHorizons):
raise Error('Invalid refraction type: ' + str(refraction))
if not (Refraction.Airless.value <= refraction.value <= Refraction.JplHorizons.value):
raise Error('Invalid refraction type')
latrad = math.radians(observer.latitude)
lonrad = math.radians(observer.longitude)
@@ -4064,7 +4064,8 @@ class ElongationEvent:
self.elongation = elongation
self.ecliptic_separation = ecliptic_separation
class Visibility(enum.IntEnum):
@enum.unique
class Visibility(enum.Enum):
"""Indicates whether a body (especially Mercury or Venus) is best seen in the morning or evening.
Values
@@ -4899,7 +4900,7 @@ def SearchHourAngle(body, observer, hourAngle, startTime):
time = time.AddDays(delta_days)
@enum.unique
class Direction(enum.IntEnum):
class Direction(enum.Enum):
"""Indicates whether a body is rising above or setting below the horizon.
Specifies the direction of a rising or setting event for a body.
@@ -4936,7 +4937,7 @@ def _peak_altitude(context, time):
# This gives us the time of rise/set without the extra work.
hor = Horizon(time, context.observer, ofdate.ra, ofdate.dec, Refraction.Airless)
alt = hor.altitude + math.degrees(context.body_radius_au / ofdate.dist)
return context.direction * (alt + _REFRACTION_NEAR_HORIZON)
return context.direction.value * (alt + _REFRACTION_NEAR_HORIZON)
def SearchRiseSet(body, observer, direction, startTime, limitDays):
"""Searches for the next time a celestial body rises or sets as seen by an observer on the Earth.
@@ -5122,7 +5123,7 @@ def _moon_distance_slope(direction, time):
return direction * (dist2 - dist1) / dt
@enum.unique
class ApsisKind(enum.IntEnum):
class ApsisKind(enum.Enum):
"""Represents whether a satellite is at a closest or farthest point in its orbit.
An apsis is a point in a satellite's orbit that is closest to,
@@ -5263,7 +5264,7 @@ def NextLunarApsis(apsis):
# Verify that we found the opposite apsis from the previous one.
if apsis.kind not in [ApsisKind.Apocenter, ApsisKind.Pericenter]:
raise Error('Parameter "apsis" contains an invalid "kind" value.')
if next.kind + apsis.kind != 1:
if next.kind.value + apsis.kind.value != 1:
raise InternalError() # should have found opposite apsis kind
return next
@@ -5373,7 +5374,7 @@ def NextPlanetApsis(body, apsis):
time = apsis.time.AddDays(skip)
next = SearchPlanetApsis(body, time)
# Verify that we found the opposite apsis from the previous one.
if next.kind + apsis.kind != 1:
if next.kind.value + apsis.kind.value != 1:
raise InternalError() # should have found opposite planetary apsis type
return next