Added number of bracelets by country + data update

TournamentStats.xcodeproj/project.pbxproj

@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		4DA5CA1E22AD078A00AC628E /* CountryCashes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DA5CA1D22AD078A00AC628E /* CountryCashes.swift */; };
+		4DA5CA1E22AD078A00AC628E /* CountryCounter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DA5CA1D22AD078A00AC628E /* CountryCounter.swift */; };
 		4DDEF11422AE4FB900F4D7C1 /* TournamentStats.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DDEF11322AE4FB900F4D7C1 /* TournamentStats.swift */; };
 		4DF7608422A3FB96004B0EF1 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DF7608322A3FB96004B0EF1 /* AppDelegate.swift */; };
 		4DF7608622A3FB96004B0EF1 /* MasterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DF7608522A3FB96004B0EF1 /* MasterViewController.swift */; };
@@ -46,7 +46,7 @@
 		4DF7611522A56797004B0EF1 /* event30 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760D922A56794004B0EF1 /* event30 */; };
 		4DF7611622A56797004B0EF1 /* event16 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760DA22A56794004B0EF1 /* event16 */; };
 		4DF7611722A56797004B0EF1 /* event8 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760DB22A56794004B0EF1 /* event8 */; };
-		4DF7611822A56797004B0EF1 /* event2 copie 5 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760DC22A56794004B0EF1 /* event2 copie 5 */; };
+		4DF7611822A56797004B0EF1 /* event48 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760DC22A56794004B0EF1 /* event48 */; };
 		4DF7611922A56797004B0EF1 /* event18 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760DD22A56794004B0EF1 /* event18 */; };
 		4DF7611A22A56797004B0EF1 /* event25 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760DE22A56794004B0EF1 /* event25 */; };
 		4DF7611B22A56797004B0EF1 /* event23 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760DF22A56794004B0EF1 /* event23 */; };
@@ -72,7 +72,7 @@
 		4DF7612F22A56797004B0EF1 /* event3 copie 8 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760F322A56795004B0EF1 /* event3 copie 8 */; };
 		4DF7613022A56797004B0EF1 /* event2 copie 10 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760F422A56795004B0EF1 /* event2 copie 10 */; };
 		4DF7613122A56797004B0EF1 /* event20 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760F522A56796004B0EF1 /* event20 */; };
-		4DF7613222A56797004B0EF1 /* event2 copie 4 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760F622A56796004B0EF1 /* event2 copie 4 */; };
+		4DF7613222A56797004B0EF1 /* event49 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760F622A56796004B0EF1 /* event49 */; };
 		4DF7613322A56797004B0EF1 /* event26 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760F722A56796004B0EF1 /* event26 */; };
 		4DF7613422A56797004B0EF1 /* event44 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760F822A56796004B0EF1 /* event44 */; };
 		4DF7613522A56797004B0EF1 /* event13 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF760F922A56796004B0EF1 /* event13 */; };
@@ -86,7 +86,7 @@
 		4DF7613D22A56797004B0EF1 /* event2 copie 12 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF7610122A56796004B0EF1 /* event2 copie 12 */; };
 		4DF7613E22A56797004B0EF1 /* event24 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF7610222A56797004B0EF1 /* event24 */; };
 		4DF7613F22A56797004B0EF1 /* event6 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF7610322A56797004B0EF1 /* event6 */; };
-		4DF7614022A56797004B0EF1 /* event2 copie 3 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF7610422A56797004B0EF1 /* event2 copie 3 */; };
+		4DF7614022A56797004B0EF1 /* event45 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF7610422A56797004B0EF1 /* event45 */; };
 		4DF7614122A56797004B0EF1 /* event2 copie 9 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF7610522A56797004B0EF1 /* event2 copie 9 */; };
 		4DF7614222A56797004B0EF1 /* event3 copie 5 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF7610622A56797004B0EF1 /* event3 copie 5 */; };
 		4DF7614322A56797004B0EF1 /* event37 in Resources */ = {isa = PBXBuildFile; fileRef = 4DF7610722A56797004B0EF1 /* event37 */; };
