update data & tests

jyotisham · Apr 17, 2023 · 91bf0ee · 91bf0ee
1 parent 3b4c61f
commit 91bf0ee
Show file tree

Hide file tree

Showing 10 changed files with 347 additions and 447 deletions.
diff --git a/jyotisha/panchaanga/temporal/festival/applier/tithi_festival.py b/jyotisha/panchaanga/temporal/festival/applier/tithi_festival.py
@@ -352,7 +352,9 @@ def assign_pradosha_vratam(self):
       # compute offset from UTC in hours
       # PRADOSHA Vratam
       pref = ''
-      tithi_sunset = day_panchaanga.sunrise_day_angas.get_anga_at_jd(jd=day_panchaanga.jd_sunset, anga_type=AngaType.TITHI) % 15
+      tithi_sunset = day_panchaanga.sunrise_day_angas.get_anga_at_jd(jd=day_panchaanga.jd_sunset, anga_type=AngaType.TITHI) 
+      is_shukla_paksha = True if tithi_sunset.index <= 15 else False
+      tithi_sunset = tithi_sunset % 15
       tithi_sunset_tmrw = self.daily_panchaangas[d+1].sunrise_day_angas.get_anga_at_jd(jd=self.daily_panchaangas[d+1].jd_sunset, anga_type=AngaType.TITHI) % 15
       fday = None
       if tithi_sunset_tmrw == 13:
@@ -367,6 +369,14 @@ def assign_pradosha_vratam(self):
       if fday is not None:
         if self.daily_panchaangas[fday].date.get_weekday() == 1:
           pref = 'sOma-'
+        elif self.daily_panchaangas[fday].date.get_weekday() == 0 and is_shukla_paksha:
+          pref = 'ravivAra-zukla'
+        elif self.daily_panchaangas[fday].date.get_weekday() == 2 and is_shukla_paksha:
+          pref = 'bhaumavAra-zukla'
+        elif self.daily_panchaangas[fday].date.get_weekday() == 5 and is_shukla_paksha:
+          pref = 'zukravAra-zukla'
+        elif self.daily_panchaangas[fday].date.get_weekday() == 6 and is_shukla_paksha:
+          pref = 'zanivAra-zukla'
         elif self.daily_panchaangas[fday].date.get_weekday() == 6:
           pref = 'zani-'
         self.panchaanga.add_festival(fest_id=pref + 'pradOSa-vratam', date=self.daily_panchaangas[fday].date, interval_id="pradosha")

diff --git a/jyotisha/panchaanga/temporal/festival/data b/jyotisha/panchaanga/temporal/festival/data
diff --git a/jyotisha_tests/spatio_temporal/data/Chennai-2018.json b/jyotisha_tests/spatio_temporal/data/Chennai-2018.json
@@ -54895,6 +54895,16 @@
           "jsonClass": "FestivalInstance",
           "name": "aditi-payOvrata-samApanam"
         },
