Skip to content

Commit

Permalink
solved windows 7 issue in setup.py
Browse files Browse the repository at this point in the history
  • Loading branch information
MatthewBCooke committed Aug 6, 2019
1 parent 552dd01 commit eaea0a2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 14 deletions.
13 changes: 2 additions & 11 deletions SearchStrategyAnalysis/Pathfinder.py
Original file line number Diff line number Diff line change
Expand Up @@ -686,8 +686,8 @@ def saveROI(self):

tempRois = zip(roiList,sizeList)

patternROI = re.compile("^[0-9]{1,9}([.][0-9]{1,9}){0,1}[,][0-9]{1,9}([.][0-9]{1,9}){0,1}$")
patternSize = re.compile("^[0-9]{1,9}([.][0-9]{1,9}){0,1}$")
patternROI = re.compile("^[0-9]{1,9}([.][0-9]{1,9})?[,][0-9]{1,9}([.][0-9]{1,9})?$")
patternSize = re.compile("^[0-9]{1,9}([.][0-9]{1,9})?$")

for aTuple in tempRois:
if aTuple[0] == 'Location (x,y)' or aTuple[1] == 'Diameter (cm)':
Expand Down Expand Up @@ -1370,16 +1370,7 @@ def heatmap(self, aExperiment):
if aDatapoint.gety() > yMax:
yMax = aDatapoint.gety()

# x = np.zeros(math.ceil(xMax-xMin+1))
# y = np.zeros(math.ceil(yMax-yMin+1))

# for aTrial in experiment: # for all the files we find
# for row in aTrial:
# # Create data
# if row.x == "-" or row.y == "-":
# continue
# x[math.floor(row.x)] += 1/len(experiment)
# y[math.floor(row.y)] += 1/len(experiment)

aFileName = "output/heatmaps/ " + "Day "+ dayValStringVar.get() + " Trial " + trialValStringVar.get() + str(strftime("%Y_%m_%d %I_%M_%S_%p", localtime())) # name of the log file for the run
aTitle = fileDirectory
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
from setuptools import *

with open('README.md') as f:
with open('README.md', encoding="utf8") as f:
long_description = f.read()

setup(
name='jsl-pathfinder',
version='1.1.5',
version='1.1.6',
description='Morris Water Maze Search Strategy Analysis',
url='https://github.com/MatthewBCooke/Pathfinder',
author='Matthew Cooke',
author_email='mbcooke@mail.ubc.ca',
author_email='matthew.cooke@ubc.ca',
license='GNU',
classifiers=[
'Development Status :: 5 - Production/Stable',
Expand Down

0 comments on commit eaea0a2

Please sign in to comment.