@@ -112,7 +112,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		4DA5CA1D22AD078A00AC628E /* CountryCashes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CountryCashes.swift; sourceTree = "<group>"; };
+		4DA5CA1D22AD078A00AC628E /* CountryCounter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CountryCounter.swift; sourceTree = "<group>"; };
 		4DDEF11322AE4FB900F4D7C1 /* TournamentStats.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TournamentStats.swift; sourceTree = "<group>"; };
 		4DF7608022A3FB96004B0EF1 /* TournamentStats.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TournamentStats.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		4DF7608322A3FB96004B0EF1 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -155,7 +155,7 @@
 		4DF760D922A56794004B0EF1 /* event30 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = event30; sourceTree = "<group>"; };
 		4DF760DA22A56794004B0EF1 /* event16 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = event16; sourceTree = "<group>"; };
 		4DF760DB22A56794004B0EF1 /* event8 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = event8; sourceTree = "<group>"; };
-		4DF760DC22A56794004B0EF1 /* event2 copie 5 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "event2 copie 5"; sourceTree = "<group>"; };
+		4DF760DC22A56794004B0EF1 /* event48 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = event48; sourceTree = "<group>"; };
 		4DF760DD22A56794004B0EF1 /* event18 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = event18; sourceTree = "<group>"; };
 		4DF760DE22A56794004B0EF1 /* event25 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = event25; sourceTree = "<group>"; };
 		4DF760DF22A56794004B0EF1 /* event23 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = event23; sourceTree = "<group>"; };
@@ -181,7 +181,7 @@
 		4DF760F322A56795004B0EF1 /* event3 copie 8 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "event3 copie 8"; sourceTree = "<group>"; };
 		4DF760F422A56795004B0EF1 /* event2 copie 10 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "event2 copie 10"; sourceTree = "<group>"; };
 		4DF760F522A56796004B0EF1 /* event20 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = event20; sourceTree = "<group>"; };
-		4DF760F622A56796004B0EF1 /* event2 copie 4 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "event2 copie 4"; sourceTree = "<group>"; };
+		4DF760F622A56796004B0EF1 /* event49 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = event49; sourceTree = "<group>"; };
 		4DF760F722A56796004B0EF1 /* event26 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = event26; sourceTree = "<group>"; };
 		4DF760F822A56796004B0EF1 /* event44 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = event44; sourceTree = "<group>"; };
 		4DF760F922A56796004B0EF1 /* event13 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = event13; sourceTree = "<group>"; };
@@ -195,7 +195,7 @@
 		4DF7610122A56796004B0EF1 /* event2 copie 12 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "event2 copie 12"; sourceTree = "<group>"; };
 		4DF7610222A56797004B0EF1 /* event24 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = event24; sourceTree = "<group>"; };
 		4DF7610322A56797004B0EF1 /* event6 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = event6; sourceTree = "<group>"; };
-		4DF7610422A56797004B0EF1 /* event2 copie 3 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "event2 copie 3"; sourceTree = "<group>"; };
+		4DF7610422A56797004B0EF1 /* event45 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = event45; sourceTree = "<group>"; };
 		4DF7610522A56797004B0EF1 /* event2 copie 9 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "event2 copie 9"; sourceTree = "<group>"; };
 		4DF7610622A56797004B0EF1 /* event3 copie 5 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "event3 copie 5"; sourceTree = "<group>"; };
 		4DF7610722A56797004B0EF1 /* event37 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = event37; sourceTree = "<group>"; };
@@ -310,10 +310,6 @@
 			children = (
 				4DF760C422A56451004B0EF1 /* event1 */,
 				4DF760B422A47F6D004B0EF1 /* event2 */,
-				4DF760F822A56796004B0EF1 /* event44 */,
-				4DF7610422A56797004B0EF1 /* event2 copie 3 */,
-				4DF760F622A56796004B0EF1 /* event2 copie 4 */,
-				4DF760DC22A56794004B0EF1 /* event2 copie 5 */,
 				4DF760E122A56794004B0EF1 /* event2 copie 6 */,
 				4DF760E222A56794004B0EF1 /* event2 copie 7 */,
 				4DF760D122A56793004B0EF1 /* event2 copie 8 */,
@@ -374,7 +370,11 @@
 				FFE9052A22BB7312006FEFA4 /* event41 */,
 				4DF760E922A56795004B0EF1 /* event42 */,
 				4DF760E822A56795004B0EF1 /* event43 */,
+				4DF760F822A56796004B0EF1 /* event44 */,
+				4DF7610422A56797004B0EF1 /* event45 */,
 				4DF760E522A56794004B0EF1 /* event46 */,
+				4DF760DC22A56794004B0EF1 /* event48 */,
+				4DF760F622A56796004B0EF1 /* event49 */,
 			);
 			path = Events;
 			sourceTree = "<group>";
@@ -414,7 +414,7 @@
 				4DF7614922A66675004B0EF1 /* TournamentWinner.swift */,
 				4DF7614E22A6CF93004B0EF1 /* PlayerResult.swift */,
 				4DF7615022A7AECA004B0EF1 /* TournamentRepresentable.swift */,
