PyJHora 4.4.5__tar.gz → 4.5.0__tar.gz

{pyjhora-4.4.5/src/PyJHora.egg-info → pyjhora-4.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: PyJHora
-Version: 4.4.5
+Version: 4.5.0
 Summary: Complete Vedic Astrology Python package.
 Author-email: Sundar Sundaresan <carnaticmusicguru2015@comcast.net>
 License:  GNU AFFERO GENERAL PUBLIC LICENSE
@@ -676,8 +676,9 @@ Classifier: Topic :: Scientific/Engineering :: Astronomy
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: license-file
 
-JHora 4.4.5
+JHora 4.5.0
 =================
 Python package containing almost all the features described in the book
 
@@ -939,6 +940,8 @@ Added `drik.next_lunar_month`, `drik.next_lunar_year`, `drik.previous_lunar_mont
 
 Added `vedic_date(jd,place,calendar_type)` to get solar/lunar month/day/year
 
+Updated `tithi(jd,place)` to return adhik tithi of the day if it exists. Update `vedic_date(jd,place,calendar_type)` to include Adhik and Nija maasa booleans. Introduced an experimental function `next_tithi` to calculate next particular tithi occuring date/time. Added ayanamsa while calculating `declination_of_planets`. Added a lambda function `special_tithis(jd,place)` to compute all special tithis as a list.
+
 * `jhora.panchanga.pancha_paksha`:
 
 This module calculates pancha pakshi sastra.
@@ -968,6 +971,10 @@ Added `lattha_stars_planets` function to find Lattha stars of the planets.
 
 Added `get_64th_navamsa(navamsa_planet_positions)` and `get_22nd_drekkana(drekkana_planet_positions)` functions.
 
+Hora chart default method (`chart_method`) changed to traditional Parasara.
+
+Method `benefics_and_malefics` modified to consider Waxing/Waning moon and association of Mars with benefics/malefics. This is used in `strength.py` to calculate shadbala. 
+
 * `jhora.horoscope.chart.dosha`: 
 
 8 types of dosha (kala sarpa, manglik, pitru, guru chandala, ganda moola, kalathra, ghata, shrapit)
@@ -984,8 +991,13 @@ Module to find sphutas such as tri, chathur, pancha, prana, deha, mrityu, sooshm
 
 Module to find various balas/strnegths of planet such as harsha bala, kshetra, sapthavargaja, sthana, ojayugama, kendra, dreshkon, uccha, uccha rashmi, hadda, drekkana, navamsa, pancha vargeeya, dwadhasa_vargeeya, dig, divaratri, nathonnath, paksha, tribhaga, abda, masa, vaara, hora, ayana, yuddha, kaala, ishta, subha, cheshta, cheshta rashmi, naisargika, drik, shad, bhava adhipathi, bhava dig, bhava drik, bhava drishti.
 
+Modified shadbala calculations to match that of BVRaman and VPJain calculations. Added to tests to verify we get same results as theirs. Since each do calculations differently (different ayanamsa etc, different epoch), appropriate changes made. Please note that these calculations (with same date as theirs) will give different results in Jagannath Hora software. We are unware of the alogirithm used in JHora. Added `get_planet_mean_longitude(jd,place,planet_index=0)` to calculated planet mean longitude for calculating Cheshta bala.
+
+
 Added `planet_aspect_relationship_table` function to get planet aspect relationship table based Parasara's Drik bala calculations.
 
+Updated Shadbala calculations to fix the errors. Now the results match the calculations of VP Jain and BV Raman examples in their respective books. However, it is important to note, shadbala calculations does not match with JHora (even for these examples).
+
 * `jhora.horoscope.chart.yoga`: 
 
 Module to find about 100 yogas such as vesi, vosi, ubhayachara, nipuna, sunaphaa, anaphaa, duradhara, kemadruma, chandra_mangala, adhi, ruchaka, bhadra, sasa, maalavya, hamsa, rajju, musala, nala, maalaa, sarpa, gadaa, sakata, sringaataka, hala, vajra, yava, kamala, vaapi, yoopa, sara, sakti, danda, naukaa, koota, chatra, chaapa, ardha_chandra, chakra, samudra, veenaa, daama, paasa, kedaara, soola, yuga, gola, subha, asubha, gaja_kesari, guru_mangala, amala, parvata, kaahala, chaamara, sankha, bheri, mridanga, sreenaatha, matsya, koorma, khadga, kusuma, kalaanidhi, kalpadruma, lagnaadhi, hari, brahma, vishnu, siva, trilochana, gouri, chandikaa, lakshmi, saarada, bhaarathi, saraswathi, amsaavatara, devendra, indra, ravi, bhaaskara, kulavardhana, vasumati, gandharva, go, vidyut, chapa, pushkala, makuta, jaya, harsha, sarala and vimala.
@@ -1141,6 +1153,16 @@ jhora
       !- unit_tests.py           - unit tests for the features based on examples from the book
       !- pvr_tests.py            - Exercise problems from book.
 ```
+Changes since 4.4.5
+===================
+Updated `tithi(jd,place)` to return adhik tithi of the day if it exists.
+
+Updated Shadbala calculations to fix the errors. Now the results match the calculations of VP Jain and BV Raman examples in their respective books. However, it is important to note, shadbala calculations does not match with JHora (even for these examples). Added tests to VP Jain/ BV Raman book examples.
+
+Fixed encoding error in `utils.py`
+
+Added special tithis to Panchangam page.
+
 Changes since 4.4.0
 ===================
 Fixed errors in resource lists of Telugu, Kannada and Hindi

{pyjhora-4.4.5 → pyjhora-4.5.0}/README.md

@@ -1,4 +1,4 @@
-JHora 4.4.5
+JHora 4.5.0
 =================
 Python package containing almost all the features described in the book
 
@@ -260,6 +260,8 @@ Added `drik.next_lunar_month`, `drik.next_lunar_year`, `drik.previous_lunar_mont
 
 Added `vedic_date(jd,place,calendar_type)` to get solar/lunar month/day/year
 
+Updated `tithi(jd,place)` to return adhik tithi of the day if it exists. Update `vedic_date(jd,place,calendar_type)` to include Adhik and Nija maasa booleans. Introduced an experimental function `next_tithi` to calculate next particular tithi occuring date/time. Added ayanamsa while calculating `declination_of_planets`. Added a lambda function `special_tithis(jd,place)` to compute all special tithis as a list.
+
 * `jhora.panchanga.pancha_paksha`:
 
 This module calculates pancha pakshi sastra.
@@ -289,6 +291,10 @@ Added `lattha_stars_planets` function to find Lattha stars of the planets.
 
 Added `get_64th_navamsa(navamsa_planet_positions)` and `get_22nd_drekkana(drekkana_planet_positions)` functions.
 
+Hora chart default method (`chart_method`) changed to traditional Parasara.
+
+Method `benefics_and_malefics` modified to consider Waxing/Waning moon and association of Mars with benefics/malefics. This is used in `strength.py` to calculate shadbala. 
+
 * `jhora.horoscope.chart.dosha`: 
 
 8 types of dosha (kala sarpa, manglik, pitru, guru chandala, ganda moola, kalathra, ghata, shrapit)
@@ -305,8 +311,13 @@ Module to find sphutas such as tri, chathur, pancha, prana, deha, mrityu, sooshm
 
 Module to find various balas/strnegths of planet such as harsha bala, kshetra, sapthavargaja, sthana, ojayugama, kendra, dreshkon, uccha, uccha rashmi, hadda, drekkana, navamsa, pancha vargeeya, dwadhasa_vargeeya, dig, divaratri, nathonnath, paksha, tribhaga, abda, masa, vaara, hora, ayana, yuddha, kaala, ishta, subha, cheshta, cheshta rashmi, naisargika, drik, shad, bhava adhipathi, bhava dig, bhava drik, bhava drishti.
 
+Modified shadbala calculations to match that of BVRaman and VPJain calculations. Added to tests to verify we get same results as theirs. Since each do calculations differently (different ayanamsa etc, different epoch), appropriate changes made. Please note that these calculations (with same date as theirs) will give different results in Jagannath Hora software. We are unware of the alogirithm used in JHora. Added `get_planet_mean_longitude(jd,place,planet_index=0)` to calculated planet mean longitude for calculating Cheshta bala.
+
+
 Added `planet_aspect_relationship_table` function to get planet aspect relationship table based Parasara's Drik bala calculations.
 
+Updated Shadbala calculations to fix the errors. Now the results match the calculations of VP Jain and BV Raman examples in their respective books. However, it is important to note, shadbala calculations does not match with JHora (even for these examples).
+
 * `jhora.horoscope.chart.yoga`: 
 
 Module to find about 100 yogas such as vesi, vosi, ubhayachara, nipuna, sunaphaa, anaphaa, duradhara, kemadruma, chandra_mangala, adhi, ruchaka, bhadra, sasa, maalavya, hamsa, rajju, musala, nala, maalaa, sarpa, gadaa, sakata, sringaataka, hala, vajra, yava, kamala, vaapi, yoopa, sara, sakti, danda, naukaa, koota, chatra, chaapa, ardha_chandra, chakra, samudra, veenaa, daama, paasa, kedaara, soola, yuga, gola, subha, asubha, gaja_kesari, guru_mangala, amala, parvata, kaahala, chaamara, sankha, bheri, mridanga, sreenaatha, matsya, koorma, khadga, kusuma, kalaanidhi, kalpadruma, lagnaadhi, hari, brahma, vishnu, siva, trilochana, gouri, chandikaa, lakshmi, saarada, bhaarathi, saraswathi, amsaavatara, devendra, indra, ravi, bhaaskara, kulavardhana, vasumati, gandharva, go, vidyut, chapa, pushkala, makuta, jaya, harsha, sarala and vimala.
@@ -462,6 +473,16 @@ jhora
       !- unit_tests.py           - unit tests for the features based on examples from the book
       !- pvr_tests.py            - Exercise problems from book.
 ```
+Changes since 4.4.5
+===================
+Updated `tithi(jd,place)` to return adhik tithi of the day if it exists.
+
+Updated Shadbala calculations to fix the errors. Now the results match the calculations of VP Jain and BV Raman examples in their respective books. However, it is important to note, shadbala calculations does not match with JHora (even for these examples). Added tests to VP Jain/ BV Raman book examples.
+
+Fixed encoding error in `utils.py`
+
+Added special tithis to Panchangam page.
+
 Changes since 4.4.0
 ===================
 Fixed errors in resource lists of Telugu, Kannada and Hindi

{pyjhora-4.4.5 → pyjhora-4.5.0}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "PyJHora"
 description = "Complete Vedic Astrology Python package."
-version = "4.4.5"
+version = "4.5.0"
 authors = [
 	{name="Sundar Sundaresan",email = "carnaticmusicguru2015@comcast.net"},
 ]

{pyjhora-4.4.5 → pyjhora-4.5.0/src/PyJHora.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: PyJHora
-Version: 4.4.5
+Version: 4.5.0
 Summary: Complete Vedic Astrology Python package.
 Author-email: Sundar Sundaresan <carnaticmusicguru2015@comcast.net>
 License:  GNU AFFERO GENERAL PUBLIC LICENSE
@@ -676,8 +676,9 @@ Classifier: Topic :: Scientific/Engineering :: Astronomy
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: license-file
 
-JHora 4.4.5
+JHora 4.5.0
 =================
 Python package containing almost all the features described in the book
 
@@ -939,6 +940,8 @@ Added `drik.next_lunar_month`, `drik.next_lunar_year`, `drik.previous_lunar_mont
 
 Added `vedic_date(jd,place,calendar_type)` to get solar/lunar month/day/year
 
+Updated `tithi(jd,place)` to return adhik tithi of the day if it exists. Update `vedic_date(jd,place,calendar_type)` to include Adhik and Nija maasa booleans. Introduced an experimental function `next_tithi` to calculate next particular tithi occuring date/time. Added ayanamsa while calculating `declination_of_planets`. Added a lambda function `special_tithis(jd,place)` to compute all special tithis as a list.
+
 * `jhora.panchanga.pancha_paksha`:
 
 This module calculates pancha pakshi sastra.
@@ -968,6 +971,10 @@ Added `lattha_stars_planets` function to find Lattha stars of the planets.
 
 Added `get_64th_navamsa(navamsa_planet_positions)` and `get_22nd_drekkana(drekkana_planet_positions)` functions.
 
+Hora chart default method (`chart_method`) changed to traditional Parasara.
+
+Method `benefics_and_malefics` modified to consider Waxing/Waning moon and association of Mars with benefics/malefics. This is used in `strength.py` to calculate shadbala. 
+
 * `jhora.horoscope.chart.dosha`: 
 
 8 types of dosha (kala sarpa, manglik, pitru, guru chandala, ganda moola, kalathra, ghata, shrapit)
@@ -984,8 +991,13 @@ Module to find sphutas such as tri, chathur, pancha, prana, deha, mrityu, sooshm
 
 Module to find various balas/strnegths of planet such as harsha bala, kshetra, sapthavargaja, sthana, ojayugama, kendra, dreshkon, uccha, uccha rashmi, hadda, drekkana, navamsa, pancha vargeeya, dwadhasa_vargeeya, dig, divaratri, nathonnath, paksha, tribhaga, abda, masa, vaara, hora, ayana, yuddha, kaala, ishta, subha, cheshta, cheshta rashmi, naisargika, drik, shad, bhava adhipathi, bhava dig, bhava drik, bhava drishti.
 
+Modified shadbala calculations to match that of BVRaman and VPJain calculations. Added to tests to verify we get same results as theirs. Since each do calculations differently (different ayanamsa etc, different epoch), appropriate changes made. Please note that these calculations (with same date as theirs) will give different results in Jagannath Hora software. We are unware of the alogirithm used in JHora. Added `get_planet_mean_longitude(jd,place,planet_index=0)` to calculated planet mean longitude for calculating Cheshta bala.
+
+
 Added `planet_aspect_relationship_table` function to get planet aspect relationship table based Parasara's Drik bala calculations.
 
+Updated Shadbala calculations to fix the errors. Now the results match the calculations of VP Jain and BV Raman examples in their respective books. However, it is important to note, shadbala calculations does not match with JHora (even for these examples).
+
 * `jhora.horoscope.chart.yoga`: 
 
 Module to find about 100 yogas such as vesi, vosi, ubhayachara, nipuna, sunaphaa, anaphaa, duradhara, kemadruma, chandra_mangala, adhi, ruchaka, bhadra, sasa, maalavya, hamsa, rajju, musala, nala, maalaa, sarpa, gadaa, sakata, sringaataka, hala, vajra, yava, kamala, vaapi, yoopa, sara, sakti, danda, naukaa, koota, chatra, chaapa, ardha_chandra, chakra, samudra, veenaa, daama, paasa, kedaara, soola, yuga, gola, subha, asubha, gaja_kesari, guru_mangala, amala, parvata, kaahala, chaamara, sankha, bheri, mridanga, sreenaatha, matsya, koorma, khadga, kusuma, kalaanidhi, kalpadruma, lagnaadhi, hari, brahma, vishnu, siva, trilochana, gouri, chandikaa, lakshmi, saarada, bhaarathi, saraswathi, amsaavatara, devendra, indra, ravi, bhaaskara, kulavardhana, vasumati, gandharva, go, vidyut, chapa, pushkala, makuta, jaya, harsha, sarala and vimala.
@@ -1141,6 +1153,16 @@ jhora
       !- unit_tests.py           - unit tests for the features based on examples from the book
       !- pvr_tests.py            - Exercise problems from book.
 ```
+Changes since 4.4.5
+===================
+Updated `tithi(jd,place)` to return adhik tithi of the day if it exists.
+
+Updated Shadbala calculations to fix the errors. Now the results match the calculations of VP Jain and BV Raman examples in their respective books. However, it is important to note, shadbala calculations does not match with JHora (even for these examples). Added tests to VP Jain/ BV Raman book examples.
+
+Fixed encoding error in `utils.py`
+
+Added special tithis to Panchangam page.
+
 Changes since 4.4.0
 ===================
 Fixed errors in resource lists of Telugu, Kannada and Hindi

{pyjhora-4.4.5 → pyjhora-4.5.0}/src/jhora/README.md

@@ -1,4 +1,4 @@
-JHora 4.4.5
+JHora 4.5.0
 =================
 Python package containing almost all the features described in the book
 
@@ -260,6 +260,8 @@ Added `drik.next_lunar_month`, `drik.next_lunar_year`, `drik.previous_lunar_mont
 
 Added `vedic_date(jd,place,calendar_type)` to get solar/lunar month/day/year
 
+Updated `tithi(jd,place)` to return adhik tithi of the day if it exists. Update `vedic_date(jd,place,calendar_type)` to include Adhik and Nija maasa booleans. Introduced an experimental function `next_tithi` to calculate next particular tithi occuring date/time. Added ayanamsa while calculating `declination_of_planets`. Added a lambda function `special_tithis(jd,place)` to compute all special tithis as a list.
+
 * `jhora.panchanga.pancha_paksha`:
 
 This module calculates pancha pakshi sastra.
@@ -289,6 +291,10 @@ Added `lattha_stars_planets` function to find Lattha stars of the planets.
 
 Added `get_64th_navamsa(navamsa_planet_positions)` and `get_22nd_drekkana(drekkana_planet_positions)` functions.
 
+Hora chart default method (`chart_method`) changed to traditional Parasara.
+
+Method `benefics_and_malefics` modified to consider Waxing/Waning moon and association of Mars with benefics/malefics. This is used in `strength.py` to calculate shadbala. 
+
 * `jhora.horoscope.chart.dosha`: 
 
 8 types of dosha (kala sarpa, manglik, pitru, guru chandala, ganda moola, kalathra, ghata, shrapit)
@@ -305,8 +311,13 @@ Module to find sphutas such as tri, chathur, pancha, prana, deha, mrityu, sooshm
 
 Module to find various balas/strnegths of planet such as harsha bala, kshetra, sapthavargaja, sthana, ojayugama, kendra, dreshkon, uccha, uccha rashmi, hadda, drekkana, navamsa, pancha vargeeya, dwadhasa_vargeeya, dig, divaratri, nathonnath, paksha, tribhaga, abda, masa, vaara, hora, ayana, yuddha, kaala, ishta, subha, cheshta, cheshta rashmi, naisargika, drik, shad, bhava adhipathi, bhava dig, bhava drik, bhava drishti.
 
+Modified shadbala calculations to match that of BVRaman and VPJain calculations. Added to tests to verify we get same results as theirs. Since each do calculations differently (different ayanamsa etc, different epoch), appropriate changes made. Please note that these calculations (with same date as theirs) will give different results in Jagannath Hora software. We are unware of the alogirithm used in JHora. Added `get_planet_mean_longitude(jd,place,planet_index=0)` to calculated planet mean longitude for calculating Cheshta bala.
+
+
 Added `planet_aspect_relationship_table` function to get planet aspect relationship table based Parasara's Drik bala calculations.
 
+Updated Shadbala calculations to fix the errors. Now the results match the calculations of VP Jain and BV Raman examples in their respective books. However, it is important to note, shadbala calculations does not match with JHora (even for these examples).
+
 * `jhora.horoscope.chart.yoga`: 
 
 Module to find about 100 yogas such as vesi, vosi, ubhayachara, nipuna, sunaphaa, anaphaa, duradhara, kemadruma, chandra_mangala, adhi, ruchaka, bhadra, sasa, maalavya, hamsa, rajju, musala, nala, maalaa, sarpa, gadaa, sakata, sringaataka, hala, vajra, yava, kamala, vaapi, yoopa, sara, sakti, danda, naukaa, koota, chatra, chaapa, ardha_chandra, chakra, samudra, veenaa, daama, paasa, kedaara, soola, yuga, gola, subha, asubha, gaja_kesari, guru_mangala, amala, parvata, kaahala, chaamara, sankha, bheri, mridanga, sreenaatha, matsya, koorma, khadga, kusuma, kalaanidhi, kalpadruma, lagnaadhi, hari, brahma, vishnu, siva, trilochana, gouri, chandikaa, lakshmi, saarada, bhaarathi, saraswathi, amsaavatara, devendra, indra, ravi, bhaaskara, kulavardhana, vasumati, gandharva, go, vidyut, chapa, pushkala, makuta, jaya, harsha, sarala and vimala.
@@ -462,6 +473,16 @@ jhora
       !- unit_tests.py           - unit tests for the features based on examples from the book
       !- pvr_tests.py            - Exercise problems from book.
 ```
+Changes since 4.4.5
+===================
+Updated `tithi(jd,place)` to return adhik tithi of the day if it exists.
+
+Updated Shadbala calculations to fix the errors. Now the results match the calculations of VP Jain and BV Raman examples in their respective books. However, it is important to note, shadbala calculations does not match with JHora (even for these examples). Added tests to VP Jain/ BV Raman book examples.
+
+Fixed encoding error in `utils.py`
+
+Added special tithis to Panchangam page.
+
 Changes since 4.4.0
 ===================
 Fixed errors in resource lists of Telugu, Kannada and Hindi

{pyjhora-4.4.5 → pyjhora-4.5.0}/src/jhora/_package_info.py

@@ -18,7 +18,7 @@
 
 name = "PyJHora"
 
-version = "4.4.5"
+version = "4.6.0"
 
 author = "Sundar Sundaresan"
 

{pyjhora-4.4.5 → pyjhora-4.5.0}/src/jhora/const.py

@@ -1155,6 +1155,8 @@ one_second_lontitude_in_degrees = 1.0/3600.
 """
 force_kali_start_year_for_years_before_kali_year_4009 = True
 kali_start_year = 13 # 13 (Pramaadhi) North or 1 (Prabhava) for South
+# Special Tithis
+special_tithis = ['janma','dhana','bhrartri','matri','putra','satru','kalatra','mrutyu','bhagya','karma','laabha','vyaya']
 
 if __name__ == "__main__":
     pass

{pyjhora-4.4.5 → pyjhora-4.5.0}/src/jhora/horoscope/chart/charts.py

@@ -276,7 +276,7 @@ def _hora_traditional_parasara_chart(planet_positions_in_rasi):
             r = 4 # Sun's Hora
         dp.append([planet,[r,d_long]])
     return dp
-def hora_chart(planet_positions_in_rasi,chart_method=1):
+def hora_chart(planet_positions_in_rasi,chart_method=2):
     """ 
         Hora Chart - D2 Chart
         @param planet_positions_in_rasi: Rasi chart planet_positions list in the format [[planet,(raasi,planet_longitude)],...]]. First element is that of Lagnam
@@ -292,6 +292,7 @@ def hora_chart(planet_positions_in_rasi,chart_method=1):
                 First element is that of Lagnam
             Example: [ ['L',(0,13.4)],[0,(11,12.7)],...]] Lagnam in Aries 13.4 degrees, Sun in Taurus 12.7 degrees
     """
+    #print('hora chart method',chart_method)
     if chart_method==1:
         return __parivritti_even_reverse(planet_positions_in_rasi, 2)
     elif chart_method==2:
@@ -1683,7 +1684,8 @@ def _varnada_lagna_sharma(dob,tob,place,house_index=1,ayanamsa_mode=const._DEFAU
     #print(count1,count2,count,count_is_odd,_varnada_lagna)
     _varnada_lagna -= 1 ## Keep in 0..11 range instead of 1..12
     return _varnada_lagna, asc_long #hl
-def benefics_and_malefics(jd,place,divisional_chart_factor=1,method=2):
+def benefics_and_malefics(jd,place,ayanamsa_mode=const._DEFAULT_AYANAMSA_MODE,divisional_chart_factor=1,method=2,
+                          exclude_rahu_ketu=False):
     """
         From BV Raman - Hindu Predictive Astrology - METHOD=1
         Jupiter. Venus. Full Moon and well-associated Mercury are benefics. 
