diff --git a/TournamentStats/Seed.swift b/TournamentStats/Seed.swift index 298e7f5..90eca0f 100644 --- a/TournamentStats/Seed.swift +++ b/TournamentStats/Seed.swift @@ -48,38 +48,38 @@ class Seed { TD(date: "30/05/2019", name: "Super Turbo Bounty", number: 2, buyin: 10000, entries: 204, prizePool: 1917600), TD(date: "08/06/2019", name: "BIG 50 No-Limit Hold'em", number: 3, buyin: 500, entries: 28371, prizePool: 13509435), TD(date: "02/06/2019", name: "Omaha Hi/Lo 8 or Better", number: 4, buyin: 1500, entries: 853, prizePool: 1151550), - TD(date: "03/06/2019", name: "High Roller No-Limit Hold'em for the 50th Annual", number: 5, buyin: 50000, entries: 110, prizePool: 5280000), - TD(date: "03/06/2019", name: "Limit Mixed Triple Draw", number: 6, buyin: 2500, entries: 296, prizePool: 666000), + TD(date: "03/06/2019", name: "High Roller No-Limit Hold'em for the 50th Annual", number: 5, buyin: 50000, entries: 110, prizePool: 5280000, tableSize: 8), + TD(date: "03/06/2019", name: "Limit Mixed Triple Draw", number: 6, buyin: 2500, entries: 296, prizePool: 666000, tableSize: 6), TD(date: "03/06/2019", name: "WSOP.com ONLINE No-Limit Hold'em", number: 7, buyin: 400, entries: 2825, prizePool: 1017000), - TD(date: "05/06/2019", name: "Short Deck No-Limit Hold'em", number: 8, buyin: 10000, entries: 114, prizePool: 1071600), + TD(date: "05/06/2019", name: "Short Deck No-Limit Hold'em", number: 8, buyin: 10000, entries: 114, prizePool: 1071600, tableSize: 6), TD(date: "06/06/2019", name: "No-Limit Hold'em Deepstack", number: 9, buyin: 600, entries: 6150, prizePool: 3229275), - TD(date: "06/06/2019", name: "Dealers Choice", number: 10, buyin: 150, entries: 470, prizePool: 634500), + TD(date: "06/06/2019", name: "Dealers Choice", number: 10, buyin: 150, entries: 470, prizePool: 634500, tableSize: 6), TD(date: "07/06/2019", name: "No-Limit Hold'em", number: 11, buyin: 5000, entries: 400, prizePool: 1860000), TD(date: "06/06/2019", name: "No-Limit Hold'em Super Turbo Bounty", number: 12, buyin: 1000, entries: 2452, prizePool: 1471200), - TD(date: "07/06/2019", name: "No-Limit 2-7 Lowball Draw", number: 13, buyin: 1500, entries: 296, prizePool: 399600), - TD(date: "09/06/2019", name: "HORSE", number: 14, buyin: 1500, entries: 751, prizePool: 1013850), + TD(date: "07/06/2019", name: "No-Limit 2-7 Lowball Draw", number: 13, buyin: 1500, entries: 296, prizePool: 399600, tableSize: 7), + TD(date: "09/06/2019", name: "HORSE", number: 14, buyin: 1500, entries: 751, prizePool: 1013850, tableSize: 8), TD(date: "09/06/2019", name: "Heads-Up No-Limit Hold'em", number: 15, buyin: 10000, entries: 112, prizePool: 1052800), TD(date: "09/06/2019", name: "No-Limit Hold'em 6-Handed", number: 16, buyin: 1500, entries: 1832, prizePool: 2473200), - TD(date: "09/06/2019", name: "No-Limit Hold'em Shootout", number: 17, buyin: 1500, entries: 917, prizePool: 1237950), + TD(date: "09/06/2019", name: "No-Limit Hold'em Shootout", number: 17, buyin: 1500, entries: 917, prizePool: 1237950, tableSize: 10), TD(date: "10/06/2019", name: "Omaha Hi-Lo 8 or Better", number: 18, buyin: 10000, entries: 183, prizePool: 1720200), TD(date: "13/06/2019", name: "Millionaire Maker - No-Limit Hold'em", number: 19, buyin: 1500, entries: 8809, prizePool: 11892150), - TD(date: "11/06/2019", name: "Seven-Card Stud", number: 20, buyin: 1500, entries: 285, prizePool: 384750), - TD(date: "12/06/2019", name: "No-Limit 2-7 Lowball Draw", number: 21, buyin: 10000, entries: 91, prizePool: 855400), + TD(date: "11/06/2019", name: "Seven-Card Stud", number: 20, buyin: 1500, entries: 285, prizePool: 384750, tableSize: 8), + TD(date: "12/06/2019", name: "No-Limit 2-7 Lowball Draw", number: 21, buyin: 10000, entries: 91, prizePool: 855400, tableSize: 7), TD(date: "12/06/2019", name: "Double Stack No-Limit Hold'em", number: 22, buyin: 1000, entries: 3253, prizePool: 2927700), - TD(date: "13/06/2019", name: "Eight Game Mix", number: 23, buyin: 1500, entries: 612, prizePool: 826200), + TD(date: "13/06/2019", name: "Eight Game Mix", number: 23, buyin: 1500, entries: 612, prizePool: 826200, tableSize: 6), TD(date: "11/06/2019", name: "WSOP.com ONLINE Pot-Limit Omaha 6-Handed", number: 24, buyin: 600, entries: 1216, prizePool: 656640), TD(date: "13/06/2019", name: "Pot-Limit Omaha Deepstack", number: 25, buyin: 600, entries: 2577, prizePool: 1352925), TD(date: "16/06/2019", name: "No-Limit Hold'em Marathon", number: 26, buyin: 2620, entries: 1083, prizePool: 2553714), - TD(date: "14/06/2019", name: "Seven-Card Stud Hi/Lo 8 or Better", number: 27, buyin: 1500, entries: 460, prizePool: 621000), + TD(date: "14/06/2019", name: "Seven-Card Stud Hi/Lo 8 or Better", number: 27, buyin: 1500, entries: 460, prizePool: 621000, tableSize: 8), TD(date: "14/06/2019", name: "No-Limit Hold'em", number: 28, buyin: 1000, entries: 2477, prizePool: 2229300), - TD(date: "15/06/2019", name: "HORSE", number: 29, buyin: 10000, entries: 172, prizePool: 1616800), + TD(date: "15/06/2019", name: "HORSE", number: 29, buyin: 10000, entries: 172, prizePool: 1616800, tableSize: 8), TD(date: "16/06/2019", name: "Pot-Limit Omaha", number: 30, buyin: 1000, entries: 1526, prizePool: 1374300), TD(date: "15/06/2019", name: "No-Limit Hold'em 6-Handed", number: 31, buyin: 3000, entries: 754, prizePool: 2035800), TD(date: "17/06/2019", name: "Seniors No-Limit Hold'em", number: 32, buyin: 1000, entries: 5916 , prizePool: 5324400), - TD(date: "16/06/2019", name: "Limit 2-7 Lowball Triple Draw", number: 33, buyin: 1500, entries: 467, prizePool: 630450), + TD(date: "16/06/2019", name: "Limit 2-7 Lowball Triple Draw", number: 33, buyin: 1500, entries: 467, prizePool: 630450, tableSize: 6), TD(date: "17/06/2019", name: "WSOP.com ONLINE No-Limit Hold'em Knockout Bounty", number: 38, buyin: 600, entries: 1224, prizePool: 550800), - TD(date: "18/06/2019", name: "Dealers Choice 6-Handed", number: 35, buyin: 10000, entries: 122, prizePool: 1146800), - TD(date: "18/06/2019", name: "No-Limit Hold'em Shootout", number: 36, buyin: 3000, entries: 313, prizePool: 845100), + TD(date: "18/06/2019", name: "Dealers Choice 6-Handed", number: 35, buyin: 10000, entries: 122, prizePool: 1146800, tableSize: 6), + TD(date: "18/06/2019", name: "No-Limit Hold'em Shootout", number: 36, buyin: 3000, entries: 313, prizePool: 845100, tableSize: 10), TD(date: "19/06/2019", name: "No-Limit Hold'em Deepstack", number: 37, buyin: 800, entries: 2808, prizePool: 1999296), TD(date: "20/06/2019", name: "Double Stack No-Limit Hold'em", number: 34, buyin: 1000, entries: 6241, prizePool: 5592600), TD(date: "20/06/2019", name: "Pot-Limit Omaha", number: 40, buyin: 1500, entries: 1216, prizePool: 1641600), diff --git a/TournamentStats/UI/reports/InfographyView.swift b/TournamentStats/UI/reports/InfographyView.swift index 9db2d01..d65e1b5 100644 --- a/TournamentStats/UI/reports/InfographyView.swift +++ b/TournamentStats/UI/reports/InfographyView.swift @@ -87,7 +87,7 @@ class InfographyView: UIView { return } - self.infographyTitle.text = "2019 WSOP" + self.infographyTitle.text = "2019 World Series of Poker" self.infographyTitle.textColor = UIColor.white self.infographyTitle.font = Fonts.mainTitle @@ -156,7 +156,7 @@ class InfographyView: UIView { self.collectionView51.dataSource = ds self.collectionView51.delegate = ds - self.labelTableSize.text = "Table Size Distribution" + self.labelTableSize.text = "No-Limit Hold'em table sizes" let tableSizeDistributionPie = PieChart(frame: pieChartFrame) tableSizeDistributionPie.data = generator.tableSizeDistribution.pieChartData self.containerTableSize.addSubview(tableSizeDistributionPie) diff --git a/TournamentStats/report/Queries.swift b/TournamentStats/report/Queries.swift index 6396678..94ccae4 100644 --- a/TournamentStats/report/Queries.swift +++ b/TournamentStats/report/Queries.swift @@ -299,12 +299,12 @@ class Queries { static func tableSizeDistribution(realm: Realm) -> [DistributionCounter] { - let tournaments: Results = realm.objects(Tournament.self).distinct(by: ["tableSize"]) + let tournaments: Results = realm.objects(Tournament.self).filter("name CONTAINS %@", "No-Limit Hold'em").distinct(by: ["tableSize"]) var slices: [DistributionCounter] = [] var othersCount: Int = 0 for tournament in tournaments { - let tableSizeCount = realm.objects(Tournament.self).filter("tableSize == %i", tournament.tableSize).count - if (tableSizeCount < 5) { + let tableSizeCount = realm.objects(Tournament.self).filter("name CONTAINS %@", "No-Limit Hold'em").filter("tableSize == %i", tournament.tableSize).count + if (tableSizeCount < 6) { othersCount += tableSizeCount } else { let counter = DistributionCounter(name: TableSize.format(tableSize: tournament.tableSize), counter: tableSizeCount)