-				4DA5CA1D22AD078A00AC628E /* CountryCashes.swift */,
+				4DA5CA1D22AD078A00AC628E /* CountryCounter.swift */,
 				4DDEF11322AE4FB900F4D7C1 /* TournamentStats.swift */,
 			);
 			path = structures;
@@ -519,7 +519,7 @@
 				4DF7614222A56797004B0EF1 /* event3 copie 5 in Resources */,
 				4DF7613B22A56797004B0EF1 /* event11 in Resources */,
 				4DF7611B22A56797004B0EF1 /* event23 in Resources */,
-				4DF7613222A56797004B0EF1 /* event2 copie 4 in Resources */,
+				4DF7613222A56797004B0EF1 /* event49 in Resources */,
 				4DF7612F22A56797004B0EF1 /* event3 copie 8 in Resources */,
 				4DF7612A22A56797004B0EF1 /* event29 in Resources */,
 				4DF7612922A56797004B0EF1 /* event39 in Resources */,
@@ -544,7 +544,7 @@
 				4DF7612822A56797004B0EF1 /* event2 copie 11 in Resources */,
 				4DF7610D22A56797004B0EF1 /* event2 copie 8 in Resources */,
 				4DF7613822A56797004B0EF1 /* event3 copie 6 in Resources */,
-				4DF7614022A56797004B0EF1 /* event2 copie 3 in Resources */,
+				4DF7614022A56797004B0EF1 /* event45 in Resources */,
 				4DF7613522A56797004B0EF1 /* event13 in Resources */,
 				4DF7612D22A56797004B0EF1 /* event33 in Resources */,
 				4DF760CB22A56765004B0EF1 /* event4 in Resources */,
@@ -571,7 +571,7 @@
 				4DF7612122A56797004B0EF1 /* event46 in Resources */,
 				4DF7611E22A56797004B0EF1 /* event2 copie 7 in Resources */,
 				4DF760C522A56451004B0EF1 /* event1 in Resources */,
-				4DF7611822A56797004B0EF1 /* event2 copie 5 in Resources */,
+				4DF7611822A56797004B0EF1 /* event48 in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -625,7 +625,7 @@
 				4DF7614F22A6CF93004B0EF1 /* PlayerResult.swift in Sources */,
 				4DF7614622A59407004B0EF1 /* CumulatedResults.swift in Sources */,
 				4DF760BF22A560AA004B0EF1 /* FileWriter.swift in Sources */,
-				4DA5CA1E22AD078A00AC628E /* CountryCashes.swift in Sources */,
+				4DA5CA1E22AD078A00AC628E /* CountryCounter.swift in Sources */,
 				4DF760BC22A5270E004B0EF1 /* Queries.swift in Sources */,
 				4DF760BA22A524F4004B0EF1 /* Formatters.swift in Sources */,
 				4DF7614D22A6CC0D004B0EF1 /* NotablePlayers.swift in Sources */,

TournamentStats/Events/event2 copie 3

