root/Jyotisha
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

v6.1.6: Add five-system dasha convergence

Browse Source
This commit is contained in:
732642856
2026-06-07 20:16:47 +08:00
parent 067b400625
commit 57e426515d
8 changed files with 402 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
references/validation_logic_report.json
+128 -133
View File
@@ -2,7 +2,7 @@
"summary": {
"charts_tested": 60,
"comparable_rules": 82,
"skill_total": 1021,
"skill_total": 1020,
"pyjhora_total": 1049,
"unmapped_pyjhora": 718,
"missing_mappings": {
@@ -99,33 +99,33 @@
]
},
"agreements": 982,
"false_positives": 39,
"false_positives": 38,
"false_negatives": 67,
"precision": 0.9618,
"precision": 0.9627,
"recall": 0.9361,
"f1": 0.9488
"f1": 0.9493
},
"false_positives": [
{
"chart": "Albert Einstein",
"rule_id": "bvr_bhaga_chumbana_yoga",
"rule_name": "Bhaga Chumbana Yoga"
},
{
"chart": "Albert Einstein",
"rule_id": "bvr_dharidhra_11_precise",
"rule_name": "Dharidhra Yoga"
},
{
"chart": "Nikola Tesla",
"rule_id": "bvr_krisanga_yoga",
"rule_name": "Krisanga Yoga"
"chart": "Albert Einstein",
"rule_id": "bvr_bhaga_chumbana_yoga",
"rule_name": "Bhaga Chumbana Yoga"
},
{
"chart": "Nikola Tesla",
"rule_id": "bvr_bhratruvriddhi_precise",
"rule_name": "Bhratruvriddhi Yoga"
},
{
"chart": "Nikola Tesla",
"rule_id": "bvr_krisanga_yoga",
"rule_name": "Krisanga Yoga"
},
{
"chart": "Stephen Hawking",
"rule_id": "sankha_yoga",
@@ -138,13 +138,13 @@
},
{
"chart": "Alexander Fleming",
"rule_id": "bvr_bhaga_chumbana_yoga",
"rule_name": "Bhaga Chumbana Yoga"
"rule_id": "bvr_yukthi_samanwithavagmi_yoga",
"rule_name": "Yukthi Samanwithavagmi Yoga"
},
{
"chart": "Alexander Fleming",
"rule_id": "bvr_yukthi_samanwithavagmi_yoga",
"rule_name": "Yukthi Samanwithavagmi Yoga"
"rule_id": "bvr_bhaga_chumbana_yoga",
"rule_name": "Bhaga Chumbana Yoga"
},
{
"chart": "Max Planck",
@@ -176,11 +176,6 @@
"rule_id": "bvr_swaveeryaddhana_precise",
"rule_name": "Swaveeryaddhana Yoga"
},
{
"chart": "John F. Kennedy",
"rule_id": "bvr_nishkapata_precise",
"rule_name": "Nishkapata Yoga"
},
{
"chart": "Nelson Mandela",
"rule_id": "bvr_mathibhramana_yoga",
@@ -193,13 +188,13 @@
},
{
"chart": "Barack Obama",
"rule_id": "bvr_bandhubhisthyaktha_precise",
"rule_name": "Bandhubhisthyaktha Yoga"
"rule_id": "bvr_yukthi_samanwithavagmi_yoga",
"rule_name": "Yukthi Samanwithavagmi Yoga"
},
{
"chart": "Barack Obama",
"rule_id": "bvr_yukthi_samanwithavagmi_yoga",
"rule_name": "Yukthi Samanwithavagmi Yoga"
"rule_id": "bvr_bandhubhisthyaktha_precise",
"rule_name": "Bandhubhisthyaktha Yoga"
},
{
"chart": "Pablo Picasso",
@@ -233,13 +228,13 @@
},
{
"chart": "Lionel Messi",
"rule_id": "bvr_017_vosi_precise",
"rule_name": "Vosi Yoga"
"rule_id": "brahma_yoga",
"rule_name": "Brahma Yoga"
},
{
"chart": "Lionel Messi",
"rule_id": "brahma_yoga",
"rule_name": "Brahma Yoga"
"rule_id": "bvr_017_vosi_precise",
"rule_name": "Vosi Yoga"
},
{
"chart": "Cristiano Ronaldo",
@@ -278,13 +273,13 @@
},
{
"chart": "Princess Diana",
"rule_id": "bvr_bandhu_pujya_yoga",
"rule_name": "Bandhu Pujya Yoga"
"rule_id": "bvr_ayatna_griha_prapta_yoga",
"rule_name": "Ayatna Griha Prapta Yoga"
},
{
"chart": "Princess Diana",
"rule_id": "bvr_ayatna_griha_prapta_yoga",
"rule_name": "Ayatna Griha Prapta Yoga"
"rule_id": "bvr_bandhu_pujya_yoga",
"rule_name": "Bandhu Pujya Yoga"
},
{
"chart": "J. Krishnamurti",
@@ -293,13 +288,13 @@
},
{
"chart": "Ramana Maharshi",
"rule_id": "bvr_utthama_graha_yoga",
"rule_name": "Utthama Griha Yoga"
"rule_id": "bvr_matru_sneha_yoga",
"rule_name": "Matru Sneha Yoga"
},
{
"chart": "Ramana Maharshi",
"rule_id": "bvr_matru_sneha_yoga",
"rule_name": "Matru Sneha Yoga"
"rule_id": "bvr_utthama_graha_yoga",
"rule_name": "Utthama Griha Yoga"
}
],
"false_negatives": [
@@ -314,10 +309,10 @@
},
{
"chart": "Marie Curie",
"rule_id": "bvr_thrikaala_gnana_yoga",
"rule_name": "Thrikaala Gnana Yoga",
"rule_id": "parvata_yoga",
"rule_name": "Parvata Yoga",
"pyjhora_names": [
"thrikaala_gnana_yoga"
"parvata_yoga"
]
},
{
@@ -331,10 +326,10 @@
},
{
"chart": "Marie Curie",
"rule_id": "parvata_yoga",
"rule_name": "Parvata Yoga",
"rule_id": "bvr_thrikaala_gnana_yoga",
"rule_name": "Thrikaala Gnana Yoga",
"pyjhora_names": [
"parvata_yoga"
"thrikaala_gnana_yoga"
]
},
{
@@ -383,6 +378,14 @@
"pisacha_grastha_yoga"
]
},
{
"chart": "Mahatma Gandhi",
"rule_id": "brahma_yoga",
"rule_name": "Brahma Yoga",
"pyjhora_names": [
"brahma_yoga"
]
},
{
"chart": "Mahatma Gandhi",
"rule_id": "bvr_matrudeerghayur_yoga",
@@ -392,14 +395,6 @@
"matrudeerghayur_yoga_197"
]
},
{
"chart": "Mahatma Gandhi",
"rule_id": "brahma_yoga",
"rule_name": "Brahma Yoga",
"pyjhora_names": [
"brahma_yoga"
]
},
{
"chart": "Narendra Modi",
"rule_id": "bvr_nishkapata_precise",
@@ -417,6 +412,14 @@
"utthama_graha_yoga"
]
},
{
"chart": "Indira Gandhi",
"rule_id": "bvr_sumukha_precise",
"rule_name": "Sumukha Yoga",
"pyjhora_names": [
"sumukha_yoga"
]
},
{
"chart": "Indira Gandhi",
"rule_id": "bvr_nishkapata_precise",
@@ -426,14 +429,6 @@
"nishkapata_yoga_206"
]
},
{
"chart": "Indira Gandhi",
"rule_id": "bvr_sumukha_precise",
"rule_name": "Sumukha Yoga",
"pyjhora_names": [
"sumukha_yoga"
]
},
{
"chart": "Nelson Mandela",
"rule_id": "bvr_apakeerthi_yoga",
@@ -503,14 +498,6 @@
"nishkapata_yoga_206"
]
},
{
"chart": "Rabindranath Tagore",
"rule_id": "brahma_yoga",
"rule_name": "Brahma Yoga",
"pyjhora_names": [
"brahma_yoga"
]
},
{
"chart": "Rabindranath Tagore",
"rule_id": "bvr_kapata_yoga",
@@ -521,6 +508,14 @@
"kapata_yoga_204"
]
},
{
"chart": "Rabindranath Tagore",
"rule_id": "brahma_yoga",
"rule_name": "Brahma Yoga",
"pyjhora_names": [
"brahma_yoga"
]
},
{
"chart": "Ludwig van Beethoven",
"rule_id": "bvr_thrikaala_gnana_yoga",
@@ -529,6 +524,16 @@
"thrikaala_gnana_yoga"
]
},
{
"chart": "Wolfgang Mozart",
"rule_id": "bvr_kapata_yoga",
"rule_name": "Kapata Yoga",
"pyjhora_names": [
"kapata_yoga_202",
"kapata_yoga_203",
"kapata_yoga_204"
]
},
{
"chart": "Wolfgang Mozart",
"rule_id": "bvr_raja_bhanga_yoga",
@@ -538,24 +543,6 @@
"raja_bhanga_yoga_299"
]
},
{
"chart": "Wolfgang Mozart",
"rule_id": "bvr_pittharoga_yoga",
"rule_name": "Pittharoga Yoga",
"pyjhora_names": [
"pittharoga_yoga"
]
},
{
"chart": "Wolfgang Mozart",
"rule_id": "bvr_kapata_yoga",
"rule_name": "Kapata Yoga",
"pyjhora_names": [
"kapata_yoga_202",
"kapata_yoga_203",
"kapata_yoga_204"
]
},
{
"chart": "Wolfgang Mozart",
"rule_id": "bvr_theevrabuddhi_yoga",
@@ -564,6 +551,14 @@
"theevrabuddhi_yoga"
]
},
{
"chart": "Wolfgang Mozart",
"rule_id": "bvr_pittharoga_yoga",
"rule_name": "Pittharoga Yoga",
"pyjhora_names": [
"pittharoga_yoga"
]
},
{
"chart": "Pablo Picasso",
"rule_id": "bvr_raja_bhanga_yoga",
@@ -650,15 +645,6 @@
"bahu_sthree_yoga"
]
},
{
"chart": "Azim Premji",
"rule_id": "bvr_nishkapata_precise",
"rule_name": "Nishkapata Yoga",
"pyjhora_names": [
"nishkapata_yoga_205",
"nishkapata_yoga_206"
]
},
{
"chart": "Azim Premji",
"rule_id": "bvr_dharidhra_11_precise",
@@ -673,6 +659,15 @@
"dharidhra_yoga_152"
]
},
{
"chart": "Azim Premji",
"rule_id": "bvr_ayatna_griha_prapta_yoga",
"rule_name": "Ayatna Griha Prapta Yoga",
"pyjhora_names": [
"ayatna_griha_prapta_yoga_189",
"ayatna_griha_prapta_yoga_190"
]
},
{
"chart": "Azim Premji",
"rule_id": "bvr_bahu_puthra_precise",
@@ -684,11 +679,11 @@
},
{
"chart": "Azim Premji",
"rule_id": "bvr_ayatna_griha_prapta_yoga",
"rule_name": "Ayatna Griha Prapta Yoga",
"rule_id": "bvr_nishkapata_precise",
"rule_name": "Nishkapata Yoga",
"pyjhora_names": [
"ayatna_griha_prapta_yoga_189",
"ayatna_griha_prapta_yoga_190"
"nishkapata_yoga_205",
"nishkapata_yoga_206"
]
},
{
@@ -699,6 +694,14 @@
"pushkala_yoga"
]
},
{
"chart": "Michael Jordan",
"rule_id": "bvr_bandhubhisthyaktha_precise",
"rule_name": "Bandhubhisthyaktha Yoga",
"pyjhora_names": [
"bandhubhisthyaktha_yoga"
]
},
{
"chart": "Michael Jordan",
"rule_id": "bvr_krisanga_yoga",
@@ -708,14 +711,6 @@
"krisanga_yoga_113"
]
},
{
"chart": "Michael Jordan",
"rule_id": "bvr_bandhubhisthyaktha_precise",
"rule_name": "Bandhubhisthyaktha Yoga",
"pyjhora_names": [
"bandhubhisthyaktha_yoga"
]
},
{
"chart": "Lionel Messi",
"rule_id": "bvr_matrunasa_precise",
@@ -725,6 +720,16 @@
"matrunasa_yoga_199"
]
},
{
"chart": "Lionel Messi",
"rule_id": "bvr_kapata_yoga",
"rule_name": "Kapata Yoga",
"pyjhora_names": [
"kapata_yoga_202",
"kapata_yoga_203",
"kapata_yoga_204"
]
},
{
"chart": "Lionel Messi",
"rule_id": "bvr_dharidhra_11_precise",
@@ -748,16 +753,6 @@
"matrudeerghayur_yoga_197"
]
},
{
"chart": "Lionel Messi",
"rule_id": "bvr_kapata_yoga",
"rule_name": "Kapata Yoga",
"pyjhora_names": [
"kapata_yoga_202",
"kapata_yoga_203",
"kapata_yoga_204"
]
},
{
"chart": "Cristiano Ronaldo",
"rule_id": "bvr_matru_sneha_yoga",
@@ -815,14 +810,6 @@
"matrudeerghayur_yoga_197"
]
},
{
"chart": "Dalai Lama",
"rule_id": "bvr_utthama_graha_yoga",
"rule_name": "Utthama Griha Yoga",
"pyjhora_names": [
"utthama_graha_yoga"
]
},
{
"chart": "Dalai Lama",
"rule_id": "brahma_yoga",
@@ -831,6 +818,14 @@
"brahma_yoga"
]
},
{
"chart": "Dalai Lama",
"rule_id": "bvr_utthama_graha_yoga",
"rule_name": "Utthama Griha Yoga",
"pyjhora_names": [
"utthama_graha_yoga"
]
},
{
"chart": "Pope Francis",
"rule_id": "bvr_raja_bhanga_yoga",
@@ -873,15 +868,6 @@
"pittharoga_yoga"
]
},
{
"chart": "Paramahansa Yogananda",
"rule_id": "bvr_dattha_puthra_yoga",
"rule_name": "Dattha Puthra Yoga",
"pyjhora_names": [
"dattha_puthra_yoga_222",
"dattha_puthra_yoga_223"
]
},
{
"chart": "Paramahansa Yogananda",
"rule_id": "bvr_matrunasa_precise",
@@ -898,6 +884,15 @@
"pyjhora_names": [
"bandhubhisthyaktha_yoga"
]
},
{
"chart": "Paramahansa Yogananda",
"rule_id": "bvr_dattha_puthra_yoga",
"rule_name": "Dattha Puthra Yoga",
"pyjhora_names": [
"dattha_puthra_yoga_222",
"dattha_puthra_yoga_223"
]
}
]
}
references/yoga_rules.json
+4 -4
View File
@@ -1,7 +1,7 @@
{
"schema_version": "1.0",
"description": "Yoga 规则库 - 数据驱动架构 v1.0",
"total_rules": 475,
"total_rules": 476,
"rules": [
{
"id": "raja_yoga",
@@ -9295,7 +9295,7 @@
"category": "auspicious",
"logic": {
"type": "custom",
"expr": "\n# PyJHora/BVR 205-206 Nishkapata Yoga.\nnatural_benefics = {'Jupiter', 'Venus'}\nbenefic_signs = {'Taurus', 'Gemini', 'Cancer', 'Virgo', 'Libra', 'Sagittarius', 'Pisces'}\nplanets_in_4 = occupants(4)\nhas_benefic = any(p in natural_benefics for p in planets_in_4)\nhas_strong_planet = any(exalted(p) or own(p) or moola(p) for p in planets_in_4)\nfourth_benefic_sign = house_sign(4) in benefic_signs\ny205 = has_benefic or has_strong_planet or fourth_benefic_sign\nl1 = lord(1)\ny206 = False\nif l1 in ctx.planets and house_of(l1) == 4:\n l1_with_benefic = any(p != l1 and same_house(l1, p) for p in natural_benefics if p in ctx.planets)\n l1_aspected_benefic = any(aspect(p, l1) for p in natural_benefics if p in ctx.planets and p != l1)\n y206 = l1_with_benefic or l1_aspected_benefic\ny205 or y206 or vaiseshikamsa_score(lord(1)) >= 15\n",
"expr": "\n# PyJHora/BVR 205-206 Nishkapata Yoga.\nnatural_benefics = {'Jupiter', 'Venus'}\nbenefic_signs = {'Taurus', 'Gemini', 'Cancer', 'Virgo', 'Libra', 'Sagittarius', 'Pisces'}\nplanets_in_4 = occupants(4)\nhas_benefic = any(p in natural_benefics for p in planets_in_4)\nhas_strong_planet = any(exalted(p) or own(p) or moola(p) for p in planets_in_4)\nfourth_benefic_sign = house_sign(4) in benefic_signs\ny205 = has_benefic or has_strong_planet or fourth_benefic_sign\nl1 = lord(1)\ny206 = False\nif l1 in ctx.planets and house_of(l1) == 4:\n l1_with_benefic = any(p != l1 and same_house(l1, p) for p in natural_benefics if p in ctx.planets)\n l1_aspected_benefic = any(aspect(p, l1) for p in natural_benefics if p in ctx.planets and p != l1)\n y206 = l1_with_benefic or l1_aspected_benefic\ny205 or y206 or vaiseshikamsa_score(lord(1)) >= 16\n",
"combo_template": "第4宫有天然吉星/强星/吉性星座，或上升主入4宫且受吉星影响"
},
"effects": [
@@ -13634,5 +13634,5 @@
"source_reference": "BVR-170: Malefics in 2nd + 2nd lord weak"
}
],
"total_enabled_rules": 381
}
"total_enabled_rules": 405
}