diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py index 69b02d25..3f211dd5 100644 --- a/pyfpdb/SQL.py +++ b/pyfpdb/SQL.py @@ -1876,10 +1876,10 @@ class Sql: 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.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.street1Seen as integer) AS saw_f, cast(hp2.street1Seen as integer) AS saw_1, cast(hp2.street2Seen as integer) AS saw_2, @@ -1987,10 +1987,10 @@ class Sql: 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.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.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 97d4aa8f..97d37d7c 100755 --- a/pyfpdb/Stats.py +++ b/pyfpdb/Stats.py @@ -442,13 +442,13 @@ def three_B(stat_dict, player): """ Three bet preflop/3rd.""" stat = 0.0 try: - stat = float(stat_dict[player]['Tb_0'])/float(stat_dict[player]['Tb_opp_0']) + stat = float(stat_dict[player]['tb_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]['Tb_0'], stat_dict[player]['Tb_opp_0']), - _('% 4 Bet preflop/3rd')) + '(%d/%d)' % (stat_dict[player]['tb_0'], stat_dict[player]['tb_opp_0']), + _('% 3 Bet preflop/3rd')) except: return (stat, 'NA', @@ -461,12 +461,12 @@ def four_B(stat_dict, player): """ Four bet preflop/4rd.""" stat = 0.0 try: - stat = float(stat_dict[player]['Fb_0'])/float(stat_dict[player]['Fb_opp_0']) + stat = float(stat_dict[player]['fb_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]['Fb_0'], stat_dict[player]['Fb_opp_0']), + '(%d/%d)' % (stat_dict[player]['fb_0'], stat_dict[player]['fb_opp_0']), _('% 4 Bet preflop/4rd')) except: return (stat,