+        "bhaumavAra-zuklapradOSa-vratam": {
+          "interval": {
+            "jd_end": 2458177.0943,
+            "jd_start": 2458177.0305,
+            "jsonClass": "Interval",
+            "name": "प्रदोषः"
+          },
+          "jsonClass": "FestivalInstance",
+          "name": "bhaumavAra-zuklapradOSa-vratam"
+        },
         "gOvinda~mahAdvAdazI": {
           "interval": {
             "jd_end": 2458177.541,
@@ -54946,16 +54956,6 @@
           "jsonClass": "FestivalInstance",
           "name": "narasiMha-dvAdazI"
         },
-        "pradOSa-vratam": {
-          "interval": {
-            "jd_end": 2458177.0943,
-            "jd_start": 2458177.0305,
-            "jsonClass": "Interval",
-            "name": "प्रदोषः"
-          },
-          "jsonClass": "FestivalInstance",
-          "name": "pradOSa-vratam"
-        },
         "tiruccendUr_murugan2_mAcit_tiruvizhA_##10##m_nAL—tEr": {
           "interval": {
             "jd_end": 2458177.541,
@@ -109237,16 +109237,6 @@
           "jsonClass": "FestivalInstance",
           "name": "parazurAma-dvAdazI"
         },
-        "pradOSa-vratam": {
-          "interval": {
-            "jd_end": 2458236.0947,
-            "jd_start": 2458236.0346,
-            "jsonClass": "Interval",
-            "name": "प्रदोषः"
-          },
-          "jsonClass": "FestivalInstance",
-          "name": "pradOSa-vratam"
-        },
         "rukmiNI-dvAdazI": {
           "interval": {
             "jd_end": 2458236.5161,
@@ -109256,6 +109246,16 @@
           },
           "jsonClass": "FestivalInstance",
           "name": "rukmiNI-dvAdazI"
+        },
+        "zukravAra-zuklapradOSa-vratam": {
+          "interval": {
+            "jd_end": 2458236.0947,
+            "jd_start": 2458236.0346,
+            "jsonClass": "Interval",
+            "name": "प्रदोषः"
+          },
+          "jsonClass": "FestivalInstance",
+          "name": "zukravAra-zuklapradOSa-vratam"
         }
       },
       "graha_rise_jd": {
@@ -135550,15 +135550,15 @@
           "jsonClass": "FestivalInstance",
           "name": "vyatIpAta-zrAddham"
         },
-        "zani-pradOSa-vratam": {
+        "zanivAra-zuklapradOSa-vratam": {
           "interval": {
             "jd_end": 2458265.0982,
             "jd_start": 2458265.0393,
             "jsonClass": "Interval",
             "name": "प्रदोषः"
           },
           "jsonClass": "FestivalInstance",
-          "name": "zani-pradOSa-vratam"
+          "name": "zanivAra-zuklapradOSa-vratam"
         }
       },
       "graha_rise_jd": {
@@ -244748,15 +244748,15 @@
           "name": "vana-raxaka-vaiShNava-hatyA",
           "ordinal": 288
         },
-        "zani-pradOSa-vratam": {
+        "zanivAra-zuklapradOSa-vratam": {
           "interval": {
             "jd_end": 2458384.0846,
             "jd_start": 2458384.0221,
             "jsonClass": "Interval",
             "name": "प्रदोषः"
           },
           "jsonClass": "FestivalInstance",
-          "name": "zani-pradOSa-vratam"
+          "name": "zanivAra-zuklapradOSa-vratam"
         }
       },
       "graha_rise_jd": {
@@ -299213,6 +299213,16 @@
           "jsonClass": "FestivalInstance",
           "name": "bRndAvana-dvAdazI"
         },
+        "bhaumavAra-zuklapradOSa-vratam": {
+          "interval": {
+            "jd_end": 2458443.0696,
+            "jd_start": 2458443.0037,
+            "jsonClass": "Interval",
+            "name": "प्रदोषः"
+          },
+          "jsonClass": "FestivalInstance",
+          "name": "bhaumavAra-zuklapradOSa-vratam"
+        },
         "cAturmAsyavrata-samApanam": {
           "interval": {
             "jd_end": 2458443.5305,
@@ -299273,16 +299283,6 @@
           "jsonClass": "FestivalInstance",
           "name": "prabOdhOtsavaH"
         },
-        "pradOSa-vratam": {
-          "interval": {
-            "jd_end": 2458443.0696,
-            "jd_start": 2458443.0037,
-            "jsonClass": "Interval",
-            "name": "प्रदोषः"
-          },
-          "jsonClass": "FestivalInstance",
-          "name": "pradOSa-vratam"
-        },
         "tulasI-vivAhaH": {
           "interval": {
             "jd_end": 2458443.5305,
@@ -363897,6 +363897,20 @@
         "year": 2018
       }
     ],
+    "bhaumavAra-zuklapradOSa-vratam": [
+      {
+        "day": 27,
+        "jsonClass": "Date",
+        "month": 2,
+        "year": 2018
+      },
+      {
+        "day": 20,
+        "jsonClass": "Date",
+        "month": 11,
+        "year": 2018
+      }
+    ],
     "bhavAnyutpattiH": [
       {
         "day": 25,
@@ -368998,12 +369012,6 @@
         "month": 2,
         "year": 2018
       },
-      {
-        "day": 27,
-        "jsonClass": "Date",
-        "month": 2,
-        "year": 2018
-      },
       {
         "day": 14,
         "jsonClass": "Date",
@@ -369022,12 +369030,6 @@
         "month": 4,
         "year": 2018
       },
-      {
-        "day": 27,
-        "jsonClass": "Date",
-        "month": 4,
-        "year": 2018
-      },
       {
         "day": 13,
         "jsonClass": "Date",
@@ -369064,12 +369066,6 @@
         "month": 9,
         "year": 2018
       },
-      {
-        "day": 20,
-        "jsonClass": "Date",
-        "month": 11,
-        "year": 2018
-      },
       {
         "day": 4,
         "jsonClass": "Date",
@@ -372614,18 +372610,6 @@
       }
     ],
     "zani-pradOSa-vratam": [
-      {
-        "day": 26,
-        "jsonClass": "Date",
-        "month": 5,
-        "year": 2018
-      },
-      {
-        "day": 22,
-        "jsonClass": "Date",
-        "month": 9,
-        "year": 2018
-      },
       {
         "day": 6,
         "jsonClass": "Date",
@@ -372659,6 +372643,20 @@
         "year": 2018
       }
     ],
+    "zanivAra-zuklapradOSa-vratam": [
+      {
+        "day": 26,
+        "jsonClass": "Date",
+        "month": 5,
+        "year": 2018
+      },
+      {
+        "day": 22,
+        "jsonClass": "Date",
+        "month": 9,
+        "year": 2018
+      }
+    ],
     "zani~jayantI": [
       {
         "day": 15,
@@ -373053,6 +373051,14 @@
         "year": 2018
       }
     ],
+    "zukravAra-zuklapradOSa-vratam": [
+      {
+        "day": 27,
+        "jsonClass": "Date",
+        "month": 4,
+        "year": 2018
+      }
+    ],
     "zvEta-kalpAdiH": [
       {
         "day": 18,