@@ -1697,8 +1699,13 @@ def benefics_and_malefics(jd,place,divisional_chart_factor=1,method=2):
         (2) Sun, Mars, Rahu and Ketu are natural malefics (kroora grahas or paapa grahas).
             Mercury becomes a natural malefic when he is joined by more natural malefics.
             Waning Moon of Krishna paksha is a natural malefic.
+        From VP Jain - Shadbala and Bhavabala:
+        In addition If Mars is associated with both malefics and benefics
+            (i) count of malefics/benefics decide
+            (ii) if count is same one nearer to Mars in longitude decides
     """
-    benefics = const.natural_benefics[:] ; malefics = const.natural_malefics[:]
+    benefics = const.natural_benefics[:]
+    malefics = const.natural_malefics[:-2] if exclude_rahu_ketu else const.natural_malefics[:]
     _tithi = drik.tithi(jd, place)[0]
     if method == 2:
         if _tithi > 15:
@@ -1708,12 +1715,33 @@ def benefics_and_malefics(jd,place,divisional_chart_factor=1,method=2):
     else:
         if _tithi >= 8 and _tithi <=15: benefics.append(1)
         if _tithi >= 23 and _tithi <=30: malefics.append(1) 
-    planet_positions = divisional_chart(jd, place,divisional_chart_factor=divisional_chart_factor)
-    malefics += [3 for p in malefics if planet_positions[p+1][1][0]==planet_positions[4][1][0]]
-    benefics += [3 for p in benefics if planet_positions[p+1][1][0]==planet_positions[4][1][0]]
+    planet_positions = divisional_chart(jd, place,ayanamsa_mode=ayanamsa_mode,divisional_chart_factor=divisional_chart_factor)
+    #malefics += [3 for p in malefics if planet_positions[p+1][1][0]==planet_positions[4][1][0]]
+    #benefics += [3 for p in benefics if planet_positions[p+1][1][0]==planet_positions[4][1][0]]
+    mars_malefics = [p for p in malefics if planet_positions[p+1][1][0]==planet_positions[4][1][0] ]
+    mars_malefics_count = len(mars_malefics)
+    mars_benefics = [p for p in benefics if planet_positions[p+1][1][0]==planet_positions[4][1][0] ]
+    mars_benefics_count = len(mars_benefics)
+    #if 3 not in benefics + malefics: benefics +=[3] # Merc benefic if alone
+    if mars_benefics_count==0 and mars_malefics_count==0 or mars_benefics_count > mars_malefics_count:
+        benefics +=[3] # Merc benefic if alone or with more benefics than malefics
+    elif mars_malefics_count > mars_benefics_count :
+        malefics +=[3] # Merc with more malefics than benefics
+    elif mars_benefics_count == mars_malefics_count:
+        mercury_house, mercury_long = next((h, l) for p, (h, l) in planet_positions if p == 3)
+        planet_closest_to_mars = min(
+            [p for p, (h, l) in planet_positions if h == mercury_house and p != 3],
+            key=lambda p: abs(next(l for x, (h, l) in planet_positions if x == p) - mercury_long),
+            default=None
+        )
+        #print(mars_benefics,mars_malefics,'planet_closest_to_mars',planet_closest_to_mars,planet_positions[planet_closest_to_mars+1][1][1],planet_positions[4][1][1])
+        if planet_closest_to_mars in benefics:
+            benefics += [3]
+        else:
+            malefics += [3] 
     benefics = sorted(set(benefics)) ; malefics = sorted(set(malefics))
     return benefics, malefics
-def benefics(jd,place,method=2):
+def benefics(jd,place,method=2,ayanamsa_mode=const._DEFAULT_AYANAMSA_MODE,exclude_rahu_ketu=False):
     """
         From BV Raman - Hindu Predictive Astrology - METHOD=1
         Jupiter. Venus. Full Moon and well-associated Mercury are benefics. 