@@ -1,217 +0,0 @@
-1
-United StatesBrian Green
-$345,669
-1,084.8
-Decatur
-TX
-United States
-2
-United StatesAli Imsirovic
-$213,644
-542.4
-Vancouver
-WA
-United States
-3
-United StatesAsher Conniff
-$145,097
-488.2
-Brooklyn
-NY
-United States
-4
-United StatesLoren Klein
-$100,775
-433.9
-Verdi
-NV
-United States
-5
-United StatesPing Liu
-$71,614
-406.8
-Chicago
-IL
-United States
-6
-CanadaDaniel Negreanu
-$52,099
-379.7
-Toronto
-ON
-Canada
-7
-NetherlandsMartijn Gerrits
-$38,823
-325.4
--
--
-Netherlands
-8
-United StatesZach Clark
-$29,650
-298.3
-Las Vegas
-NV
-United States
-9
-United StatesCary Katz
-$23,224
-271.2
-Las Vegas
-NV
-United States
-10
-United StatesAnatoly Filatov
-$18,667
-217.0
-Blue Point
-NY
-United States
-11
-United StatesDarren Elias
-$18,667
-217.0
-Philadelphia
-PA
-United States
-12
-United StatesDaniel Zack
-$18,667
-217.0
-Princeton
-NJ
-United States
-13
-United StatesBen Lamb
-$15,408
-217.0
-Henderson
-NV
-United States
-14
-United StatesBen Yu
-$15,408
-217.0
-Las Vegas
-NV
-United States
-15
-FranceBenjamin Pollak
-$15,408
-108.5
-Paris
--
-France
-16
-United StatesNick Schulman
-$13,070
-108.5
-New York
-NY
-United States
-17
-GermanyManig Loeser
-$13,070
-108.5
-Bad Homburg
--
-Germany
-18
-United StatesCraig Varnell
-$13,070
-108.5
-Ft Collins
-CO
-United States
-19
-United StatesByron Kaverman
-$11,402
-108.5
-Fort Jennings
-OH
-United States
-20
-PortugalManuel Afonso Soares Ruivo
-$11,402
-108.5
-Coimbra
--
-Portugal
-21
-United StatesDavid Benyamine
-$11,402
-54.2
-Henderson
-NV
-United States
-22
-United StatesDan Shak
-$11,402
-54.2
-Las Vegas
-NV
-United States
-23
-ChinaYong Wang
-$11,402
-54.2
--
--
-China
-24
-United StatesArkadiy Tsinis
-$11,402
-54.2
-Miami
-FL
-United States
-25
-United StatesErik Seidel
-$11,402
-54.2
-Henderson
-NV
-United States
-26
-United KingdomToby Lewis
-$11,402
-54.2
-Southampton
--
-United Kingdom
-27
-United StatesMohsin Charania
-$11,402
-54.2
-Chicago
-IL
-United States
-28
-United StatesBen Palmer
-$10,238
-54.2
-Las Vegas
-NV
-United States
-29
-AustriaAndreas Eiler
-$10,238
-54.2
-Scharding
--
-Austria
-30
-United StatesThai Ha
-$10,238
-54.2
-Factoryville
-PA
-United States
-31
-United KingdomMatas Cimbolas
-$10,238
-54.2
-London
--
-United Kingdom

TournamentStats/Events/event2 copie 4

@@ -1,217 +0,0 @@
-1
-United StatesBrian Green
-$345,669
-1,084.8
-Decatur
-TX
-United States
-2
-United StatesAli Imsirovic
-$213,644
-542.4
-Vancouver
-WA
-United States
-3
-United StatesAsher Conniff
-$145,097
-488.2
-Brooklyn
-NY
-United States
-4
-United StatesLoren Klein
-$100,775
-433.9
-Verdi
-NV
-United States
-5
-United StatesPing Liu
-$71,614
-406.8
-Chicago
-IL
-United States
-6
-CanadaDaniel Negreanu
-$52,099
-379.7
-Toronto
-ON
-Canada
-7
-NetherlandsMartijn Gerrits
-$38,823
-325.4
--
--
-Netherlands
-8
-United StatesZach Clark
-$29,650
-298.3
-Las Vegas
-NV
-United States
-9
-United StatesCary Katz
-$23,224
-271.2
-Las Vegas
-NV
-United States
-10
-United StatesAnatoly Filatov
-$18,667
-217.0
-Blue Point
-NY
-United States
-11
-United StatesDarren Elias
-$18,667
-217.0
-Philadelphia
-PA
-United States
-12
-United StatesDaniel Zack
-$18,667
-217.0
-Princeton
-NJ
-United States
-13
-United StatesBen Lamb
-$15,408
-217.0
-Henderson
-NV
-United States
-14
-United StatesBen Yu
-$15,408
-217.0
-Las Vegas
-NV
-United States
-15
-FranceBenjamin Pollak
-$15,408
-108.5
-Paris
--
-France
-16
-United StatesNick Schulman
-$13,070
-108.5
-New York
-NY
-United States
-17
-GermanyManig Loeser
-$13,070
-108.5
-Bad Homburg
--
-Germany
-18
-United StatesCraig Varnell
-$13,070
-108.5
-Ft Collins
-CO
-United States
-19
-United StatesByron Kaverman
-$11,402
-108.5
-Fort Jennings
-OH
-United States
-20
-PortugalManuel Afonso Soares Ruivo
-$11,402
-108.5
-Coimbra
--
-Portugal
-21
-United StatesDavid Benyamine
-$11,402
-54.2
-Henderson
-NV
-United States
-22
-United StatesDan Shak
-$11,402
-54.2
-Las Vegas
-NV
-United States
-23
-ChinaYong Wang
-$11,402
-54.2
--
--
-China
-24
-United StatesArkadiy Tsinis
-$11,402
-54.2
-Miami
-FL
-United States
-25
-United StatesErik Seidel
-$11,402
-54.2
-Henderson
-NV
-United States
-26
-United KingdomToby Lewis
-$11,402
-54.2
-Southampton
--
-United Kingdom
-27
-United StatesMohsin Charania
-$11,402
-54.2
-Chicago
-IL
-United States
-28
-United StatesBen Palmer
-$10,238
-54.2
-Las Vegas
-NV
-United States
-29
-AustriaAndreas Eiler
-$10,238
-54.2
-Scharding
--
-Austria
-30
-United StatesThai Ha
-$10,238
-54.2
-Factoryville
-PA
-United States
-31
-United KingdomMatas Cimbolas
-$10,238
-54.2
-London
--
-United Kingdom

