evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://git.assembla.com/free_poker_tools

Browse Source
This commit is contained in:
Worros 2011-02-06 02:50:24 +08:00
commit 13dbfa2914
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
pyfpdb/SQL.py
View File

@ -1511,10 +1511,10 @@ class Sql:
sum(hc.HDs) AS n, sum(hc.HDs) AS n,
sum(hc.street0VPI) AS vpip, sum(hc.street0VPI) AS vpip,
sum(hc.street0Aggr) AS pfr, sum(hc.street0Aggr) AS pfr,
sum(hc.street0_3BChance) AS 3B_opp_0, sum(hc.street0_3BChance) AS TB_opp_0,
sum(hc.street0_3BDone) AS 3B_0, sum(hc.street0_3BDone) AS TB_0,
sum(hc.street0_4BChance) AS 4B_opp_0, sum(hc.street0_4BChance) AS FB_opp_0,
sum(hc.street0_4BDone) AS 4B_0, sum(hc.street0_4BDone) AS FB_0,
sum(hc.street0_FoldTo3BChance) AS F3B_opp_0, sum(hc.street0_FoldTo3BChance) AS F3B_opp_0,
sum(hc.street0_FoldTo3BDone) AS F3B_0, sum(hc.street0_FoldTo3BDone) AS F3B_0,
sum(hc.street0_FoldTo4BChance) AS F4B_opp_0, sum(hc.street0_FoldTo4BChance) AS F4B_opp_0,
@ -1628,10 +1628,10 @@ class Sql:
sum(hc.HDs) AS n, sum(hc.HDs) AS n,
sum(hc.street0VPI) AS vpip, sum(hc.street0VPI) AS vpip,
sum(hc.street0Aggr) AS pfr, sum(hc.street0Aggr) AS pfr,
sum(hc.street0_3BChance) AS 3B_opp_0, sum(hc.street0_3BChance) AS TB_opp_0,
sum(hc.street0_3BDone) AS 3B_0, sum(hc.street0_3BDone) AS TB_0,
sum(hc.street0_4BChance) AS 4B_opp_0, sum(hc.street0_4BChance) AS FB_opp_0,
sum(hc.street0_4BDone) AS 4B_0, sum(hc.street0_4BDone) AS FB_0,
sum(hc.street0_FoldTo3BChance) AS F3B_opp_0, sum(hc.street0_FoldTo3BChance) AS F3B_opp_0,
sum(hc.street0_FoldTo3BDone) AS F3B_0, sum(hc.street0_FoldTo3BDone) AS F3B_0,
sum(hc.street0_FoldTo4BChance) AS F4B_opp_0, sum(hc.street0_FoldTo4BChance) AS F4B_opp_0,
@ -1762,10 +1762,10 @@ class Sql:
1 AS n, 1 AS n,
cast(hp2.street0VPI as <signed>integer) AS vpip, cast(hp2.street0VPI as <signed>integer) AS vpip,
cast(hp2.street0Aggr as <signed>integer) AS pfr, cast(hp2.street0Aggr as <signed>integer) AS pfr,
cast(hp2.street0_3BChance as <signed>integer) AS 3B_opp_0, cast(hp2.street0_3BChance as <signed>integer) AS TB_opp_0,
cast(hp2.street0_3BDone as <signed>integer) AS 3B_0, cast(hp2.street0_3BDone as <signed>integer) AS TB_0,
cast(hp2.street0_4BChance as <signed>integer) AS 4B_opp_0, cast(hp2.street0_4BChance as <signed>integer) AS FB_opp_0,
cast(hp2.street0_4BDone as <signed>integer) AS 4B_0, cast(hp2.street0_4BDone as <signed>integer) AS FB_0,
cast(hp2.street0_FoldTo3BChance as <signed>integer) AS F3B_opp_0, cast(hp2.street0_FoldTo3BChance as <signed>integer) AS F3B_opp_0,
cast(hp2.street0_FoldTo3BDone as <signed>integer) AS F3B_0, cast(hp2.street0_FoldTo3BDone as <signed>integer) AS F3B_0,
cast(hp2.street0_FoldTo4BChance as <signed>integer) AS F4B_opp_0, cast(hp2.street0_FoldTo4BChance as <signed>integer) AS F4B_opp_0,
@ -1872,14 +1872,14 @@ class Sql:
1 AS n, 1 AS n,
cast(hp2.street0VPI as <signed>integer) AS vpip, cast(hp2.street0VPI as <signed>integer) AS vpip,
cast(hp2.street0Aggr as <signed>integer) AS pfr, cast(hp2.street0Aggr as <signed>integer) AS pfr,
cast(hp2.street0_3BChance as <signed>integer) AS 3B_opp_0, cast(hp2.street0_3BChance as <signed>integer) AS TB_opp_0,
cast(hp2.street0_3BDone as <signed>integer) AS 3B_0, cast(hp2.street0_3BDone as <signed>integer) AS TB_0,
cast(hp2.street0_4BChance as <signed>integer) AS 4B_opp_0, cast(hp2.street0_4BChance as <signed>integer) AS FB_opp_0,
cast(hp2.street0_4BDone as <signed>integer) AS 4B_0, cast(hp2.street0_4BDone as <signed>integer) AS FB_0,
cast(hp2.street0_FoldTo3BChance as <signed>integer) AS 3TB_opp_0, cast(hp2.street0_FoldTo3BChance as <signed>integer) AS TTB_opp_0,
cast(hp2.street0_FoldTo3BDone as <signed>integer) AS 3TB_0, cast(hp2.street0_FoldTo3BDone as <signed>integer) AS TTB_0,
cast(hp2.street0_FoldTo4BChance as <signed>integer) AS 4TB_opp_0, cast(hp2.street0_FoldTo4BChance as <signed>integer) AS FTB_opp_0,
cast(hp2.street0_FoldTo4BDone as <signed>integer) AS 4TB_0, cast(hp2.street0_FoldTo4BDone as <signed>integer) AS FTB_0,
cast(hp2.street1Seen as <signed>integer) AS saw_f, cast(hp2.street1Seen as <signed>integer) AS saw_f,
cast(hp2.street1Seen as <signed>integer) AS saw_1, cast(hp2.street1Seen as <signed>integer) AS saw_1,
cast(hp2.street2Seen as <signed>integer) AS saw_2, cast(hp2.street2Seen as <signed>integer) AS saw_2,
@ -1983,14 +1983,14 @@ class Sql:
1 AS n, 1 AS n,
cast(hp2.street0VPI as <signed>integer) AS vpip, cast(hp2.street0VPI as <signed>integer) AS vpip,
cast(hp2.street0Aggr as <signed>integer) AS pfr, cast(hp2.street0Aggr as <signed>integer) AS pfr,
cast(hp2.street0_3BChance as <signed>integer) AS 3B_opp_0, cast(hp2.street0_3BChance as <signed>integer) AS TB_opp_0,
cast(hp2.street0_3BDone as <signed>integer) AS 3B_0, cast(hp2.street0_3BDone as <signed>integer) AS TB_0,
cast(hp2.street0_4BChance as <signed>integer) AS 4B_opp_0, cast(hp2.street0_4BChance as <signed>integer) AS FB_opp_0,
cast(hp2.street0_4BDone as <signed>integer) AS 4B_0, cast(hp2.street0_4BDone as <signed>integer) AS FB_0,
cast(hp2.street0_FoldTo3BChance as <signed>integer) AS F3B_opp_0, cast(hp2.street0_FoldTo3BChance as <signed>integer) AS TB_opp_0,
cast(hp2.street0_FoldTo3BDone as <signed>integer) AS F3B_0, cast(hp2.street0_FoldTo3BDone as <signed>integer) AS TB_0,
cast(hp2.street0_FoldTo4BChance as <signed>integer) AS F4B_opp_0, cast(hp2.street0_FoldTo4BChance as <signed>integer) AS FB_opp_0,
cast(hp2.street0_FoldTo4BDone as <signed>integer) AS F4B_0, cast(hp2.street0_FoldTo4BDone as <signed>integer) AS FB_0,
cast(hp2.street1Seen as <signed>integer) AS saw_f, cast(hp2.street1Seen as <signed>integer) AS saw_f,
cast(hp2.street1Seen as <signed>integer) AS saw_1, cast(hp2.street1Seen as <signed>integer) AS saw_1,
cast(hp2.street2Seen as <signed>integer) AS saw_2, cast(hp2.street2Seen as <signed>integer) AS saw_2,