@@ -1727,9 +1755,14 @@ def benefics(jd,place,method=2):
         (2) Sun, Mars, Rahu and Ketu are natural malefics (kroora grahas or paapa grahas).
             Mercury becomes a natural malefic when he is joined by more natural malefics.
             Waning Moon of Krishna paksha is a natural malefic.
+        From VP Jain - Shadbala and Bhavabala:
+        In addition If Mars is associated with both malefics and benefics
+            (i) count of malefics/benefics decide
+            (ii) if count is same one nearer to Mars in longitude decides
     """
-    return benefics_and_malefics(jd, place, method=method)[0]
-def malefics(jd,place,method=2):
+    return benefics_and_malefics(jd, place, method=method,ayanamsa_mode=ayanamsa_mode,
+                                 exclude_rahu_ketu=exclude_rahu_ketu)[0]
+def malefics(jd,place,method=2,ayanamsa_mode=const._DEFAULT_AYANAMSA_MODE,exclude_rahu_ketu=False):
     """
         From BV Raman - Hindu Predictive Astrology - METHOD=1
         Jupiter. Venus. Full Moon and well-associated Mercury are benefics. 
@@ -1743,8 +1776,13 @@ def malefics(jd,place,method=2):
         (2) Sun, Mars, Rahu and Ketu are natural malefics (kroora grahas or paapa grahas).
             Mercury becomes a natural malefic when he is joined by more natural malefics.
             Waning Moon of Krishna paksha is a natural malefic.
+        From VP Jain - Shadbala and Bhavabala:
+        In addition If Mars is associated with both malefics and benefics
+            (i) count of malefics/benefics decide
+            (ii) if count is same one nearer to Mars in longitude decides
     """
-    return benefics_and_malefics(jd, place, method=method)[1]
+    return benefics_and_malefics(jd, place, method=method,ayanamsa_mode=ayanamsa_mode,
+                                 exclude_rahu_ketu=exclude_rahu_ketu)[1]
 def order_planets_from_kendras_of_raasi(planet_positions,raasi=None,include_lagna=False):
     base_house = raasi
     if raasi==None: base_house = planet_positions[0][1][0]