TournamentStats/Events/event2 copie 5

@@ -1,217 +0,0 @@
-1
-United StatesBrian Green
-$345,669
-1,084.8
-Decatur
-TX
-United States
-2
-United StatesAli Imsirovic
-$213,644
-542.4
-Vancouver
-WA
-United States
-3
-United StatesAsher Conniff
-$145,097
-488.2
-Brooklyn
-NY
-United States
-4
-United StatesLoren Klein
-$100,775
-433.9
-Verdi
-NV
-United States
-5
-United StatesPing Liu
-$71,614
-406.8
-Chicago
-IL
-United States
-6
-CanadaDaniel Negreanu
-$52,099
-379.7
-Toronto
-ON
-Canada
-7
-NetherlandsMartijn Gerrits
-$38,823
-325.4
--
--
-Netherlands
-8
-United StatesZach Clark
-$29,650
-298.3
-Las Vegas
-NV
-United States
-9
-United StatesCary Katz
-$23,224
-271.2
-Las Vegas
-NV
-United States
-10
-United StatesAnatoly Filatov
-$18,667
-217.0
-Blue Point
-NY
-United States
-11
-United StatesDarren Elias
-$18,667
-217.0
-Philadelphia
-PA
-United States
-12
-United StatesDaniel Zack
-$18,667
-217.0
-Princeton
-NJ
-United States
-13
-United StatesBen Lamb
-$15,408
-217.0
-Henderson
-NV
-United States
-14
-United StatesBen Yu
-$15,408
-217.0
-Las Vegas
-NV
-United States
-15
-FranceBenjamin Pollak
-$15,408
-108.5
-Paris
--
-France
-16
-United StatesNick Schulman
-$13,070
-108.5
-New York
-NY
-United States
-17
-GermanyManig Loeser
-$13,070
-108.5
-Bad Homburg
--
-Germany
-18
-United StatesCraig Varnell
-$13,070
-108.5
-Ft Collins
-CO
-United States
-19
-United StatesByron Kaverman
-$11,402
-108.5
-Fort Jennings
-OH
-United States
-20
-PortugalManuel Afonso Soares Ruivo
-$11,402
-108.5
-Coimbra
--
-Portugal
-21
-United StatesDavid Benyamine
-$11,402
-54.2
-Henderson
-NV
-United States
-22
-United StatesDan Shak
-$11,402
-54.2
-Las Vegas
-NV
-United States
-23
-ChinaYong Wang
-$11,402
-54.2
--
--
-China
-24
-United StatesArkadiy Tsinis
-$11,402
-54.2
-Miami
-FL
-United States
-25
-United StatesErik Seidel
-$11,402
-54.2
-Henderson
-NV
-United States
-26
-United KingdomToby Lewis
-$11,402
-54.2
-Southampton
--
-United Kingdom
-27
-United StatesMohsin Charania
-$11,402
-54.2
-Chicago
-IL
-United States
-28
-United StatesBen Palmer
-$10,238
-54.2
-Las Vegas
-NV
-United States
-29
-AustriaAndreas Eiler
-$10,238
-54.2
-Scharding
--
-Austria
-30
-United StatesThai Ha
-$10,238
-54.2
-Factoryville
-PA
-United States
-31
-United KingdomMatas Cimbolas
-$10,238
-54.2
-London
--
-United Kingdom

TournamentStats/Events/event45

