Update Session viewer based on Socratic comments
This commit is contained in:
parent
c0ebc4b7cf
commit
d11623c736
|
@ -33,7 +33,7 @@ try:
|
||||||
from matplotlib.backends.backend_gtkagg import NavigationToolbar2GTKAgg as NavigationToolbar
|
from matplotlib.backends.backend_gtkagg import NavigationToolbar2GTKAgg as NavigationToolbar
|
||||||
from matplotlib.finance import candlestick2
|
from matplotlib.finance import candlestick2
|
||||||
|
|
||||||
from numpy import diff, nonzero, sum, cumsum, max, min
|
from numpy import diff, nonzero, sum, cumsum, max, min, append
|
||||||
# from matplotlib.dates import DateFormatter, WeekdayLocator, HourLocator, \
|
# from matplotlib.dates import DateFormatter, WeekdayLocator, HourLocator, \
|
||||||
# DayLocator, MONDAY, timezone
|
# DayLocator, MONDAY, timezone
|
||||||
|
|
||||||
|
@ -241,6 +241,9 @@ class GuiSessionViewer (threading.Thread):
|
||||||
#end def fillStatsFrame(self, vbox):
|
#end def fillStatsFrame(self, vbox):
|
||||||
|
|
||||||
def generateDatasets(self, playerids, sitenos, limits, seats):
|
def generateDatasets(self, playerids, sitenos, limits, seats):
|
||||||
|
THRESHOLD = 1800 # Minimum number of seconds between consecutive hands before being considered a new session
|
||||||
|
PADDING = 5 # Additional time in minutes to add to a session, session startup, shutdown etc (FiXME: user configurable)
|
||||||
|
|
||||||
# Get a list of all handids and their timestampts
|
# Get a list of all handids and their timestampts
|
||||||
#FIXME: Query still need to filter on blind levels
|
#FIXME: Query still need to filter on blind levels
|
||||||
|
|
||||||
|
@ -255,7 +258,6 @@ class GuiSessionViewer (threading.Thread):
|
||||||
q = q.replace("<ampersand_s>", "%s")
|
q = q.replace("<ampersand_s>", "%s")
|
||||||
|
|
||||||
self.db.cursor.execute(q)
|
self.db.cursor.execute(q)
|
||||||
THRESHOLD = 1800
|
|
||||||
hands = self.db.cursor.fetchall()
|
hands = self.db.cursor.fetchall()
|
||||||
|
|
||||||
# Take that list and create an array of the time between hands
|
# Take that list and create an array of the time between hands
|
||||||
|
@ -264,8 +266,10 @@ class GuiSessionViewer (threading.Thread):
|
||||||
winnings = map(lambda x:float(x[4]), hands)
|
winnings = map(lambda x:float(x[4]), hands)
|
||||||
#print "DEBUG: len(times) %s" %(len(times))
|
#print "DEBUG: len(times) %s" %(len(times))
|
||||||
diffs = diff(times) # This array is the difference in starttime between consecutive hands
|
diffs = diff(times) # This array is the difference in starttime between consecutive hands
|
||||||
index = nonzero(diff(times) > THRESHOLD) # This array represents the indexes into 'times' for start/end times of sessions
|
diffs2 = append(diffs,THRESHOLD + 1) # Append an additional session to the end of the diffs, so the next line
|
||||||
# ie. times[index[0][0]] is the end of the first session
|
# includes an index into the last 'session'
|
||||||
|
index = nonzero(diffs2 > THRESHOLD) # This array represents the indexes into 'times' for start/end times of sessions
|
||||||
|
# times[index[0][0]] is the end of the first session,
|
||||||
#print "DEBUG: len(index[0]) %s" %(len(index[0]))
|
#print "DEBUG: len(index[0]) %s" %(len(index[0]))
|
||||||
if len(index[0]) > 0:
|
if len(index[0]) > 0:
|
||||||
#print "DEBUG: index[0][0] %s" %(index[0][0])
|
#print "DEBUG: index[0][0] %s" %(index[0][0])
|
||||||
|
@ -278,7 +282,7 @@ class GuiSessionViewer (threading.Thread):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
total = 0
|
total = 0
|
||||||
last_idx = 0
|
first_idx = 0
|
||||||
lowidx = 0
|
lowidx = 0
|
||||||
uppidx = 0
|
uppidx = 0
|
||||||
opens = []
|
opens = []
|
||||||
|
@ -288,23 +292,24 @@ class GuiSessionViewer (threading.Thread):
|
||||||
results = []
|
results = []
|
||||||
cum_sum = cumsum(winnings)
|
cum_sum = cumsum(winnings)
|
||||||
cum_sum = cum_sum/100
|
cum_sum = cum_sum/100
|
||||||
sid = 0
|
sid = 1
|
||||||
# Take all results and format them into a list for feeding into gui model.
|
# Take all results and format them into a list for feeding into gui model.
|
||||||
for i in range(len(index[0])):
|
for i in range(len(index[0])):
|
||||||
hds = index[0][i] - last_idx # Number of hands in session
|
hds = index[0][i] - first_idx + 1 # Number of hands in session
|
||||||
if hds > 0:
|
if hds > 0:
|
||||||
stime = strftime("%d/%m/%Y %H:%M", localtime(times[last_idx])) # Formatted start time
|
stime = strftime("%d/%m/%Y %H:%M", localtime(times[first_idx])) # Formatted start time
|
||||||
etime = strftime("%d/%m/%Y %H:%M", localtime(times[index[0][i]])) # Formatted end time
|
etime = strftime("%d/%m/%Y %H:%M", localtime(times[index[0][i]])) # Formatted end time
|
||||||
minutesplayed = (times[index[0][i]] - times[last_idx])/60
|
minutesplayed = (times[index[0][i]] - times[first_idx])/60
|
||||||
if minutesplayed == 0:
|
if minutesplayed == 0:
|
||||||
minutesplayed = 1
|
minutesplayed = 1
|
||||||
|
minutesplayed = minutesplayed + PADDING
|
||||||
hph = hds*60/minutesplayed # Hands per hour
|
hph = hds*60/minutesplayed # Hands per hour
|
||||||
won = sum(winnings[last_idx:index[0][i]])/100.0
|
won = sum(winnings[first_idx:index[0][i]])/100.0
|
||||||
hwm = max(cum_sum[last_idx:index[0][i]])
|
hwm = max(cum_sum[first_idx:index[0][i]])
|
||||||
lwm = min(cum_sum[last_idx:index[0][i]])
|
lwm = min(cum_sum[first_idx:index[0][i]])
|
||||||
open = (sum(winnings[:last_idx]))/100
|
open = (sum(winnings[:first_idx]))/100
|
||||||
close = (sum(winnings[:index[0][i]]))/100
|
close = (sum(winnings[:index[0][i]]))/100
|
||||||
#print "DEBUG: range: (%s, %s) - (min, max): (%s, %s) - (open,close): (%s, %s)" %(last_idx, index[0][i], lwm, hwm, open, close)
|
#print "DEBUG: range: (%s, %s) - (min, max): (%s, %s) - (open,close): (%s, %s)" %(first_idx, index[0][i], lwm, hwm, open, close)
|
||||||
|
|
||||||
results.append([sid, hds, stime, etime, hph, won])
|
results.append([sid, hds, stime, etime, hph, won])
|
||||||
opens.append(open)
|
opens.append(open)
|
||||||
|
@ -312,34 +317,12 @@ class GuiSessionViewer (threading.Thread):
|
||||||
highs.append(hwm)
|
highs.append(hwm)
|
||||||
lows.append(lwm)
|
lows.append(lwm)
|
||||||
#print "DEBUG: Hands in session %4s: %4s Start: %s End: %s HPH: %s Profit: %s" %(sid, hds, stime, etime, hph, won)
|
#print "DEBUG: Hands in session %4s: %4s Start: %s End: %s HPH: %s Profit: %s" %(sid, hds, stime, etime, hph, won)
|
||||||
total = total + (index[0][i] - last_idx)
|
total = total + (index[0][i] - first_idx)
|
||||||
last_idx = index[0][i] + 1
|
first_idx = index[0][i] + 1
|
||||||
sid = sid+1
|
sid = sid+1
|
||||||
else:
|
else:
|
||||||
print "hds <= 0"
|
print "hds <= 0"
|
||||||
|
|
||||||
#The last session is between times[last_idx:-1]
|
|
||||||
hds = len(times) - last_idx
|
|
||||||
stime = strftime("%d/%m/%Y %H:%M", localtime(times[last_idx])) # Formatted start time
|
|
||||||
etime = strftime("%d/%m/%Y %H:%M", localtime(times[index[0][-1]])) # Formatted end time
|
|
||||||
minutesplayed = (times[-1] - times[last_idx])/60
|
|
||||||
if minutesplayed == 0:
|
|
||||||
minutesplayed = 1
|
|
||||||
hph = hds*60/minutesplayed # Hands per hour
|
|
||||||
won = sum(winnings[last_idx:-1])/100.0
|
|
||||||
hwm = max(cum_sum[last_idx:-1])
|
|
||||||
lwm = min(cum_sum[last_idx:-1])
|
|
||||||
open = (sum(winnings[:last_idx]))/100
|
|
||||||
close = (sum(winnings[:-1]))/100
|
|
||||||
#print "DEBUG: range: (%s, %s) - (min, max): (%s, %s) - (open,close): (%s, %s)" %(last_idx, index[0][i], lwm, hwm, open, close)
|
|
||||||
|
|
||||||
results.append([sid, hds, stime, etime, hph, won])
|
|
||||||
opens.append(open)
|
|
||||||
closes.append(close)
|
|
||||||
highs.append(hwm)
|
|
||||||
lows.append(lwm)
|
|
||||||
#print "Hands in session %4s: %4s Start: %s End: %s HPH: %s Profit: %s" %(sid, hds, stime, etime, hph, won)
|
|
||||||
|
|
||||||
return (results, opens, closes, highs, lows)
|
return (results, opens, closes, highs, lows)
|
||||||
|
|
||||||
def clearGraphData(self):
|
def clearGraphData(self):
|
||||||
|
|
Loading…
Reference in New Issue
Block a user