diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py index c05eef00..09c467c4 100644 --- a/pyfpdb/SQL.py +++ b/pyfpdb/SQL.py @@ -1511,10 +1511,10 @@ class Sql: sum(hc.HDs) AS n, sum(hc.street0VPI) AS vpip, sum(hc.street0Aggr) AS pfr, - sum(hc.street0_3BChance) AS 3B_opp_0, - sum(hc.street0_3BDone) AS 3B_0, - sum(hc.street0_4BChance) AS 4B_opp_0, - sum(hc.street0_4BDone) AS 4B_0, + sum(hc.street0_3BChance) AS TB_opp_0, + sum(hc.street0_3BDone) AS TB_0, + sum(hc.street0_4BChance) AS FB_opp_0, + sum(hc.street0_4BDone) AS FB_0, sum(hc.street0_FoldTo3BChance) AS F3B_opp_0, sum(hc.street0_FoldTo3BDone) AS F3B_0, sum(hc.street0_FoldTo4BChance) AS F4B_opp_0, @@ -1628,10 +1628,10 @@ class Sql: sum(hc.HDs) AS n, sum(hc.street0VPI) AS vpip, sum(hc.street0Aggr) AS pfr, - sum(hc.street0_3BChance) AS 3B_opp_0, - sum(hc.street0_3BDone) AS 3B_0, - sum(hc.street0_4BChance) AS 4B_opp_0, - sum(hc.street0_4BDone) AS 4B_0, + sum(hc.street0_3BChance) AS TB_opp_0, + sum(hc.street0_3BDone) AS TB_0, + sum(hc.street0_4BChance) AS FB_opp_0, + sum(hc.street0_4BDone) AS FB_0, sum(hc.street0_FoldTo3BChance) AS F3B_opp_0, sum(hc.street0_FoldTo3BDone) AS F3B_0, sum(hc.street0_FoldTo4BChance) AS F4B_opp_0, @@ -1762,10 +1762,10 @@ class Sql: 1 AS n, cast(hp2.street0VPI as integer) AS vpip, cast(hp2.street0Aggr as integer) AS pfr, - cast(hp2.street0_3BChance as integer) AS 3B_opp_0, - cast(hp2.street0_3BDone as integer) AS 3B_0, - cast(hp2.street0_4BChance as integer) AS 4B_opp_0, - cast(hp2.street0_4BDone as integer) AS 4B_0, + cast(hp2.street0_3BChance as integer) AS TB_opp_0, + cast(hp2.street0_3BDone as integer) AS TB_0, + cast(hp2.street0_4BChance as integer) AS FB_opp_0, + cast(hp2.street0_4BDone as integer) AS FB_0, cast(hp2.street0_FoldTo3BChance as integer) AS F3B_opp_0, cast(hp2.street0_FoldTo3BDone as integer) AS F3B_0, cast(hp2.street0_FoldTo4BChance as integer) AS F4B_opp_0, @@ -1872,14 +1872,14 @@ class Sql: 1 AS n, cast(hp2.street0VPI as integer) AS vpip, cast(hp2.street0Aggr as integer) AS pfr, - cast(hp2.street0_3BChance as integer) AS 3B_opp_0, - cast(hp2.street0_3BDone as integer) AS 3B_0, - cast(hp2.street0_4BChance as integer) AS 4B_opp_0, - cast(hp2.street0_4BDone as integer) AS 4B_0, - cast(hp2.street0_FoldTo3BChance as integer) AS 3TB_opp_0, - cast(hp2.street0_FoldTo3BDone as integer) AS 3TB_0, - cast(hp2.street0_FoldTo4BChance as integer) AS 4TB_opp_0, - cast(hp2.street0_FoldTo4BDone as integer) AS 4TB_0, + cast(hp2.street0_3BChance as integer) AS TB_opp_0, + cast(hp2.street0_3BDone as integer) AS TB_0, + cast(hp2.street0_4BChance as integer) AS FB_opp_0, + cast(hp2.street0_4BDone as integer) AS FB_0, + cast(hp2.street0_FoldTo3BChance as integer) AS TTB_opp_0, + cast(hp2.street0_FoldTo3BDone as integer) AS TTB_0, + cast(hp2.street0_FoldTo4BChance as integer) AS FTB_opp_0, + cast(hp2.street0_FoldTo4BDone as integer) AS FTB_0, cast(hp2.street1Seen as integer) AS saw_f, cast(hp2.street1Seen as integer) AS saw_1, cast(hp2.street2Seen as integer) AS saw_2, @@ -1983,14 +1983,14 @@ class Sql: 1 AS n, cast(hp2.street0VPI as integer) AS vpip, cast(hp2.street0Aggr as integer) AS pfr, - cast(hp2.street0_3BChance as integer) AS 3B_opp_0, - cast(hp2.street0_3BDone as integer) AS 3B_0, - cast(hp2.street0_4BChance as integer) AS 4B_opp_0, - cast(hp2.street0_4BDone as integer) AS 4B_0, - cast(hp2.street0_FoldTo3BChance as integer) AS F3B_opp_0, - cast(hp2.street0_FoldTo3BDone as integer) AS F3B_0, - cast(hp2.street0_FoldTo4BChance as integer) AS F4B_opp_0, - cast(hp2.street0_FoldTo4BDone as integer) AS F4B_0, + cast(hp2.street0_3BChance as integer) AS TB_opp_0, + cast(hp2.street0_3BDone as integer) AS TB_0, + cast(hp2.street0_4BChance as integer) AS FB_opp_0, + cast(hp2.street0_4BDone as integer) AS FB_0, + cast(hp2.street0_FoldTo3BChance as integer) AS TB_opp_0, + cast(hp2.street0_FoldTo3BDone as integer) AS TB_0, + cast(hp2.street0_FoldTo4BChance as integer) AS FB_opp_0, + cast(hp2.street0_FoldTo4BDone as integer) AS FB_0, cast(hp2.street1Seen as integer) AS saw_f, cast(hp2.street1Seen as integer) AS saw_1, cast(hp2.street2Seen as integer) AS saw_2, diff --git a/pyfpdb/Stats.py b/pyfpdb/Stats.py index a85ac058..9e475403 100755 --- a/pyfpdb/Stats.py +++ b/pyfpdb/Stats.py @@ -442,12 +442,12 @@ def three_B(stat_dict, player): """ Three bet preflop/3rd.""" stat = 0.0 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, '%3.1f' % (100.0*stat), '3B=%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')) except: return (stat, @@ -461,12 +461,12 @@ def four_B(stat_dict, player): """ Four bet preflop/4rd.""" stat = 0.0 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, '%3.1f' % (100.0*stat), '4B=%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')) except: return (stat,