Mercurial > hg > horiscopes

changeset 11:903559cb34d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
modify horiscope parse, to ensure that missing people get noted
author DaveM
date Tue, 23 Jan 2018 14:29:54 +0000
parents 85c9aa9d90c5
children 18e337b2550d
files V3/CompatibilityScoreRules.txt V3/runme.py data/compatibilityRules.csv
diffstat 3 files changed, 419 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/V3/CompatibilityScoreRules.txt	Tue Jan 23 14:29:54 2018 +0000
@@ -0,0 +1,217 @@
+Sun conjunct Descendant 4
+Sun conjunct or opposition Vertex 4
+Sun conjunct North Node 4
+Sun hard aspect (conjunct, semi-square, square, opposition) Sun/Moon midpoint 4
+Sun in 7th house 4
+Moon conjunct Descendant 4
+Moon conjunct or opposition Vertex 4
+Moon conjunct North Node 4
+Moon hard aspect (conjunct, semi-square, square, opposition) Sun/Moon midpoint 4
+Ascendant conjunct North Node 4
+
+Very Strong Compatibility Factors in Synastry (weight 3)
+
+Sun trine or sextile Sun 3
+Sun conjunct, trine, or sextile Moon 3
+Sun conjunct Venus 3
+Sun trine Venus 3
+Sun trine or sextile Mars 3
+Sun conjunct, sextile, or trine Jupiter 3
+Sun sextile or trine Saturn 3
+Sun conjunct, trine, or sextile Chiron 3
+Sun conjunct Ascendant 3
+Sun conjunct South Node 3
+Sun in 1st house 3
+Moon conjunct, sextile, or trine Moon 3
+Moon conjunct, sextile, or trine Venus 3
+Moon sextile or trine Mars 3
+Moon conjunct, sextile, or trine Jupiter 3
+Moon sextile or trine Saturn 3
+Moon conjunct, trine, or sextile Chiron 3
+Moon conjunct Ascendant 3
+Moon sextile or trine Ascendant 3
+Moon conjunct IC 3
+Moon conjunct South Node 3
+Moon in 7th house 3
+Moon in 1st house 3
+Mercury conjunct, sextile, or trine Jupiter 3
+Venus conjunct, sextile, trine, or opposition Venus 3
+Venus conjunct, sextile, or trine Mars 3
+Venus conjunct Jupiter 3
+Venus sextile or trine Saturn 3
+Venus conjunct, trine, or sextile Chiron 3
+Venus conjunct Ascendant 3
+Venus conjunct the Descendant 3
+Venus hard aspect (conjunct, semi-square, square, opposition) Sun/Moon midpoint 3
+Venus in 7th house 3
+Mars hard aspect (conjunct, semi-square, square, opposition) Sun/Moon midpoint 3
+Ascendant conjunct South Node 3
+Ascendant hard aspect (conjunct, semi-square, square, opposition) Sun/Moon midpoint 3
+Ascendant in 7th house 3
+Vertex hard aspect (conjunct, semi-square, square, opposition) Sun/Moon midpoint 3
+Nodes of the Moon conjunct IC/MC 3
+
+Good Compatibility Factors in Synastry (weight 2)
+
+Sun opposition Sun 2
+Sun opposition Moon 2
+Sun conjunct Mercury 2
+Sun sextile or trine Mercury 2
+Sun sextile Venus 2
+Sun conjunct Mars 2
+Sun sextile or trine Uranus 2
+Sun sextile or trine Ascendant 2
+Sun conjunct IC 2
+Sun sextile or trine Nodes of the Moon 2
+Sun square Nodes of the Moon 2
+Moon conjunct, sextile, or trine Mercury 2
+Moon sextile or trine Uranus 2
+Moon sextile or trine Neptune 2
+Moon sextile or trine Pluto 2
+Moon trine or sextile Nodes of the Moon 2
+Moon square Nodes of the Moon 2
+Mercury sextile, conjunct, or trine Mercury 2
+Mercury conjunct, sextile, or trine Venus 2
+Mercury sextile or trine Mars 2
+Mercury conjunct the Ascendant 2 
+Mercury conjunct the Descendant 2 
+Mercury conjunct IC or MC 2
+Venus square or opposition Mars 2
+Venus trine or sextile Jupiter 2
+Venus conjunct Saturn 2
+Venus sextile or trine Uranus 2
+Venus conjunct Neptune 2
+Venus trine or sextile Neptune 2
+Venus conjunct, trine or sextile Pluto 2
+Venus sextile or trine Ascendant 2
+Venus conjunct IC or MC 2
+Venus conjunct or opposition Vertex 2
+Venus in aspect to Nodes of the Moon 2
+Venus in 1st house 2
+Mars conjunct, sextile, or trine Mars 2
+Mars in aspect to Jupiter 2
+Mars conjunct, trine, or sextile Pluto 2
+Mars conjunct, sextile, or trine the Ascendant 2 
+Mars conjunct the Descendant 2
+Mars conjunct or opposition Vertex 2
+Jupiter in aspect to Jupiter 2
+Jupiter conjunct the Ascendant 2
+Jupiter conjunct the Descendant 2 
+Jupiter conjunct or opposition the Vertex 2 
+Jupiter in 7th house 2
+Ascendant sextile or trine Ascendant 2
+Ascendant opposition Ascendant 2
+Ascendant trine or sextile Nodes of the Moon 2
+Ascendant square Nodes of the Moon 2
+Vertex conjunct either Node of the Moon 2
+
+
+Helpful Compatibility Factors in Synastry (weight 1)
+
+Sun conjunct Sun 1
+Sun square or opposition Jupiter 1
+Sun sextile or trine Neptune 1
+Sun conjunct, sextile or trine Pluto 1
+Moon opposition Moon 1
+Moon square or opposition Venus 1
+Moon square or opposition Jupiter 1
+Moon conjunct Neptune 1
+Moon conjunct Pluto 1
+Mercury square or opposition Jupiter 1
+Mercury sextile or trine Saturn 1
+Mercury in aspect to Uranus 1
+Mercury in aspect to Neptune 1
+Mercury in aspect to Pluto 1
+Mercury sextile or trine Ascendant 1
+Mercury conjunct or opposition Vertex 1
+Mercury in aspect to Nodes of the Moon 1
+Venus square Venus 1
+Venus square or opposite Jupiter 1
+Venus conjunct Uranus 1
+Venus square Ascendant 1
+Mars sextile or trine Saturn 1
+Mars sextile or trine Neptune 1
+Mars conjunct, sextile, or trine Uranus 1
+Mars in aspect to Nodes of the Moon 1
+Jupiter conjunct, sextile, or trine Saturn 1
+Jupiter in aspect to Uranus 1
+Jupiter conjunct, sextile, or trine Neptune 1
+Jupiter conjunct, trine or sextile Pluto 1
+Jupiter sextile, trine, or square Ascendant 1
+Jupiter in aspect to the Nodes of the Moon 1
+Saturn sextile or trine Saturn 1
+Saturn sextile or trine Ascendant 1
+Pluto conjunct Descendant or Vertex 1
+Ascendant conjunct Ascendant 1
+
+
+Very Challenging Factors in Synastry - Red Alerts (weight -4)
+
+
+Moon square Saturn -4
+Mercury square Mercury -4 Red Alert
+Venus square Saturn -4
+Mars square or opposition Saturn -4 Red Alert
+
+
+Challenging Factors in Synastry (weight -3)
+
+Sun square Moon -3
+Moon square Moon -3
+Moon square Mars -3
+Moon conjunct or opposition Saturn -3
+Moon square or opposition Neptune -3
+Moon square or opposition Pluto -3
+Venus opposition Saturn -3
+Venus square or opposition Neptune -3
+Mars conjunct Saturn -3
+Mars square or opposition Pluto -3
+Uranus conjunct Descendant or Vertex -3
+
+
+Somewhat Challenging Factors in Synastry (weight -2)
+
+
+Sun square Sun -2
+Sun square or opposition Mars -2
+Sun conjunct, square or opposition Saturn -2
+Sun conjunct, square, or opposition Neptune -2
+Sun square or opposition Pluto -2
+Sun square Ascendant -2
+Moon square or opposition Mercury -2
+Moon opposition Mars -2
+Moon square or opposition Uranus -2
+Moon square Ascendant -2
+Mercury opposition Mercury -2
+Mercury square or opposition Mars -2
+Mercury conjunct, square, or opposition Saturn -2
+Venus square or opposition Uranus -2
+Venus square or opposition Pluto -2
+Mars square or opposition Mars -2
+Mars square or opposition Uranus -2
+Mars conjunct, square, or opposition Neptune -2
+Saturn conjunct, square or opposition Ascendant -2
+Saturn conjunct or opposition Vertex -2
+Saturn conjunct or square Nodes of the Moon -2
+Neptune conjunct Descendant, Ascendant, or Vertex -2
+Ascendant square Ascendant -2
+
+
+
+Minor Challenges in Synastry (weight -1)
+
+Sun square or opposition Mercury -1
+Sun square or opposition Venus -1
+Sun conjunct, square or opposition Uranus -1
+Moon conjunct Mars -1
+Moon conjunct Uranus -1
+Mercury square or opposition Venus -1
+Mercury conjunct Mars -1
+Mercury square Ascendant -1
+Mars square Ascendant -1
+Jupiter square or opposition Saturn -1
+Jupiter square or opposition Neptune -1
+Jupiter square or opposition Pluto -1
+Saturn square or opposition Saturn -1
+
+
--- a/V3/runme.py	Mon Jan 22 22:31:20 2018 +0000
+++ b/V3/runme.py	Tue Jan 23 14:29:54 2018 +0000
@@ -87,6 +87,7 @@
 	for person in people:
 		if person['pDOB'] is None or person['pDOB'] == '':
 			print 'SKIPPING person '+ person['ID'] + ' pDOB is None'
