Mercurial > hg > horiscopes
changeset 27:a94569c4a70b
adding lr parameters and testing with southNode
| author | DaveM |
|---|---|
| date | Mon, 30 Apr 2018 15:13:04 +0100 |
| parents | 585edbea35b1 |
| children | 5825520de143 |
| files | V5/runme.py V5/synastry.py |
| diffstat | 2 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/V5/runme.py Mon Apr 30 14:12:31 2018 +0100 +++ b/V5/runme.py Mon Apr 30 15:13:04 2018 +0100 @@ -133,6 +133,10 @@ savePick(saveFile,people) def _main(): + # os.remove('outData.pick') + # os.remove('fullResults.pick') + os.remove('outData_collect.pick') + os.remove('raw_outData_collect.pick') pickFile = 'outData.pick' if not os.path.exists(pickFile): people = makePeople('individuals.csv') @@ -141,10 +145,10 @@ people = loadPick(pickFile) parseSaveFile = pickFile.split('.')[0]+'_collect.pick' if not os.path.exists(parseSaveFile): - if os.path.exists('raw_'+parseSaveFile): - parseHoriscopeRaw(people,parseSaveFile) - else: - parseHoriscope(people,parseSaveFile) + # if os.path.exists('raw_'+parseSaveFile): + # parseHoriscopeRaw(people,parseSaveFile) + # else: + parseHoriscope(people,parseSaveFile) else: people = loadPick(parseSaveFile) # if not os.path.exists('fullResults.pick'):
--- a/V5/synastry.py Mon Apr 30 14:12:31 2018 +0100 +++ b/V5/synastry.py Mon Apr 30 15:13:04 2018 +0100 @@ -246,7 +246,7 @@ else: self.horiscope.planets[planetName].setLocation(divList[i+2].getText(),divList[i+1].img.attrs['alt'],0) self.horiscope.planets[planetName].setLocation(divList[i+4].getText(),divList[i+3].img.attrs['alt'],1) - if planetName == 'node' + if planetName == 'node': self.horiscope.planets['sNode'].angleA = self.horiscope.planets['node'].angleA+180 self.horiscope.planets['sNode'].angleB = self.horiscope.planets['node'].angleB+180 return self.horiscope