Added Part of Eros and translations for all new objects.

theriftlab · theriftlab · commit 3d0a7b166575 · 2024-05-07T15:43:50.000-07:00
diff --git a/docs/5-settings.md b/docs/5-settings.md
@@ -236,6 +236,7 @@ Calculated points:
 * `chart.SYZYGY`
 * `chart.PART_OF_FORTUNE`
 * `chart.PART_OF_SPIRIT`
+* `chart.PART_OF_EROS`
 
 Pre & post-natal eclipses:
 
@@ -374,6 +375,7 @@ Default:
     chart.SYZYGY: self.point_aspect_rule,
     chart.PART_OF_FORTUNE: self.point_aspect_rule,
     chart.PART_OF_SPIRIT: self.point_aspect_rule,
+    chart.PART_OF_EROS: self.point_aspect_rule,
     chart.VERTEX: self.point_aspect_rule,
     chart.LILITH: self.point_aspect_rule,
     chart.TRUE_LILITH: self.point_aspect_rule,
@@ -475,6 +477,7 @@ Default:
     chart.SYZYGY: self.point_orbs,
     chart.PART_OF_FORTUNE: self.point_orbs,
     chart.PART_OF_SPIRIT: self.point_orbs,
+    chart.PART_OF_EROS: self.point_orbs,
     chart.VERTEX: self.point_orbs,
     chart.LILITH: self.point_orbs,
     chart.TRUE_LILITH: self.point_orbs,
@@ -500,7 +503,7 @@ Default `calc.NAIBOD`.
 
 ### `part_formula`
 
-Which formula to use when calculating the Part of Fortune or Spirit.
+Which formula to use when calculating the Part of Fortune / Spirit / Eros.
 
 | Option | Description |
 | --- | --- |
diff --git a/immanuel/const/calc.py b/immanuel/const/calc.py
@@ -84,15 +84,11 @@
 SOLAR_ARC = 1
 DAILY_HOUSES = 2
 
-""" Part of Fortune formulae. """
+""" Part of Fortune / Spirit / Eros formulae. """
 DAY_FORMULA = 0
 NIGHT_FORMULA = 1
 DAY_NIGHT_FORMULA = 2
 
-""" Composite Part of Fortune calculations. """
-MIDPOINT = 0
-COMPOSITE = 1
-
 """ Orb calculation when two chart objects have different orbs. """
 MEAN = 0
 MAX = 1
diff --git a/immanuel/const/chart.py b/immanuel/const/chart.py
@@ -124,6 +124,7 @@
 SYZYGY = POINT + 9
 PART_OF_FORTUNE = POINT + 10
 PART_OF_SPIRIT = POINT + 11
+PART_OF_EROS = POINT + 12
 
 """ Fixed stars. """
 FIXED_STAR = 7 * TYPE_MULTIPLIER
diff --git a/immanuel/const/names.py b/immanuel/const/names.py
@@ -135,6 +135,7 @@
     chart.SYZYGY: 'Syzygy',
     chart.PART_OF_FORTUNE: 'Part of Fortune',
     chart.PART_OF_SPIRIT: 'Part of Spirit',
