Added 4bet and fold to 3/4bet at detailed cash stats pages
This commit is contained in:
DoNoBaN
parent
0a21e472ba
commit
6370fca9ec
|
|
@ -50,6 +50,9 @@ onlinehelp = {'Game':_('Type of Game'),
|
||||||
'VPIP':_('Voluntarily Putting In the pot\n(blinds excluded)'),
|
'VPIP':_('Voluntarily Putting In the pot\n(blinds excluded)'),
|
||||||
'PFR':_('% Pre Flop Raise'),
|
'PFR':_('% Pre Flop Raise'),
|
||||||
'PF3':_('% Pre Flop Re-Raise / 3Bet'),
|
'PF3':_('% Pre Flop Re-Raise / 3Bet'),
|
||||||
|
'PF4':_('% Pre Flop Re-Raise / 4Bet'),
|
||||||
|
'PFF3':_('% Pre Flop Fold To Re-Raise / F3Bet'),
|
||||||
|
'PFF4':_('% Pre Flop Fold To Re-Raise / F4Bet'),
|
||||||
'AggFac':_('Aggression Factor\n'),
|
'AggFac':_('Aggression Factor\n'),
|
||||||
'AggFreq':_('Aggression Frequency\nBet or Raise vs Fold'),
|
'AggFreq':_('Aggression Frequency\nBet or Raise vs Fold'),
|
||||||
'ContBet':_('Continuation Bet post-flop'),
|
'ContBet':_('Continuation Bet post-flop'),
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,9 @@
|
||||||
<col col_name="vpip" disp_all="True" disp_posn="True" col_title="VPIP" xalignment="1.0" field_format="%3.1f" field_type="str" />
|
<col col_name="vpip" disp_all="True" disp_posn="True" col_title="VPIP" xalignment="1.0" field_format="%3.1f" field_type="str" />
|
||||||
<col col_name="pfr" disp_all="True" disp_posn="True" col_title="PFR" xalignment="1.0" field_format="%3.1f" field_type="str" />
|
<col col_name="pfr" disp_all="True" disp_posn="True" col_title="PFR" xalignment="1.0" field_format="%3.1f" field_type="str" />
|
||||||
<col col_name="pf3" disp_all="True" disp_posn="True" col_title="PF3" xalignment="1.0" field_format="%3.1f" field_type="str" />
|
<col col_name="pf3" disp_all="True" disp_posn="True" col_title="PF3" xalignment="1.0" field_format="%3.1f" field_type="str" />
|
||||||
|
<col col_name="pf4" disp_all="True" disp_posn="True" col_title="PF4" xalignment="1.0" field_format="%3.1f" field_type="str" />
|
||||||
|
<col col_name="pff3" disp_all="True" disp_posn="True" col_title="PFF3" xalignment="1.0" field_format="%3.1f" field_type="str" />
|
||||||
|
<col col_name="pff4" disp_all="True" disp_posn="True" col_title="PFF4" xalignment="1.0" field_format="%3.1f" field_type="str" />
|
||||||
<col col_name="aggfac" disp_all="True" disp_posn="True" col_title="AggFac" xalignment="1.0" field_format="%2.2f" field_type="str" />
|
<col col_name="aggfac" disp_all="True" disp_posn="True" col_title="AggFac" xalignment="1.0" field_format="%2.2f" field_type="str" />
|
||||||
<col col_name="aggfrq" disp_all="True" disp_posn="True" col_title="AggFreq" xalignment="1.0" field_format="%3.1f" field_type="str" />
|
<col col_name="aggfrq" disp_all="True" disp_posn="True" col_title="AggFreq" xalignment="1.0" field_format="%3.1f" field_type="str" />
|
||||||
<col col_name="conbet" disp_all="True" disp_posn="True" col_title="ContBet" xalignment="1.0" field_format="%3.1f" field_type="str" />
|
<col col_name="conbet" disp_all="True" disp_posn="True" col_title="ContBet" xalignment="1.0" field_format="%3.1f" field_type="str" />
|
||||||
|
|
|
||||||
|
|
@ -2225,7 +2225,6 @@ class Sql:
|
||||||
from Gametypes gt
|
from Gametypes gt
|
||||||
WHERE type = 'ring'
|
WHERE type = 'ring'
|
||||||
order by type, limitType DESC, bb_or_buyin DESC"""
|
order by type, limitType DESC, bb_or_buyin DESC"""
|
||||||
# FIXME: fold to 3bet don't added
|
|
||||||
if db_server == 'mysql':
|
if db_server == 'mysql':
|
||||||
self.query['playerDetailedStats'] = """
|
self.query['playerDetailedStats'] = """
|
||||||
select <hgametypeId> AS hgametypeid
|
select <hgametypeId> AS hgametypeid
|
||||||
|
|
@ -2244,6 +2243,16 @@ class Sql:
|
||||||
,case when sum(cast(hp.street0_3Bchance as <signed>integer)) = 0 then -999
|
,case when sum(cast(hp.street0_3Bchance as <signed>integer)) = 0 then -999
|
||||||
else 100.0*sum(cast(hp.street0_3Bdone as <signed>integer))/sum(cast(hp.street0_3Bchance as <signed>integer))
|
else 100.0*sum(cast(hp.street0_3Bdone as <signed>integer))/sum(cast(hp.street0_3Bchance as <signed>integer))
|
||||||
end AS pf3
|
end AS pf3
|
||||||
|
,case when sum(cast(hp.street0_4Bchance as <signed>integer)) = 0 then -999
|
||||||
|
else 100.0*sum(cast(hp.street0_4Bdone as <signed>integer))/sum(cast(hp.street0_4Bchance as <signed>integer))
|
||||||
|
end AS pf4
|
||||||
|
,case when sum(cast(hp.street0_FoldTo3Bchance as <signed>integer)) = 0 then -999
|
||||||
|
else 100.0*sum(cast(hp.street0_FoldTo3Bdone as <signed>integer))/sum(cast(hp.street0_FoldTo3Bchance as <signed>integer))
|
||||||
|
end AS pff3
|
||||||
|
,case when sum(cast(hp.street0_FoldTo4Bchance as <signed>integer)) = 0 then -999
|
||||||
|
else 100.0*sum(cast(hp.street0_FoldTo4Bdone as <signed>integer))/sum(cast(hp.street0_FoldTo4Bchance as <signed>integer))
|
||||||
|
end AS pff4
|
||||||
|
|
||||||
,case when sum(cast(hp.raiseFirstInChance as <signed>integer)) = 0 then -999
|
,case when sum(cast(hp.raiseFirstInChance as <signed>integer)) = 0 then -999
|
||||||
else 100.0 * sum(cast(hp.raisedFirstIn as <signed>integer)) /
|
else 100.0 * sum(cast(hp.raisedFirstIn as <signed>integer)) /
|
||||||
sum(cast(hp.raiseFirstInChance as <signed>integer))
|
sum(cast(hp.raiseFirstInChance as <signed>integer))
|
||||||
|
|
@ -2365,6 +2374,15 @@ class Sql:
|
||||||
,case when sum(cast(hp.street0_3Bchance as <signed>integer)) = 0 then -999
|
,case when sum(cast(hp.street0_3Bchance as <signed>integer)) = 0 then -999
|
||||||
else 100.0*sum(cast(hp.street0_3Bdone as <signed>integer))/sum(cast(hp.street0_3Bchance as <signed>integer))
|
else 100.0*sum(cast(hp.street0_3Bdone as <signed>integer))/sum(cast(hp.street0_3Bchance as <signed>integer))
|
||||||
end AS pf3
|
end AS pf3
|
||||||
|
,case when sum(cast(hp.street0_4Bchance as <signed>integer)) = 0 then -999
|
||||||
|
else 100.0*sum(cast(hp.street0_4Bdone as <signed>integer))/sum(cast(hp.street0_4Bchance as <signed>integer))
|
||||||
|
end AS pf4
|
||||||
|
,case when sum(cast(hp.street0_FoldTo3Bchance as <signed>integer)) = 0 then -999
|
||||||
|
else 100.0*sum(cast(hp.street0_FoldTo3Bdone as <signed>integer))/sum(cast(hp.street0_FoldTo3Bchance as <signed>integer))
|
||||||
|
end AS pff3
|
||||||
|
,case when sum(cast(hp.street0_FoldTo4Bchance as <signed>integer)) = 0 then -999
|
||||||
|
else 100.0*sum(cast(hp.street0_FoldTo4Bdone as <signed>integer))/sum(cast(hp.street0_FoldTo4Bchance as <signed>integer))
|
||||||
|
end AS pff4
|
||||||
,case when sum(cast(hp.raiseFirstInChance as <signed>integer)) = 0 then -999
|
,case when sum(cast(hp.raiseFirstInChance as <signed>integer)) = 0 then -999
|
||||||
else 100.0 * sum(cast(hp.raisedFirstIn as <signed>integer)) /
|
else 100.0 * sum(cast(hp.raisedFirstIn as <signed>integer)) /
|
||||||
sum(cast(hp.raiseFirstInChance as <signed>integer))
|
sum(cast(hp.raiseFirstInChance as <signed>integer))
|
||||||
|
|
@ -2487,6 +2505,15 @@ class Sql:
|
||||||
,case when sum(cast(hp.street0_3Bchance as <signed>integer)) = 0 then -999
|
,case when sum(cast(hp.street0_3Bchance as <signed>integer)) = 0 then -999
|
||||||
else 100.0*sum(cast(hp.street0_3Bdone as <signed>integer))/sum(cast(hp.street0_3Bchance as <signed>integer))
|
else 100.0*sum(cast(hp.street0_3Bdone as <signed>integer))/sum(cast(hp.street0_3Bchance as <signed>integer))
|
||||||
end AS pf3
|
end AS pf3
|
||||||
|
,case when sum(cast(hp.street0_4Bchance as <signed>integer)) = 0 then -999
|
||||||
|
else 100.0*sum(cast(hp.street0_4Bdone as <signed>integer))/sum(cast(hp.street0_4Bchance as <signed>integer))
|
||||||
|
end AS pf4
|
||||||
|
,case when sum(cast(hp.street0_FoldTo3Bchance as <signed>integer)) = 0 then -999
|
||||||
|
else 100.0*sum(cast(hp.street0_FoldTo3Bdone as <signed>integer))/sum(cast(hp.street0_FoldTo3Bchance as <signed>integer))
|
||||||
|
end AS pff3
|
||||||
|
,case when sum(cast(hp.street0_FoldTo4Bchance as <signed>integer)) = 0 then -999
|
||||||
|
else 100.0*sum(cast(hp.street0_FoldTo4Bdone as <signed>integer))/sum(cast(hp.street0_FoldTo4Bchance as <signed>integer))
|
||||||
|
end AS pff4
|
||||||
,case when sum(cast(hp.raiseFirstInChance as <signed>integer)) = 0 then -999
|
,case when sum(cast(hp.raiseFirstInChance as <signed>integer)) = 0 then -999
|
||||||
else 100.0 * sum(cast(hp.raisedFirstIn as <signed>integer)) /
|
else 100.0 * sum(cast(hp.raisedFirstIn as <signed>integer)) /
|
||||||
sum(cast(hp.raiseFirstInChance as <signed>integer))
|
sum(cast(hp.raiseFirstInChance as <signed>integer))
|
||||||
|
|
@ -2592,6 +2619,7 @@ class Sql:
|
||||||
,s.name
|
,s.name
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
#FIXME: 3/4bet and foldTo don't added four tournaments yet
|
||||||
if db_server == 'mysql':
|
if db_server == 'mysql':
|
||||||
self.query['tourneyPlayerDetailedStats'] = """
|
self.query['tourneyPlayerDetailedStats'] = """
|
||||||
select s.name AS siteName
|
select s.name AS siteName
|
||||||
|
|
@ -2715,6 +2743,9 @@ class Sql:
|
||||||
,stats.vpip
|
,stats.vpip
|
||||||
,stats.pfr
|
,stats.pfr
|
||||||
,stats.pf3
|
,stats.pf3
|
||||||
|
,stats.pf4
|
||||||
|
,stats.pff3
|
||||||
|
,stats.pff4
|
||||||
,stats.steals
|
,stats.steals
|
||||||
,stats.saw_f
|
,stats.saw_f
|
||||||
,stats.sawsd
|
,stats.sawsd
|
||||||
|
|
@ -2745,6 +2776,15 @@ class Sql:
|
||||||
,case when sum(street0_3Bchance) = 0 then '0'
|
,case when sum(street0_3Bchance) = 0 then '0'
|
||||||
else format(100.0*sum(street0_3Bdone)/sum(street0_3Bchance),1)
|
else format(100.0*sum(street0_3Bdone)/sum(street0_3Bchance),1)
|
||||||
end AS pf3
|
end AS pf3
|
||||||
|
,case when sum(street0_4Bchance) = 0 then '0'
|
||||||
|
else format(100.0*sum(street0_4Bdone)/sum(street0_4Bchance),1)
|
||||||
|
end AS pf4
|
||||||
|
,case when sum(street0_FoldTo3Bchance) = 0 then '0'
|
||||||
|
else format(100.0*sum(street0_FoldTo3Bdone)/sum(street0_FoldTo3Bchance),1)
|
||||||
|
end AS pff3
|
||||||
|
,case when sum(street0_FoldTo4Bchance) = 0 then '0'
|
||||||
|
else format(100.0*sum(street0_FoldTo4Bdone)/sum(street0_FoldTo4Bchance),1)
|
||||||
|
end AS pff4
|
||||||
,case when sum(raiseFirstInChance) = 0 then '-'
|
,case when sum(raiseFirstInChance) = 0 then '-'
|
||||||
else format(100.0*sum(raisedFirstIn)/sum(raiseFirstInChance),1)
|
else format(100.0*sum(raisedFirstIn)/sum(raiseFirstInChance),1)
|
||||||
end AS steals
|
end AS steals
|
||||||
|
|
@ -2821,6 +2861,9 @@ class Sql:
|
||||||
,stats.vpip
|
,stats.vpip
|
||||||
,stats.pfr
|
,stats.pfr
|
||||||
,stats.pf3
|
,stats.pf3
|
||||||
|
,stats.pf4
|
||||||
|
,stats.pff3
|
||||||
|
,stats.pff4
|
||||||
,stats.steals
|
,stats.steals
|
||||||
,stats.saw_f
|
,stats.saw_f
|
||||||
,stats.sawsd
|
,stats.sawsd
|
||||||
|
|
@ -2935,6 +2978,9 @@ class Sql:
|
||||||
,stats.vpip
|
,stats.vpip
|
||||||
,stats.pfr
|
,stats.pfr
|
||||||
,stats.pf3
|
,stats.pf3
|
||||||
|
,stats.pf4
|
||||||
|
,stats.pff3
|
||||||
|
,stats.pff4
|
||||||
,stats.steals
|
,stats.steals
|
||||||
,stats.saw_f
|
,stats.saw_f
|
||||||
,stats.sawsd
|
,stats.sawsd
|
||||||
|
|
@ -2973,6 +3019,15 @@ class Sql:
|
||||||
,case when sum(street0_3Bchance) = 0 then '0'
|
,case when sum(street0_3Bchance) = 0 then '0'
|
||||||
else format(100.0*sum(street0_3Bdone)/sum(street0_3Bchance),1)
|
else format(100.0*sum(street0_3Bdone)/sum(street0_3Bchance),1)
|
||||||
end AS pf3
|
end AS pf3
|
||||||
|
,case when sum(street0_4Bchance) = 0 then '0'
|
||||||
|
else format(100.0*sum(street0_4Bdone)/sum(street0_4Bchance),1)
|
||||||
|
end AS pf4
|
||||||
|
,case when sum(street0_FoldTo3Bchance) = 0 then '0'
|
||||||
|
else format(100.0*sum(street0_FoldTo3Bdone)/sum(street0_FoldTo3Bchance),1)
|
||||||
|
end AS pff3
|
||||||
|
,case when sum(street0_FoldTo4Bchance) = 0 then '0'
|
||||||
|
else format(100.0*sum(street0_FoldTo4Bdone)/sum(street0_FoldTo4Bchance),1)
|
||||||
|
end AS pff4
|
||||||
,case when sum(raiseFirstInChance) = 0 then '-'
|
,case when sum(raiseFirstInChance) = 0 then '-'
|
||||||
else format(100.0*sum(raisedFirstIn)/sum(raiseFirstInChance),1)
|
else format(100.0*sum(raisedFirstIn)/sum(raiseFirstInChance),1)
|
||||||
end AS steals
|
end AS steals
|
||||||
|
|
@ -3071,6 +3126,9 @@ class Sql:
|
||||||
,stats.vpip
|
,stats.vpip
|
||||||
,stats.pfr
|
,stats.pfr
|
||||||
,stats.pf3
|
,stats.pf3
|
||||||
|
,stats.pf4
|
||||||
|
,stats.pff3
|
||||||
|
,stats.pff4
|
||||||
,stats.steals
|
,stats.steals
|
||||||
,stats.saw_f
|
,stats.saw_f
|
||||||
,stats.sawsd
|
,stats.sawsd
|
||||||
|
|
@ -3109,6 +3167,15 @@ class Sql:
|
||||||
,case when sum(street0_3Bchance) = 0 then '0'
|
,case when sum(street0_3Bchance) = 0 then '0'
|
||||||
else to_char(100.0*sum(street0_3Bdone)/sum(street0_3Bchance),'90D0')
|
else to_char(100.0*sum(street0_3Bdone)/sum(street0_3Bchance),'90D0')
|
||||||
end AS pf3
|
end AS pf3
|
||||||
|
,case when sum(street0_4Bchance) = 0 then '0'
|
||||||
|
else to_char(100.0*sum(street0_4Bdone)/sum(street0_4Bchance),'90D0')
|
||||||
|
end AS pf4
|
||||||
|
,case when sum(street0_FoldTo3Bchance) = 0 then '0'
|
||||||
|
else to_char(100.0*sum(street0_FoldTo3Bdone)/sum(street0_FoldTo3Bchance),'90D0')
|
||||||
|
end AS pff3
|
||||||
|
,case when sum(street0_FoldTo4Bchance) = 0 then '0'
|
||||||
|
else to_char(100.0*sum(street0_FoldTo4Bdone)/sum(street0_FoldTo4Bchance),'90D0')
|
||||||
|
end AS pff4
|
||||||
,case when sum(raiseFirstInChance) = 0 then '-'
|
,case when sum(raiseFirstInChance) = 0 then '-'
|
||||||
else to_char(100.0*sum(raisedFirstIn)/sum(raiseFirstInChance),'90D0')
|
else to_char(100.0*sum(raisedFirstIn)/sum(raiseFirstInChance),'90D0')
|
||||||
end AS steals
|
end AS steals
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user