@@ -0,0 +1,294 @@
+1
+United KingdomStephen Chidwick
+$1,618,417
+1,266.1
+Deal
+-
+United Kingdom
+2
+TaiwanJames Chen
+$1,000,253
+633.1
+Taichung
+-
+Taiwan
+3
+United StatesMatthew Gonzales
+$699,364
+569.7
+San Ramon
+CA
+United States
+4
+United StatesRobert Mizrachi
+$497,112
+506.4
+Miami
+FL
+United States
+5
+United StatesAlex Epstein
+$359,320
+474.8
+Oakland
+CA
+United States
+6
+United StatesErik Seidel
+$264,186
+443.1
+Henderson
+NV
+United States
+7
+United StatesWasim Korkis
+$197,637
+379.8
+Shelby Township
+MI
+United States
+8
+Hong KongKa Kwan Lau
+$150,483
+348.2
+-
+-
+Hong Kong
+9
+United StatesRyan Tosoc
+$116,656
+316.5
+Chicago
+IL
+United States
+10
+United StatesEsther Taylor-Brady
+$116,656
+253.2
+Portland
+OR
+United States
+11
+United StatesBen Tollerene
+$92,102
+253.2
+Fort Worth
+TX
+United States
+12
+BulgariaVeselin Karakitukov
+$92,102
+253.2
+Plodiv
+-
+Bulgaria
+13
+United StatesEvan Krentzman
+$74,083
+253.2
+Goleta
+CA
+United States
+14
+Hong KongYan Shing "Anson" Tsang
+$74,083
+253.2
+Island Harbourview
+-
+Hong Kong
+15
+United StatesPaul Volpe
+$60,732
+253.2
+West Chester
+PA
+United States
+16
+United StatesSean Winter
+$60,732
+253.2
+Jacksonville
+FL
+United States
+17
+United KingdomLautaro Guerra
+$50,759
+126.6
+Littleport
+-
+United Kingdom
+18
+United StatesMatt Giannetti
+$50,759
+126.6
+Henderson
+NV
+United States
+19
+United StatesGjergj Sinishtaj
+$50,759
+126.6
+Sterling Heights
+MI
+United States
+20
+United StatesFiras Sadou
+$50,759
+126.6
+Troy
+MI
+United States
+21
+United StatesMicah Smith
+$50,759
+126.6
+Jupiter
+FL
+United States
+22
+United StatesMatthew Schreiber
+$50,759
+126.6
+Laguna Niguel
+CA
+United States
+23
+United KingdomLudovic Geilich
+$50,759
+126.6
+Glasgow
+-
+United Kingdom
+24
+FinlandJoni Jouhkimainen
+$50,759
+126.6
+Helsinki
+-
+Finland
+25
+CanadaBenoit Galland
+$43,270
+126.6
+Laval
+QC
+Canada
+26
+SwedenNiklas Astedt
+$43,270
+126.6
+Goteborg
+-
+Sweden
+27
+HungaryLaszlo Bujtas
+$43,270
+63.3
+-
+-
+Hungary
+28
+United StatesDylan Weisman
+$43,270
+63.3
+Sherman Oaks
+CA
+United States
+29
+United StatesRyan Laplante
+$43,270
+63.3
+Brainerd
+MN
+United States
+30
+United StatesLion Boulos
+$43,270
+63.3
+Cypress
+TX
+United States
+31
+United StatesJustin Bonomo
+$43,270
+63.3
+Las Vegas
+NV
+United States
+32
+United StatesDan Smith
+$43,270
+63.3
+Las Vegas
+NV
+United States
+33
+United StatesMichael Heritsch
+$37,635
+63.3
+New Berlin
+WI
+United States
+34
+United StatesJason Beckman
+$37,635
+63.3
+Troy
+MI
+United States
+35
+United StatesEddie Ochana
+$37,635
+63.3
+Elgin
+IL
+United States
+36
+United StatesChase Steely
+$37,635
+63.3
+Williamsburg
+KY
+United States
+37
+United StatesMichael Drummond
+$37,635
+63.3
+Rye
+NH
+United States
+38
+United StatesJohn Riordan
+$37,635
+63.3
+Tampa
+FL
+United States
+39
+AustraliaJoe Hachem
+$37,635
+63.3
+Melbourne
+-
+Australia
+40
+ItalyDario Sammartino
+$37,635
+63.3
+Nova Gorica
+-
+Italy
+41
+BahamasSebastian Bastian
+$37,635
+63.3
+Nassau
+-
+Bahamas
+42
+United KingdomToby Lewis
+$37,635
+63.3
+Southampton
+-
+United Kingdom

TournamentStats/Events/event49