8
pyfpdb/Stats.py
View File

@ -442,12 +442,12 @@ def three_B(stat_dict, player):
""" Three bet preflop/3rd.""" """ Three bet preflop/3rd."""
stat = 0.0 stat = 0.0
try: try:
stat = float(stat_dict[player]['3b_0'])/float(stat_dict[player]['3b_opp_0']) stat = float(stat_dict[player]['3b_0'])/float(stat_dict[player]['Tb_opp_0'])
return (stat, return (stat,
'%3.1f' % (100.0*stat), '%3.1f' % (100.0*stat),
'3B=%3.1f%%' % (100.0*stat), '3B=%3.1f%%' % (100.0*stat),
'3B_pf=%3.1f%%' % (100.0*stat), '3B_pf=%3.1f%%' % (100.0*stat),
'(%d/%d)' % (stat_dict[player]['3b_0'], stat_dict[player]['3b_opp_0']), '(%d/%d)' % (stat_dict[player]['3b_0'], stat_dict[player]['Tb_opp_0']),
_('% 4 Bet preflop/3rd')) _('% 4 Bet preflop/3rd'))
except: except:
return (stat, return (stat,
@ -461,12 +461,12 @@ def four_B(stat_dict, player):
""" Four bet preflop/4rd.""" """ Four bet preflop/4rd."""
stat = 0.0 stat = 0.0
try: try:
stat = float(stat_dict[player]['4b_0'])/float(stat_dict[player]['4b_opp_0']) stat = float(stat_dict[player]['4b_0'])/float(stat_dict[player]['Fb_opp_0'])
return (stat, return (stat,
'%3.1f' % (100.0*stat), '%3.1f' % (100.0*stat),
'4B=%3.1f%%' % (100.0*stat), '4B=%3.1f%%' % (100.0*stat),
'4B_pf=%3.1f%%' % (100.0*stat), '4B_pf=%3.1f%%' % (100.0*stat),
'(%d/%d)' % (stat_dict[player]['4b_0'], stat_dict[player]['4b_opp_0']), '(%d/%d)' % (stat_dict[player]['Fb_0'], stat_dict[player]['Fb_opp_0']),
_('% 4 Bet preflop/4rd')) _('% 4 Bet preflop/4rd'))
except: except:
return (stat, return (stat,