+			horiscopeList.append({'ID':person['ID']})
 		else:
 			print 'parsing person '+ person['ID']
 			url,payload = setURL(person)
@@ -125,7 +126,7 @@
 
 def uniqueList(seq): 
    # order preserving
-   noDupes = []
+   noDupes = []w
    [noDupes.append(i) for i in seq if not noDupes.count(i)]
    return noDupes
 
@@ -158,6 +159,13 @@
 	# 	da = merge_two_dicts(da,d2)
 	# 	data2.append(da)
 	return data
+
+def readInCompatibilityScore(filename):
+	stream = csv.DictReader(open(filename,'rb'))
+	dictList = []
+	for line in stream:
+		dictList.append(regulateData(line))
+	return dictList
 		
 
 def testMain():
@@ -175,7 +183,7 @@
 		people = loadPick(pickFile)
 	parseSaveFile = pickFile.split('.')[0]+'_collect.pick'
 	parseHoriscope(people,parseSaveFile)
-	presentResults(parseSaveFile)
+	horiscopeData = presentResults(parseSaveFile)
 	
 
 if __name__ == "__main__":
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/data/compatibilityRules.csv	Tue Jan 23 14:29:54 2018 +0000
@@ -0,0 +1,192 @@
+Sun,Conjunction,Descendant,4
+Sun,Conjunction Opposition,Vertex,4
+Sun,Conjunction North,Node,4
+Sun,Conjunction semi-square square Opposition,Sun/Moon midpoint,4
+Sun,,7th house,4
+Moon,Conjunction,Descendant,4
+Moon,Conjunction Opposition,Vertex,4
+Moon,Conjunction,North Node,4
+Moon,Conjunction semi-square square Opposition,Sun/Moon midpoint,4
+Ascendant,Conjunction,North Node,4
+Sun,trine sextile,Sun,3
+Sun,Conjunction trine sextile,Moon,3
+Sun,Conjunction,Venus,3
+Sun,trine,Venus,3
+Sun,trine sextile,Mars,3
+Sun,Conjunction sextile trine,Jupiter,3
+Sun,sextile trine,Saturn,3
+Sun,Conjunction trine sextile,Chiron,3
+Sun,Conjunction,Ascendant,3
+Sun,Conjunction,South Node,3
+Sun,,1st house,3
+Moon,Conjunction sextile trine,Moon,3
+Moon,Conjunction sextile trine,Venus,3
+Moon,sextile trine,Mars,3
+Moon,Conjunction sextile trine,Jupiter,3
+Moon,sextile trine,Saturn,3
+Moon,Conjunction trine sextile,Chiron,3
+Moon,Conjunction,Ascendant,3
+Moon,sextile trine,Ascendant,3
+Moon,Conjunction,IC,3
+Moon,Conjunction,South Node,3
+Moon,,7th house,3
+Moon,,1st house,3
+Mercury,Conjunction sextile trine,Jupiter,3
+Venus,Conjunction sextile sex Opposition,Venus,3
+Venus,Conjunction sextile trine,Mars,3
+Venus,Conjunction,Jupiter,3
+Venus,sextile trine,Saturn,3
+Venus,Conjunction trine sextile,Chiron,3
+Venus,Conjunction,Ascendant,3
+Venus,Conjunction,Descendant,3
+Venus,Conjunction semi-square square Opposition,Sun/Moon midpoint,3
+Venus,,7th house,3
+Mars,Conjunction semi-square square Opposition,Sun/Moon midpoint,3
+Ascendant,Conjunction South,Node,3
+Ascendant,Conjunction semi-square square Opposition,Sun/Moon midpoint,3
+Ascendant,,7th house,3
+Vertex,Conjunction semi-square square Opposition,Sun/Moon midpoint,3
+Nodes Moon,Conjunction,IC/MC,3
+,,,
+Sun,Opposition,Sun,2
+Sun,Opposition,Moon,2
+Sun,Conjunction,Mercury,2
+Sun,sextile trine,Mercury,2
+Sun,sextile,Venus,2
+Sun,Conjunction,Mars,2
+Sun,sextile trine,Uranus,2
+Sun,sextile trine,Ascendant,2
+Sun,Conjunction,IC,2
+Sun,sextile trine,Nodes Moon,2
+Sun,square,Nodes Moon,2
+Moon,Conjunction sextile trine,Mercury,2
+Moon,sextile trine,Uranus,2
+Moon,sextile trine,Neptune,2
+Moon,sextile trine,Pluto,2
+Moon,trine sextile,Nodes Moon,2
+Moon,square,Nodes Moon,2
+Mercury,sextile Conjunction trine,Mercury,2
+Mercury,Conjunction sextile trine,Venus,2
+Mercury,sextile trine,Mars,2
+Mercury,Conjunction the,Ascendant,2
+Mercury,Conjunction the,Descendant,2
+Mercury,Conjunction,IC MC,2
+Venus,square Opposition,Mars,2
+Venus,trine sextile,Jupiter,2
+Venus,Conjunction,Saturn,2
+Venus,sextile trine,Uranus,2
+Venus,Conjunction,Neptune,2
+Venus,trine sextile,Neptune,2
+Venus,Conjunction trine sextile,Pluto,2
+Venus,sextile trine,Ascendant,2
+Venus,Conjunction,IC MC,2
+Venus,Conjunction Opposition,Vertex,2
+Venus,aspect,Nodes Moon,2
+Venus,,1st house,2
+Mars,Conjunction sextile trine,Mars,2
+Mars,aspect,Jupiter,2
+Mars,Conjunction trine sextile,Pluto,2
+Mars,Conjunction sextile trine,Ascendant,2
+Mars,Conjunction the,Descendant,2
+Mars,Conjunction Opposition,Vertex,2
+Jupiter,aspect,Jupiter,2
+Jupiter,Conjunction the,Ascendant,2
+Jupiter,Conjunction the,Descendant,2
+Jupiter,Conjunction Opposition the,Vertex,2
+Jupiter,,7th house,2
+Ascendant,sextile trine,Ascendant,2
+Ascendant,Opposition,Ascendant,2
+Ascendant,trine sextile Nodes of the,Moon,2
+Ascendant,square,Nodes Moon,2
+Vertex,Conjunction either,Node Moon,2
+,,,
+Sun,Conjunction,Sun,1
+Sun,square Opposition,Jupiter,1
+Sun,sextile trine,Neptune,1
+Sun,Conjunction sextile trine,Pluto,1
+Moon,Opposition,Moon,1
+Moon,square Opposition,Venus,1
+Moon,square Opposition,Jupiter,1
+Moon,Conjunction,Neptune,1
+Moon,Conjunction,Pluto,1
+Mercury,square Opposition,Jupiter,1
+Mercury,sextile trine,Saturn,1
+Mercury,aspect,Uranus,1
+Mercury,aspect,Neptune,1
+Mercury,aspect,Pluto,1
+Mercury,sextile trine,Ascendant,1
+Mercury,Conjunction Opposition,Vertex,1
+Mercury,aspect,Nodes Moon,1
+Venus,square,Venus,1
+Venus,square opposite,Jupiter,1
+Venus,Conjunction,Uranus,1
+Venus,square,Ascendant,1
+Mars,sextile trine,Saturn,1
+Mars,sextile trine,Neptune,1
+Mars,Conjunction sextile trine,Uranus,1
+Mars,aspect Nodes of the,Moon,1
+Jupiter,Conjunction sextile trine,Saturn,1
+Jupiter,aspect,Uranus,1
+Jupiter,Conjunction sextile trine,Neptune,1
+Jupiter,Conjunction trine sextile,Pluto,1
+Jupiter,sextile sex square,Ascendant,1
+Jupiter,aspect,Nodes Moon,1
+Saturn,sextile trine,Saturn,1
+Saturn,sextile trine,Ascendant,1
+Pluto,Conjunction Descendant or,Vertex,1
+Ascendant,Conjunction,Ascendant,1
+,,,
+Moon,square,Saturn,-4
+Mercury,square,Mercury,-4*
+Venus,square,Saturn,-4
+Mars,square Opposition,Saturn,-4*
+,,,
+Sun,square,Moon,-3
+Moon,square,Moon,-3
+Moon,square,Mars,-3
+Moon,Conjunction Opposition,Saturn,-3
+Moon,square Opposition,Neptune,-3
+Moon,square Opposition,Pluto,-3
+Venus,Opposition,Saturn,-3
+Venus,square Opposition,Neptune,-3
+Mars,Conjunction,Saturn,-3
+Mars,square Opposition,Pluto,-3
+Uranus,Conjunction,Descendant Vertex,-3
+ ,,,
+Sun,square,Sun,-2
+Sun,square Opposition,Mars,-2
+Sun,Conjunction square Opposition,Saturn,-2
+Sun,Conjunction square Opposition,Neptune,-2
+Sun,square Opposition,Pluto,-2
+Sun,square,Ascendant,-2
+Moon,square Opposition,Mercury,-2
+Moon,Opposition,Mars,-2
+Moon,square Opposition,Uranus,-2
+Moon,square,Ascendant,-2
+Mercury,Opposition,Mercury,-2
+Mercury,square Opposition,Mars,-2
+Mercury,Conjunction square Opposition,Saturn,-2
+Venus,square Opposition,Uranus,-2
+Venus,square Opposition,Pluto,-2
+Mars,square Opposition,Mars,-2
+Mars,square Opposition,Uranus,-2
+Mars,Conjunction square Opposition,Neptune,-2
+Saturn,Conjunction square Opposition,Ascendant,-2
+Saturn,Conjunction Opposition,Vertex,-2
+Saturn,Conjunction square,Nodes Moon,-2
+Neptune,Conjunction,Descendant Ascendant Vertex,-2
+Ascendant,square,Ascendant,-2
+,,,
+Sun,square Opposition,Mercury,-1
+Sun,square Opposition,Venus,-1
+Sun,Conjunction square Opposition,Uranus,-1
+Moon,Conjunction,Mars,-1
+Moon,Conjunction,Uranus,-1
+Mercury,square Opposition,Venus,-1
+Mercury,Conjunction,Mars,-1
+Mercury,square,Ascendant,-1
+Mars,square,Ascendant,-1
+Jupiter,square Opposition,Saturn,-1
+Jupiter,square Opposition,Neptune,-1
+Jupiter,square Opposition,Pluto,-1
+Saturn,square Opposition,Saturn,-1
\ No newline at end of file