@@ -0,0 +1,105 @@
+1
+United KingdomLukas Schwartz
+$273,336
+446.5
+London
+-
+United Kingdom
+2
+United StatesGeorge Wolff
+$168,936
+446.5
+Portland
+OR
+United States
+3
+GermanyJohannes Becker
+$116,236
+446.5
+Koln
+-
+Germany
+4
+United StatesMark Gregorich
+$81,635
+396.9
+Las Vegas
+NV
+United States
+5
+ChinaYueqi Zhu
+$58,547
+372.1
+Benxi
+-
+China
+6
+United StatesCalvin Anderson
+$42,898
+347.3
+Las Vegas
+NV
+United States
+7
+United StatesMike Gorodinsky
+$32,127
+297.7
+St. Louis
+MO
+United States
+8
+United StatesBrian Hastings
+$32,127
+272.9
+Hanover Township
+PA
+United States
+9
+ColombiaDaniel Ospina
+$24,604
+248.1
+-
+-
+Colombia
+10
+United KingdomBenny Glaser
+$24,604
+198.5
+Southampton
+-
+United Kingdom
+11
+AustraliaTim Marsters
+$19,279
+198.5
+Brisbane
+-
+Australia
+12
+United StatesTommy Hang
+$19,279
+99.2
+Newcastle
+WA
+United States
+13
+United KingdomDimitri Holdeew
+$15,464
+49.6
+Brighton
+-
+United Kingdom
+14
+United StatesDavid "ODB" Baker
+$15,464
+49.6
+Sahuarita
+AZ
+United States
+15
+United KingdomJason Gray
+$15,464
+49.6
+-
+-
+United Kingdom

TournamentStats/NotablePlayers.swift

@@ -79,10 +79,12 @@ class NotablePlayers {
         "Felipe Ramos",
         "Mike Sexton",
         "Dzmitry Urbanovich",
-        //        "",
-        //        "",
-        //        "",
-        //        "",
+        "Ben Tollerene",
+        "Joe Hachem",
+        "Steven van Zadelhoff",
+        "Daniel Zack",
+        "Mike Gorodinsky",
+        
     ]
     
 }

TournamentStats/Seed.swift