+    chart.PART_OF_EROS: 'Part of Eros',
 }
 
 ECLIPSES = {
diff --git a/immanuel/locales/es_ES/LC_MESSAGES/immanuel.mo b/immanuel/locales/es_ES/LC_MESSAGES/immanuel.mo
diff --git a/immanuel/locales/es_ES/LC_MESSAGES/immanuel.po b/immanuel/locales/es_ES/LC_MESSAGES/immanuel.po
@@ -305,12 +305,21 @@ msgstr "Lilith"
 msgid "True Lilith"
 msgstr "Lilith Verdadera"
 
+msgid "Interpolated Lilith"
+msgstr "Lilith interpolada"
+
 msgid "Syzygy"
 msgstr "Sizigia"
 
 msgid "Part of Fortune"
 msgstr "Parte de la Fortuna"
 
+msgid "Part of Spirit"
+msgstr "Parte del Espíritu"
+
+msgid "Part of Eros"
+msgstr "Parte de Eros"
+
 
 # Eclipses
 
diff --git a/immanuel/locales/es_ES/mappings.py b/immanuel/locales/es_ES/mappings.py
@@ -42,8 +42,11 @@
     chart.VERTEX: genders.MASCULINE,
     chart.LILITH: genders.FEMININE,
     chart.TRUE_LILITH: genders.FEMININE,
+    chart.INTERPOLATED_LILITH: genders.FEMININE,
     chart.SYZYGY: genders.FEMININE,
     chart.PART_OF_FORTUNE: genders.FEMININE,
+    chart.PART_OF_SPIRIT: genders.FEMININE,
+    chart.PART_OF_EROS: genders.FEMININE,
 
     chart.PRE_NATAL_SOLAR_ECLIPSE: genders.MASCULINE,
     chart.PRE_NATAL_LUNAR_ECLIPSE: genders.MASCULINE,
diff --git a/immanuel/locales/immanuel.pot b/immanuel/locales/immanuel.pot
@@ -305,12 +305,21 @@ msgstr ""
 msgid "True Lilith"
 msgstr ""
 
+msgid "Interpolated Lilith"
+msgstr ""
+
 msgid "Syzygy"
 msgstr ""
 
 msgid "Part of Fortune"
 msgstr ""
 
+msgid "Part of Spirit"
+msgstr ""
+
+msgid "Part of Eros"
+msgstr ""
+
 
 # Eclipses
 
diff --git a/immanuel/locales/pt_BR/LC_MESSAGES/immanuel.mo b/immanuel/locales/pt_BR/LC_MESSAGES/immanuel.mo
diff --git a/immanuel/locales/pt_BR/LC_MESSAGES/immanuel.po b/immanuel/locales/pt_BR/LC_MESSAGES/immanuel.po
@@ -305,12 +305,21 @@ msgstr "Lilith"
 msgid "True Lilith"
 msgstr "Lilith Verdadeira"
 
+msgid "Interpolated Lilith"
+msgstr "Lilith interpolada"
+
 msgid "Syzygy"
 msgstr "Sizígia"
 
 msgid "Part of Fortune"
 msgstr "Roda da Fortuna"
 
+msgid "Part of Spirit"
+msgstr "Parte do Espírito"
+
+msgid "Part of Eros"
+msgstr "Parte de Eros"
+
 
 # Eclipses
 
diff --git a/immanuel/locales/pt_BR/mappings.py b/immanuel/locales/pt_BR/mappings.py
@@ -42,8 +42,11 @@
     chart.VERTEX: genders.MASCULINE,
     chart.LILITH: genders.FEMININE,
     chart.TRUE_LILITH: genders.FEMININE,
+    chart.INTERPOLATED_LILITH: genders.FEMININE,
     chart.SYZYGY: genders.FEMININE,
     chart.PART_OF_FORTUNE: genders.FEMININE,
+    chart.PART_OF_SPIRIT: genders.FEMININE,
+    chart.PART_OF_EROS: genders.FEMININE,
 
     chart.PRE_NATAL_SOLAR_ECLIPSE: genders.MASCULINE,
     chart.PRE_NATAL_LUNAR_ECLIPSE: genders.MASCULINE,
diff --git a/immanuel/setup.py b/immanuel/setup.py
@@ -170,7 +170,7 @@ def __init__(self) -> None:
         """ MC progression formula for secondary progressions. """
         self.mc_progression_method = calc.NAIBOD
 
-        """ Part of Fortune / Spirit formula. """
+        """ Part of Fortune / Spirit / Eros formula. """
         self.part_formula = calc.DAY_NIGHT_FORMULA
 
         """ Dignity settings. """
@@ -279,6 +279,7 @@ def aspect_rules(self) -> dict:
             chart.SYZYGY: self.point_aspect_rule,
             chart.PART_OF_FORTUNE: self.point_aspect_rule,
             chart.PART_OF_SPIRIT: self.point_aspect_rule,
+            chart.PART_OF_EROS: self.point_aspect_rule,
             chart.VERTEX: self.point_aspect_rule,
             chart.LILITH: self.point_aspect_rule,
             chart.TRUE_LILITH: self.point_aspect_rule,
@@ -316,6 +317,7 @@ def orbs(self) -> dict:
             chart.SYZYGY: self.point_orbs,
             chart.PART_OF_FORTUNE: self.point_orbs,
             chart.PART_OF_SPIRIT: self.point_orbs,
+            chart.PART_OF_EROS: self.point_orbs,
             chart.VERTEX: self.point_orbs,
             chart.LILITH: self.point_orbs,
             chart.TRUE_LILITH: self.point_orbs,
diff --git a/immanuel/tools/calculate.py b/immanuel/tools/calculate.py
@@ -31,19 +31,39 @@ def is_daytime(sun: dict | float, asc: dict | float) -> bool:
     return swe.difdeg2n(sun_lon, asc_lon) < 0
 
 
-def part_longitude(index: int, sun: dict | float, moon: dict | float, asc: dict | float, formula: int) -> float:
+def part_longitude(index: int, sun: dict | float, moon: dict | float, asc: dict | float, venus: dict | float = None, formula: int = calc.DAY_NIGHT_FORMULA) -> float:
     """ Returns the longitude of the given Part - currently supports Parts of
-    Fortune and Spirit. """
+    Fortune, Spirit and Eros. """
     sun_lon, moon_lon, asc_lon = (object['lon'] if isinstance(object, dict) else object for object in (sun, moon, asc))
+    night = formula == calc.NIGHT_FORMULA or (formula == calc.DAY_NIGHT_FORMULA and not is_daytime(sun_lon, asc_lon))
 
-    if formula == calc.NIGHT_FORMULA or (formula == calc.DAY_NIGHT_FORMULA and not is_daytime(sun_lon, asc_lon)):
-        lon = asc_lon + sun_lon - moon_lon if index == chart.PART_OF_FORTUNE else asc_lon + moon_lon - sun_lon
-    else:
-        lon = asc_lon + moon_lon - sun_lon if index == chart.PART_OF_FORTUNE else asc_lon + sun_lon - moon_lon
+    if index == chart.PART_OF_FORTUNE:
+        lon = _part_of_fortune(sun_lon, moon_lon, asc_lon, night)
+    elif index == chart.PART_OF_SPIRIT:
+        lon = _part_of_spirit(sun_lon, moon_lon, asc_lon, night)
+    elif index == chart.PART_OF_EROS:
+        venus_lon = venus['lon'] if isinstance(venus, dict) else venus
+        spirit_lon = _part_of_spirit(sun_lon, moon_lon, asc_lon, night)
+        lon = _part_of_eros(venus_lon, spirit_lon, asc_lon, night)
 
     return swe.degnorm(lon)
 
 
+def _part_of_fortune(sun_lon: float, moon_lon: float, asc_lon: float, night: bool) -> float:
+    """ Night & day calculations for Part of Fortune. """
+    return asc_lon + sun_lon - moon_lon if night else asc_lon + moon_lon - sun_lon
+
+
+def _part_of_spirit(sun_lon: float, moon_lon: float, asc_lon: float, night: bool) -> float:
+    """ Night & day calculations for Part of Spirit. """
+    return asc_lon + moon_lon - sun_lon if night else asc_lon + sun_lon - moon_lon
+
+
+def _part_of_eros(venus_lon: float, spirit_lon: float, asc_lon: float, night: bool) -> float:
+    """ Night & day calculations for Part of Eros. """
+    return asc_lon + spirit_lon - venus_lon if night else asc_lon + venus_lon - spirit_lon
+
+
 def sidereal_time(armc: dict | float) -> float:
     """ Returns sidereal time based on ARMC longitude. """
     return (armc['lon'] if isinstance(armc, dict) else armc) / 15
@@ -61,10 +81,11 @@ def object_movement(object: dict | float) -> int:
 
 def object_movement_typical(object: dict) -> bool:
     """ Returns whether an object's movement is typical, ie. direct for planets,
-    retrograde for nodes, stationary for Part of Fortune and eclipses. """
+    retrograde for nodes, stationary for Parts and eclipses. """
     if object['index'] in (
             chart.PART_OF_FORTUNE,
             chart.PART_OF_SPIRIT,
+            chart.PART_OF_EROS,
             chart.PRE_NATAL_SOLAR_ECLIPSE,
             chart.PRE_NATAL_LUNAR_ECLIPSE,
             chart.POST_NATAL_SOLAR_ECLIPSE,
diff --git a/immanuel/tools/ephemeris.py b/immanuel/tools/ephemeris.py
@@ -73,6 +73,7 @@
     chart.SYZYGY: chart.SYZYGY,
     chart.PART_OF_FORTUNE: chart.PART_OF_FORTUNE,
     chart.PART_OF_SPIRIT: chart.PART_OF_SPIRIT,
+    chart.PART_OF_EROS: chart.PART_OF_EROS,
 }
 
 
@@ -357,7 +358,7 @@ def _point(index: int, jd: float, lat: float, lon: float, house_system: int, par
     if index == chart.SYZYGY:
         return _syzygy(jd)
 
-    if index in (chart.PART_OF_FORTUNE, chart.PART_OF_SPIRIT):
+    if index in (chart.PART_OF_FORTUNE, chart.PART_OF_SPIRIT, chart.PART_OF_EROS):
         return _part(index, jd, lat, lon, part_formula, armc, armc_obliquity)
 
     return _swisseph_point(index, jd)
@@ -627,8 +628,9 @@ def _syzygy(jd: float) -> dict:
 def _part(index: int, jd: float, lat: float, lon: float, formula: int, armc: float = None, armc_obliquity: float = None) -> dict:
     sun = planet(chart.SUN, jd)
     moon = planet(chart.MOON, jd)
+    venus = planet(chart.VENUS, jd) if index == chart.PART_OF_EROS else None
     asc = angle(chart.ASC, jd, lat, lon, chart.PLACIDUS) if armc is None else armc_angle(chart.ASC, armc, lat, armc_obliquity, chart.PLACIDUS)
-    lon = calculate.part_longitude(index, sun, moon, asc, formula)
+    lon = calculate.part_longitude(index, sun, moon, asc, venus, formula)
     dec = swe.cotrans((lon, 0, 0), -obliquity(jd))[1]
 
     return {
diff --git a/tests/test_calculate.py b/tests/test_calculate.py
@@ -45,7 +45,7 @@ def test_is_daytime(day_jd, night_jd, coords):
 
 def test_part_of_fortune_day_formula(day_jd, coords):
     sun, moon, asc = ephemeris.objects((chart.SUN, chart.MOON, chart.ASC), day_jd, *coords, chart.PLACIDUS).values()
-    pof = calculate.part_longitude(chart.PART_OF_FORTUNE, sun, moon, asc, calc.DAY_FORMULA)
+    pof = calculate.part_longitude(chart.PART_OF_FORTUNE, sun, moon, asc, formula=calc.DAY_FORMULA)
     sign = position.sign(pof)
     lon = position.sign_longitude(pof)
     assert sign == chart.CAPRICORN
@@ -54,7 +54,7 @@ def test_part_of_fortune_day_formula(day_jd, coords):
 
 def test_part_of_fortune_night_formula(night_jd, coords):
     sun, moon, asc = ephemeris.objects((chart.SUN, chart.MOON, chart.ASC), night_jd, *coords, chart.PLACIDUS).values()
-    pof = calculate.part_longitude(chart.PART_OF_FORTUNE, sun, moon, asc, calc.NIGHT_FORMULA)
+    pof = calculate.part_longitude(chart.PART_OF_FORTUNE, sun, moon, asc, formula=calc.NIGHT_FORMULA)
     sign = position.sign(pof)
     lon = position.sign_longitude(pof)
     assert sign == chart.SAGITTARIUS
@@ -64,23 +64,45 @@ def test_part_of_fortune_night_formula(night_jd, coords):
 def test_part_of_spirit_day_formula(day_jd, coords):
     # Courtesy of astro-seek.com which does not include arc-seconds
     sun, moon, asc = ephemeris.objects((chart.SUN, chart.MOON, chart.ASC), day_jd, *coords, chart.PLACIDUS).values()
-    pos = calculate.part_longitude(chart.PART_OF_SPIRIT, sun, moon, asc, calc.DAY_FORMULA)
+    pos = calculate.part_longitude(chart.PART_OF_SPIRIT, sun, moon, asc, formula=calc.DAY_FORMULA)
     sign = position.sign(pos)
     lon = position.sign_longitude(pos)
     assert sign == chart.ARIES
     # Since astro-seek does all its calculations without arc-seconds, we will have to be approximate
-    assert round(lon, 1) == convert.to_dec('29°54\'')
+    assert round(lon, 1) == round(convert.to_dec('29°54\''), 1)
 
 
 def test_part_of_spirit_night_formula(night_jd, coords):
     # Courtesy of astro-seek.com which does not include arc-seconds
     sun, moon, asc = ephemeris.objects((chart.SUN, chart.MOON, chart.ASC), night_jd, *coords, chart.PLACIDUS).values()
-    pos = calculate.part_longitude(chart.PART_OF_SPIRIT, sun, moon, asc, calc.NIGHT_FORMULA)
+    pos = calculate.part_longitude(chart.PART_OF_SPIRIT, sun, moon, asc, formula=calc.NIGHT_FORMULA)
     sign = position.sign(pos)
     lon = position.sign_longitude(pos)
     assert sign == chart.LEO
     # Since astro-seek does all its calculations without arc-seconds, we will have to be approximate
-    assert round(lon, 1) == convert.to_dec('12°18\'')
+    assert round(lon, 1) == round(convert.to_dec('12°18\''), 1)
+
+
+def test_part_of_eros_day_formula(day_jd, coords):
+    # Courtesy of astro-seek.com which does not include arc-seconds
+    sun, moon, asc, venus = ephemeris.objects((chart.SUN, chart.MOON, chart.ASC, chart.VENUS), day_jd, *coords, chart.PLACIDUS).values()
+    poe = calculate.part_longitude(chart.PART_OF_EROS, sun, moon, asc, venus, formula=calc.DAY_FORMULA)
+    sign = position.sign(poe)
+    lon = position.sign_longitude(poe)
+    assert sign == chart.LIBRA
+    # Since astro-seek does all its calculations without arc-seconds, we will have to be approximate
+    assert round(lon, 1) == round(convert.to_dec('07°34\''), 1)
+
+
+def test_part_of_eros_night_formula(night_jd, coords):
+    # Courtesy of astro-seek.com which does not include arc-seconds
+    sun, moon, asc, venus = ephemeris.objects((chart.SUN, chart.MOON, chart.ASC, chart.VENUS), night_jd, *coords, chart.PLACIDUS).values()
+    poe = calculate.part_longitude(chart.PART_OF_EROS, sun, moon, asc, venus, formula=calc.NIGHT_FORMULA)
+    sign = position.sign(poe)
+    lon = position.sign_longitude(poe)
+    assert sign == chart.GEMINI
+    # Since astro-seek does all its calculations without arc-seconds, we will have to be approximate
+    assert round(lon, 1) == round(convert.to_dec('22°08\''), 1)
 
 
 def test_sidereal_time(day_jd, coords):

Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,7 @@`
`135`	`135`	`chart.SYZYGY: 'Syzygy',`
`136`	`136`	`chart.PART_OF_FORTUNE: 'Part of Fortune',`
`137`	`137`	`chart.PART_OF_SPIRIT: 'Part of Spirit',`
	`138`	`+ chart.PART_OF_EROS: 'Part of Eros',`
`138`	`139`	`}`
`139`	`140`
`140`	`141`	`ECLIPSES = {`