Skip to content

Initial work to track defense positions #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slshen merged 1 commit into from
May 30, 2025
Merged

Initial work to track defense positions #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
with:
go-version: '1.22'
- name: Caching go modules
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
Expand Down
2 changes: 1 addition & 1 deletion TODO.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
* Implment sub, hsub, vsub
* Implement sub, hsub, vsub

* Verify stats for games in tests

Expand Down
2 changes: 1 addition & 1 deletion data/2021/20210911-1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ visitorplays:
- mj18,CBX,S8/G8.B-1;3-H
- bj00,BFB,WP.1-2
- bj00,BFBBCB,W.B-1
- kg2,BCFFB,HP.B-1;1-2;2-3
- kg2,BCFFBH,HP.B-1;1-2;2-3
- ms11,CBSC,K
- as7,X,6/L6
- inn,2,1
Expand Down
6 changes: 3 additions & 3 deletions data/2021/20210911-3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ visitorplays:
- mf17,X,S9/G3.B-1
- aw6,BBX,S8/L8.B-1;1-2
- mj18,BX,FC5/G.B-1;1-2;2X3(5)
- bj00,CBFX,HP.B-1;1-2;2-3
- bj00,CBFH,HP.B-1;1-2;2-3
- kg2,X,S9/G9.B-1;1-3;2-H;3-H
- ms11,BX,FC5.B-1;1-2;3XH(52)
- as7,CCX,S6/G.B-1;1-2;2-3
Expand Down Expand Up @@ -56,10 +56,10 @@ homeplays:
- 26,X,43/G
- inn,2,0
- 19,BX,53/G
- 20,X,HP.B-1
- 20,H,HP.B-1
- 14,CCC,K
- 92,X,E4/G4.B-1;1-2
- 7,CX,HP.B-1;1-2;2-3
- 7,CH,HP.B-1;1-2;2-3
- 88,CCX,8/F8
- inn,3,0
- 21,X,7/F7S
Expand Down
6 changes: 3 additions & 3 deletions data/2021/20210912-2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ visitorplays:
- aw6,X,D7/G56.B-2;1-3
- mj18,CBCX,S7/G56.BX2(714);2-H;3-H
- ms11,BFX,63/G
- kg2,BX,HP
- kg2,BH,HP
- bj00,CFBX,S9/F89S.B-1;1-3
- cm22,BB,SB2
- cm22,BBCFFFS,K
- inn,2,2
- rv10,X,HP
- rv10,H,HP
- ss16,BX,S8/L8.B-1;1-2
- pitcher,13
- mf17,CX,S1/G3/B/SH.B-3(E1/TH);1-H;2-H,chaos!
Expand All @@ -33,7 +33,7 @@ visitorplays:
- ms11,BCX,D7/L87.B-2;2-H;3-H
- kg2,BCX,63/G.2-3
- bj00,BBX,S8/G56.3-H;B-3(E7)
- cm22,X,HP.B-1
- cm22,H,HP.B-1
- rv10,B,SB2
- rv10,BBCFFX,43/G
- inn,3,7
Expand Down
2 changes: 1 addition & 1 deletion data/2021/20210926-1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ homeplays:
- 32,BCBX,7/F7.2-3;3-H
- 21,B,WP.3-H
- 21,BCSBS,K
- 1,BFB,HP.B-1
- 1,BFBH,HP.B-1
- 28,BBBCSX,S1/L1.B-1;1-2
- 5,B,SB3;SB2
- 5,BBX,6/L6
Expand Down
6 changes: 3 additions & 3 deletions data/2021/20211009-1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ homeplays:
- inn,2,0
- 13,FX,S7/G5.B-1
- 12,X,FC1/B.B-1;1-2,should have thrown 1
- 22,CBX,HP.B-1;1-2;2-3
- 22,CBH,HP.B-1;1-2;2-3
- 8,FX,4/P4
- 00,SCBBS,K
- 20,SSS,K
Expand All @@ -76,13 +76,13 @@ homeplays:
- 23,BBBCB,W.B-1
- 27,BS,SB3.1-2
- 27,BSCX,8/F8/SF.2-3;3-H
- 11,X,HP
- 11,H,HP
- 17,CB,SB2.1-2;3-H
- 17,CBSX,S9/L9.B-1;2-H
- 13,CX,E7/F7.B-1;1-2
- 12,B,WP.2-3;1-2
- 12,BCX,E5/G5/TH.B-1;2-3;3-H
- 22,X,HP.B-1;1-2
- 22,H,HP.B-1;1-2
- 8,B,CSH(15).3-H(E1/TH);1-2;2-3
- 8,BBCCBC,K
- inn,4,5
Expand Down
2 changes: 1 addition & 1 deletion data/2021/20211016-1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ visitorplays:
- ac14,B,SB2
- ac14,BSX,S7/P6D.B-1;2X3(75);3-H,Angelina thrown out advancing to 3
- kn21,B,WP.1-2
- kn21,BCBS,HP,hit by a strike?
- kn21,BCBSH,HP,hit by a strike?
- mf17,FBFBFX,T7/F78.B-3;2-H;1-H
- aw6,BBBF,FLE2
- aw6,BBBFFB,W.B-1
Expand Down
2 changes: 1 addition & 1 deletion data/2021/20211016-3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ homeplays:
- 2,FSC,K
- 10,BCBBX,3/P3
- inn,2,0
- 13,FX,HP
- 13,FH,HP
- 25,B,CS2(26)
- 25,BX,43/G
- 00,BBFBB,W.B-1
Expand Down
2 changes: 1 addition & 1 deletion data/2021/20211017-1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ league: PGF
visitorplays:
- pitcher,11
- mf17,X,13/G
- aw6,X,HP.B-1
- aw6,H,HP.B-1
- cm22,CCBX,FC6/G6.B-1;1X2(64)
- kg2,BCB,PB.1-2
- kg2,BCBBX,53/G
Expand Down
4 changes: 2 additions & 2 deletions data/2021/20211030-1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ visitorplays:
- le13,FBX,13/G1,Lana bats out of order by umpire ruling
- ss16,BX,DGR/F7
- kn21,B,WP.2-3
- kn21,BSFBX,HP
- kn21,BSFBH,HP
- rv10,CFX,8/F8/SF.3-H
- as7,FFX,3/P3
- inn,4,2
- mf17,CBX,43/G
- aw6,CX,S2/B.B-1
- cm22,CX,53/G.1-2
- kg2,CCX,S8/L8.B-1;2-H
- ms11,X,HP.B-1;1-2
- ms11,H,HP.B-1;1-2
- bj00,X,D8/F89.B-2;1-H;2-H
- mj18,CFFX,9/F9
- inn,5,5
Expand Down
4 changes: 2 additions & 2 deletions data/2021/20211030-2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ visitorplays:
- le13,BBB,WP.1-2
- le13,BBBB,W.B-1
- ss16,X,E6/P1.B-1;1-2;2-3
- kn21,BFFBX,HP.B-1;1-2;2-3;3-H
- kn21,BFFBH,HP.B-1;1-2;2-3;3-H
- rv10,FX,E4.B-1;1X2(4);2-3;3-H
- inn,2,6
- as7,X,6/P6
Expand All @@ -45,7 +45,7 @@ visitorplays:
- inn,4,10
- mf17,FBFBBX,5/P5
- aw6,X,7/L7
- cm22,X,HP
- cm22,H,HP
- kg2,BCBX,S7/G7.B-1;1-2
- ms11,X,FC6.B-1;1X2(64);2-3
- inn,5,10
Expand Down
2 changes: 1 addition & 1 deletion data/2021/20211030-3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ visitorplays:
- le13,BBX,S7/L7.B-1
- ss16,BB,SB2
- ss16,BBBB,W.B-1
- kn21,SX,HP.B-1;1-2;2-3
- kn21,SH,HP.B-1;1-2;2-3
- rv10,FCX,S9/F9.B-2(E9);2-H;3-H
- as7,BSBBX,43/P45.1-2;2-3
- pitcher,2
Expand Down
4 changes: 2 additions & 2 deletions data/2021/20211031-1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ visitorplays:
- bj00,X,T9/L9.B-3;3-H
- ms11,X,6/P6D
- inn,5,2
- le13,X,HP
- le13,H,HP
- ss16,FBCFFFFBBB,W.B-1;1-2
- mf17,X,HP.B-1;1-2;2-3
- mf17,H,HP.B-1;1-2;2-3
- aw6,BBFBFB,W.B-1;1-2;2-3;3-H
- cm22,BCCX,S3/G3.B-1;1-2;2-3;3-H
- mj18,BFCBFBFX,S7/L7.B-1;1-2;2-3;3-H
Expand Down
4 changes: 2 additions & 2 deletions data/2021/20211031-2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ homeplays:
- 25,BX,S8/G64.B-1
- 44,C,SB2
- 44,CX,S8/P8S.B-2;2-3
- 00,FX,HP.B-1
- 9,X,HP.B-1;1-2;2-3;3-H
- 00,FH,HP.B-1
- 9,H,HP.B-1;1-2;2-3;3-H
- 42,BBFX,S8/L8.B-1;1-2;2-H;3-H
- 3,BBX,S8/P4D.B-1;1-2;2-H
- pitcher,bj00
Expand Down
4 changes: 2 additions & 2 deletions data/2021/20211106-2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ homeplays:
- 1,BBFCFFBX,E5/G5.B-1
- 42,X,13/G1
- 28,X,S9/P9S.B-1;1-2
- 7,X,HP.B-1;1-2;2-3
- 7,H,HP.B-1;1-2;2-3
- 21,BCCX,D9/F9.B-2;1-3;2-H;3-H
- 16,BX,E5/G5/TH.B-1;2-3;3-H
- 17,X,D8/F8D.B-2;1-3;3-H
Expand All @@ -86,7 +86,7 @@ homeplays:
- pitcher,bj00
- 7,BX,7/F7
- 21,X,D8/L8D.B-2;1-H;2-H
- 16,BFFBBX,HP.B-1
- 16,BFFBBH,HP.B-1
- 17,FX,53/G5
- inn,5,9
- 00,FX,13/G1
Expand Down
4 changes: 2 additions & 2 deletions data/2021/20211119-1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ visitorplays:
- le13,BBBB,W.B-1
- rv10,X,S8/G56.B-1;1-2
- ss16,CBSX,1/P1/IF
- kn21,CBX,HP.B-1;1-2;2-3
- as7,X,HP.B-1;1-2;2-3;3-H
- kn21,CBH,HP.B-1;1-2;2-3
- as7,H,HP.B-1;1-2;2-3;3-H
- mf17,BBBB,W.B-1;1-2;2-3;3-H
- aw6,BX,FC5.B-1;1-2;2-3;3XH(52)
- cm22,CBBCFC,K
Expand Down
2 changes: 1 addition & 1 deletion data/2021/20211120-1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ visitorplays:
- le13,X,63/G6
- ss16,FBFFBFX,63/G6
- inn,1
- kn21,SCFX,HP
- kn21,SCFH,HP
- as7,CFX,6/P6
- bj00,BBBB,W.B-1;1-2
- mf17,BCCFBX,S4/G4.B-1;1-2;2-3
Expand Down
2 changes: 1 addition & 1 deletion data/2021/20211121-1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ homeplays:
- aw6,CSS,K
- inn,3
- cm22,BBBB,W.B-1
- kg2,CX,HP.B-1;1-2
- kg2,CH,HP.B-1;1-2
- mj18,BBCFX,FC4.B-1;1X2(46);2-3
- ms11,B,SB2
- ms11,BX,S7/L7.B-2(E2);2-3;3-H
Expand Down
12 changes: 0 additions & 12 deletions hack/data-export.sh
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions pkg/boxscore/box.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ func NewBoxScore(g *game.Game, re stats.RunExpectancy) (*BoxScore, error) {
boxscore := &BoxScore{
Game: g,
Stats: gs,
HomeLineup: &Lineup{gs.TeamStats[g.Home.Name]},
VisitorLineup: &Lineup{gs.TeamStats[g.Visitor.Name]},
HomeLineup: &Lineup{gs.GetStats(g.Home)},
VisitorLineup: &Lineup{gs.GetStats(g.Visitor)},
}
if err := boxscore.run(); err != nil {
return nil, err
Expand Down
15 changes: 15 additions & 0 deletions pkg/boxscore/lineup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,21 @@ func (lineup *Lineup) BattingTable() *dataframe.Data {
dataframe.Rename("Walks", "BB"),
)
idx := dat.GetIndex()
names := idx.GetColumn("#")
dat.RApply(func(row int) {
// Shorten "Babe Ruth" to "B Ruth"
name := names.GetString(row)
if strings.ContainsRune(name, ' ') {
parts := strings.Split(name, " ")
for i, part := range parts[0 : len(parts)-1] {
if len(part) > 2 {
// unless it's a very short name
parts[i] = part[0:1]
}
}
names.GetStrings()[row] = strings.Join(parts, " ")
}
})
idx.GetColumn("AB").Summary = dataframe.Sum
idx.GetColumn("H").Summary = dataframe.Sum
idx.GetColumn("K").Summary = dataframe.Sum
Expand Down
25 changes: 3 additions & 22 deletions pkg/game/game.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,15 +201,15 @@ func (g *Game) GetVisitorStates() []*State {

func (g *Game) generateStates() (errs error) {
var err error
g.visitorStates, err = g.runPlays(g.Visitor, g.Home, Top,
g.visitorStates, err = g.runEvents(g.Visitor, g.Home, Top,
g.File.VisitorEvents)
if err != nil {
errs = multierror.Append(errs, err)
}
if len(g.visitorStates) > 0 {
g.Final.Visitor = g.visitorStates[len(g.visitorStates)-1].Score
}
g.homeStates, err = g.runPlays(g.Home, g.Visitor, Bottom,
g.homeStates, err = g.runEvents(g.Home, g.Visitor, Bottom,
g.File.HomeEvents)
if err != nil {
errs = multierror.Append(errs, err)
Expand Down Expand Up @@ -246,7 +246,7 @@ func (g *Game) generateStates() (errs error) {
return
}

func (g *Game) runPlays(battingTeam, fieldingTeam *Team, half Half, events []*gamefile.Event) (states []*State, errs error) {
func (g *Game) runEvents(battingTeam, fieldingTeam *Team, half Half, events []*gamefile.Event) (states []*State, errs error) {
if events == nil {
return
}
Expand All @@ -271,18 +271,6 @@ func (g *Game) runPlays(battingTeam, fieldingTeam *Team, half Half, events []*ga
errs = multierror.Append(errs, err)
}
if state != nil {
for _, after := range event.Afters {
if after.CourtesyRunner != nil {
// assume courtesy runner is for batter
cr := m.battingTeam.parsePlayerID(*after.CourtesyRunner)
for i := range state.Runners {
if state.Runners[i] == state.Batter {
state.Runners[i] = cr
break
}
}
}
}
state.Comment = event.Comment
states = append(states, state)
lastState = state
Expand Down Expand Up @@ -322,13 +310,6 @@ func (g *Game) GetDate() time.Time {
return g.date
}

func (g *Game) GetUsAndThem(us string) (*Team, *Team) {
if g.Home.IsUs(us) {
return g.Visitor, g.Home
}
return g.Visitor, g.Home
}

func (g *Game) GetTournament() string {
if g.Tournament != "" {
return g.Tournament
Expand Down
Loading