@@ -64,12 +64,14 @@ class Seed {
         TD(date: "20/06/2019", name: "Pot-Limit Omaha", number: 40, buyin: 1500, entries: 1216, prizePool: 1641600),
         TD(date: "20/06/2019", name: "Seven Card Stud", number: 41, buyin: 10000, entries: 88, prizePool: 827200),
         TD(date: "21/06/2019", name: "Super Seniors No-Limit Hold'em", number: 39, buyin: 1000, entries: 2650, prizePool: 2385000),
-        TD(date: "22/06/2019", name: "WSOP.com ONLINE No-Limit Hold'em Turbo Deepstack", number: 46, buyin: 500, entries: 1181, prizePool: 795180),
+        TD(date: "20/06/2019", name: "WSOP.com ONLINE No-Limit Hold'em Turbo Deepstack", number: 46, buyin: 500, entries: 1181, prizePool: 795180),
         TD(date: "21/06/2019", name: "Mixed No-Limit Hold'em / Pot-Limit Omaha Deepstack 8-Handed", number: 42, buyin: 600, entries: 2403, prizePool: 1261575),
         TD(date: "21/06/2019", name: "Mixed Big Bet", number: 43, buyin: 2500, entries: 218, prizePool: 490500),
         TD(date: "22/06/2019", name: "No-Limit Hold'em Bounty", number: 44, buyin: 1500, entries: 1807, prizePool: 2439450),
+        TD(date: "23/06/2019", name: "Pot-Limit Omaha High Roller", number: 45, buyin: 25000, entries: 278, prizePool: 6602500),
+        TD(date: "23/06/2019", name: "No-Limit Hold'em", number: 48, buyin: 2500, entries: 996, prizePool: 2241000),
+        TD(date: "23/06/2019", name: "Limit 2-7 Lowball Triple Draw", number: 49, buyin: 10000, entries: 100, prizePool: 940000),
 
-        
     ]
     
     static func createTournaments() {
@@ -79,7 +81,6 @@ class Seed {
         try! realm.write {
             
             let wsopFestival: Festival = realm.getOrCreate(name: "WSOP")
-            print("tournamentsDescriptions count = \(tournamentsDescriptions.count)")
 
             for td in tournamentsDescriptions {
                 let event: Tournament = realm.create(Tournament.self)
@@ -89,14 +90,11 @@ class Seed {
                 event.buyin = td.buyin
                 event.entries = td.entries
                 event.prizepool = td.prizePool
-                print("event.number = \(event.number)")
 
                 wsopFestival.tournaments.append(event)
             }
             
         }
-        let tournaments = realm.objects(Tournament.self)
-        print("tournaments1 count = \(tournaments.count)")
 
     }
     

TournamentStats/realm/Model.swift

@@ -32,7 +32,7 @@ class Tournament : Object, Named {
     
     var rows: [Columns] {
         switch self.number {
-        case 1, 10, 32, 39, 46: return [.rank, .player, .earnings, .city, .state, .country]
+        case 1, 10, 32, 39: return [.rank, .player, .earnings, .city, .state, .country]
         default: return Tournament.defaultColumns
         }
     }

TournamentStats/report/Queries.swift

@@ -99,26 +99,50 @@ class Queries {
         return trs
     }
     
-    static func cashesByCountry(realm: Realm) -> [CountryCashes] {
+    static func cashesByCountry(realm: Realm) -> [CountryCounter] {
         let playerDistinctCountries = realm.objects(Player.self).distinct(by: ["country"])
-        var countryCashes: [CountryCashes] = []
+        var countryCashes: [CountryCounter] = []
         
         for player in playerDistinctCountries {
             let country = player.country
             let resultsByCountry = realm.objects(Result.self).filter("player.country == %@", country)
             
-            let cc = CountryCashes(country: country, cashes: resultsByCountry.count)
+            let cc = CountryCounter(country: country, counter: resultsByCountry.count)
             countryCashes.append(cc)
             
         }
         
         countryCashes.sort { (cc1, cc2) -> Bool in
-            return cc1.cashes > cc2.cashes
+            return cc1.counter > cc2.counter
         }
         
         return countryCashes
     }
     
+    static func winsByCountry(realm: Realm) -> [CountryCounter] {
+        
+        let winners: Results<Result> = realm.objects(Result.self).filter("rank == 1")
+        var countryWins: [String : CountryCounter] = [:]
+        for winner in winners {
+            
+            if let country = winner.player?.country {
+                if var cc = countryWins[country] {
+                    cc.increment()
+                } else {
+                    countryWins[country] = CountryCounter(country: country, counter: 1)
+                }
+            }
+        }
+        
+        var sortedCountries = countryWins.values.map { $0 }
+        
+        sortedCountries.sort { (cc1, cc2) -> Bool in
+            return cc1.counter > cc2.counter
+        }
+        
+        return sortedCountries
+    }
+    
     static func averageEvent(realm: Realm) -> [TournamentStats] {
         
         let tournaments: Results<Tournament> = realm.objects(Tournament.self)

TournamentStats/report/ReportGenerator.swift

@@ -78,6 +78,7 @@ class ReportGenerator {
         tourniesByPrizepool.writeHTML(fileName: "reports/tourniesByPrizepool.html", limit: nil)
         tourniesByPrizepool.writeHTML(fileName: "reports/tourniesByPrizepool_top5.html", limit: 5)
 
+        Queries.winsByCountry(realm: realm).writeHTML(fileName: "reports/countryWins.html")
         Queries.cashesByCountry(realm: realm).writeHTML(fileName: "reports/countryCashes.html")
         Queries.averageEvent(realm: realm).writeHTML(fileName: "reports/averageEvent.html")
         Queries.mostCashes(realm: realm, notable: true).writeHTML(fileName: "reports/notablesMostCashes.html", limit: nil)

TournamentStats/report/structures/CountryCounter.swift

@@ -8,10 +8,19 @@
 
 import Foundation
 
-struct CountryCashes : HTMLRepresentable {
+class CountryCounter : HTMLRepresentable {
     
     var country: String
-    var cashes: Int
+    var counter: Int
+
+    init(country: String, counter: Int) {
+        self.country = country
+        self.counter = counter
+    }
+    
+    func increment() {
+        self.counter += 1
+    }
     
     static func htmlHeaders() -> String {
         var strings: [String] = []
@@ -32,7 +41,7 @@ struct CountryCashes : HTMLRepresentable {
         
         var strings: [String] = []
         strings.append(formattedCountry)
-        strings.append("\(cashes)")
+        strings.append("\(counter)")
         let all = strings.joined(separator: "</td><td>")
         return "<tr><td>\(all)</td></tr>"
     }

TournamentStats/report/structures/TournamentWinner.swift

@@ -16,10 +16,10 @@ struct TournamentWinner : HTMLRepresentable {
     static func htmlHeaders() -> String {
         var header = ""
         header.append("<td width=\"50\">#</td>")
-        header.append("<td width=\"90\">Buy-in</td>")
+        header.append("<td width=\"100\">Buy-in</td>")
         header.append("<td>Event</td>")
         header.append("<td>Player</td>")
-        header.append("<td width=\"120\">Prize</td>")
+        header.append("<td width=\"130\">Prize</td>")
         return "<tr class=\"table-header\">\(header)</tr>"
     }