From f2c15eb36b05045d8ee1bd8675ecedc4b500814d Mon Sep 17 00:00:00 2001 From: JavierOramas Date: Sun, 20 Nov 2022 09:16:20 -0500 Subject: [PATCH] final data --- group_B3.csv => arg-mor.csv | 2 +- group_B1.csv => arg-spa.csv | 2 +- group_B2.csv => fra-ger.csv | 2 +- game5.py | 4 +-- game6.py | 4 +-- germny-morrocco.csv | 2 +- group_B5.csv | 2 -- group_B6.csv | 2 -- group_C1.csv | 2 -- group_C2.csv | 2 -- group_C3.csv | 2 -- group_C4.csv | 2 -- group_C5.csv | 2 -- group_C6.csv | 2 -- group_D1.csv | 2 -- group_D2.csv | 2 -- group_D3.csv | 2 -- group_E1.csv | 2 -- group_E2.csv | 2 -- group_E3.csv | 2 -- group_E4.csv | 2 -- group_E5.csv | 2 -- group_E6.csv | 2 -- results/group_A.csv | 7 ----- results/group_B.csv | 7 ----- results/group_D.csv | 7 ----- results/group_F.csv | 7 ----- results/gupos/group_A.csv | 7 ----- results/gupos/group_B.csv | 7 ----- results/gupos/group_C.csv | 7 ----- results/gupos/group_D.csv | 7 ----- results/gupos/group_F.csv | 7 ----- results/gupos/group_G.csv | 7 ----- results/gupos/group_H.csv | 7 ----- results/quarter/?/alemania-br.csv | 2 -- results/quarter/?/bel-cameroon.csv | 2 -- results/quarter/?/morooco-br.csv | 2 -- results/quarter/?/spa-cameroon.csv | 2 -- results/quarter/q3.csv | 2 -- results/semi/semi.csv | 3 ++- spain-belgium.csv | 2 +- france-argentina.csv => temp/group_H2.csv | 2 +- temp/group_H3.csv | 2 ++ group_B4.csv => temp/group_H4.csv | 2 +- temp/group_H5.csv | 2 ++ temp/group_H6.csv | 2 ++ textual_results.txt | 32 +++++++++++------------ usa-argen.csv | 2 -- usa-england.csv | 2 -- 49 files changed, 35 insertions(+), 153 deletions(-) rename group_B3.csv => arg-mor.csv (50%) rename group_B1.csv => arg-spa.csv (52%) rename group_B2.csv => fra-ger.csv (52%) delete mode 100644 group_B5.csv delete mode 100644 group_B6.csv delete mode 100644 group_C1.csv delete mode 100644 group_C2.csv delete mode 100644 group_C3.csv delete mode 100644 group_C4.csv delete mode 100644 group_C5.csv delete mode 100644 group_C6.csv delete mode 100644 group_D1.csv delete mode 100644 group_D2.csv delete mode 100644 group_D3.csv delete mode 100644 group_E1.csv delete mode 100644 group_E2.csv delete mode 100644 group_E3.csv delete mode 100644 group_E4.csv delete mode 100644 group_E5.csv delete mode 100644 group_E6.csv delete mode 100644 results/group_A.csv delete mode 100644 results/group_B.csv delete mode 100644 results/group_D.csv delete mode 100644 results/group_F.csv delete mode 100644 results/gupos/group_A.csv delete mode 100644 results/gupos/group_B.csv delete mode 100644 results/gupos/group_C.csv delete mode 100644 results/gupos/group_D.csv delete mode 100644 results/gupos/group_F.csv delete mode 100644 results/gupos/group_G.csv delete mode 100644 results/gupos/group_H.csv delete mode 100644 results/quarter/?/alemania-br.csv delete mode 100644 results/quarter/?/bel-cameroon.csv delete mode 100644 results/quarter/?/morooco-br.csv delete mode 100644 results/quarter/?/spa-cameroon.csv delete mode 100644 results/quarter/q3.csv rename france-argentina.csv => temp/group_H2.csv (51%) create mode 100644 temp/group_H3.csv rename group_B4.csv => temp/group_H4.csv (54%) create mode 100644 temp/group_H5.csv create mode 100644 temp/group_H6.csv delete mode 100644 usa-argen.csv delete mode 100644 usa-england.csv diff --git a/group_B3.csv b/arg-mor.csv similarity index 50% rename from group_B3.csv rename to arg-mor.csv index ff20cff..33fa887 100644 --- a/group_B3.csv +++ b/arg-mor.csv @@ -1,2 +1,2 @@ ,Team1,Team2,Wins1,Wins2 -0,wales,england,1,28 +0,morocco,argentina,3,25 diff --git a/group_B1.csv b/arg-spa.csv similarity index 52% rename from group_B1.csv rename to arg-spa.csv index 6ad3d4b..97ac06f 100644 --- a/group_B1.csv +++ b/arg-spa.csv @@ -1,2 +1,2 @@ ,Team1,Team2,Wins1,Wins2 -0,iran,england,11,18 +0,spain,argentina,4,26 diff --git a/group_B2.csv b/fra-ger.csv similarity index 52% rename from group_B2.csv rename to fra-ger.csv index 52072b3..2490180 100644 --- a/group_B2.csv +++ b/fra-ger.csv @@ -1,2 +1,2 @@ ,Team1,Team2,Wins1,Wins2 -0,usa,england,10,18 +0,germany,france,13,15 diff --git a/game5.py b/game5.py index 62a9f2e..7342096 100644 --- a/game5.py +++ b/game5.py @@ -48,7 +48,7 @@ def function_x(): df.to_csv(f'{group_name}.csv') -group_C = [('saudi-arabia', 'poland')] +group_C = [('brazil', 'belgium')] -run_group_matches(group_C, 'group_C5', field) \ No newline at end of file +run_group_matches(group_C, 'bra-bel', field) \ No newline at end of file diff --git a/game6.py b/game6.py index f7edeec..e8f9441 100644 --- a/game6.py +++ b/game6.py @@ -48,7 +48,7 @@ def function_x(): df.to_csv(f'{group_name}.csv') -group_C = [('mexico', 'poland')] +group_C = [('france', 'argentina')] -run_group_matches(group_C, 'group_C6', field) \ No newline at end of file +run_group_matches(group_C, 'bra-arg', field) \ No newline at end of file diff --git a/germny-morrocco.csv b/germny-morrocco.csv index 9a2780a..87c688f 100644 --- a/germny-morrocco.csv +++ b/germny-morrocco.csv @@ -1,2 +1,2 @@ ,Team1,Team2,Wins1,Wins2 -0,morocco,germany,10,16 +0, \ No newline at end of file diff --git a/group_B5.csv b/group_B5.csv deleted file mode 100644 index 71655fe..0000000 --- a/group_B5.csv +++ /dev/null @@ -1,2 +0,0 @@ -,Team1,Team2,Wins1,Wins2 -0,wales,iran,3,25 diff --git a/group_B6.csv b/group_B6.csv deleted file mode 100644 index 41aec16..0000000 --- a/group_B6.csv +++ /dev/null @@ -1,2 +0,0 @@ -,Team1,Team2,Wins1,Wins2 -0,wales,usa,3,23 diff --git a/group_C1.csv b/group_C1.csv deleted file mode 100644 index 75ac5c5..0000000 --- a/group_C1.csv +++ /dev/null @@ -1,2 +0,0 @@ -,Team1,Team2,Wins1,Wins2 -0,saudi-arabia,argentina,2,28 diff --git a/group_C2.csv b/group_C2.csv deleted file mode 100644 index 9592da8..0000000 --- a/group_C2.csv +++ /dev/null @@ -1,2 +0,0 @@ -,Team1,Team2,Wins1,Wins2 -0,mexico,argentina,2,26 diff --git a/group_C3.csv b/group_C3.csv deleted file mode 100644 index 9b878e2..0000000 --- a/group_C3.csv +++ /dev/null @@ -1,2 +0,0 @@ -,Team1,Team2,Wins1,Wins2 -0,poland,argentina,8,20 diff --git a/group_C4.csv b/group_C4.csv deleted file mode 100644 index 89a9a60..0000000 --- a/group_C4.csv +++ /dev/null @@ -1,2 +0,0 @@ -,Team1,Team2,Wins1,Wins2 -0,mexico,saudi-arabia,9,17 diff --git a/group_C5.csv b/group_C5.csv deleted file mode 100644 index a51366e..0000000 --- a/group_C5.csv +++ /dev/null @@ -1,2 +0,0 @@ -,Team1,Team2,Wins1,Wins2 -0,poland,saudi-arabia,21,7 diff --git a/group_C6.csv b/group_C6.csv deleted file mode 100644 index a13fd6d..0000000 --- a/group_C6.csv +++ /dev/null @@ -1,2 +0,0 @@ -,Team1,Team2,Wins1,Wins2 -0,poland,mexico,23,4 diff --git a/group_D1.csv b/group_D1.csv deleted file mode 100644 index dfc4d8a..0000000 --- a/group_D1.csv +++ /dev/null @@ -1,2 +0,0 @@ -,Team1,Team2,Wins1,Wins2 -0,australia,france,7,22 diff --git a/group_D2.csv b/group_D2.csv deleted file mode 100644 index 3182a99..0000000 --- a/group_D2.csv +++ /dev/null @@ -1,2 +0,0 @@ -,Team1,Team2,Wins1,Wins2 -0,denmark,france,3,26 diff --git a/group_D3.csv b/group_D3.csv deleted file mode 100644 index 0fc8956..0000000 --- a/group_D3.csv +++ /dev/null @@ -1,2 +0,0 @@ -,Team1,Team2,Wins1,Wins2 -0,tunisia,france,0,29 diff --git a/group_E1.csv b/group_E1.csv deleted file mode 100644 index 67a5636..0000000 --- a/group_E1.csv +++ /dev/null @@ -1,2 +0,0 @@ -,Team1,Team2,Wins1,Wins2 -0,costa-rica,spain,4,24 diff --git a/group_E2.csv b/group_E2.csv deleted file mode 100644 index b3030f8..0000000 --- a/group_E2.csv +++ /dev/null @@ -1,2 +0,0 @@ -,Team1,Team2,Wins1,Wins2 -0,germany,spain,17,8 diff --git a/group_E3.csv b/group_E3.csv deleted file mode 100644 index 62d2bfc..0000000 --- a/group_E3.csv +++ /dev/null @@ -1,2 +0,0 @@ -,Team1,Team2,Wins1,Wins2 -0,japan,spain,7,18 diff --git a/group_E4.csv b/group_E4.csv deleted file mode 100644 index 5f6ff4d..0000000 --- a/group_E4.csv +++ /dev/null @@ -1,2 +0,0 @@ -,Team1,Team2,Wins1,Wins2 -0,germany,costa-rica,26,3 diff --git a/group_E5.csv b/group_E5.csv deleted file mode 100644 index bd665b0..0000000 --- a/group_E5.csv +++ /dev/null @@ -1,2 +0,0 @@ -,Team1,Team2,Wins1,Wins2 -0,japan,costa-rica,18,10 diff --git a/group_E6.csv b/group_E6.csv deleted file mode 100644 index 447cf5a..0000000 --- a/group_E6.csv +++ /dev/null @@ -1,2 +0,0 @@ -,Team1,Team2,Wins1,Wins2 -0,japan,germany,6,20 diff --git a/results/group_A.csv b/results/group_A.csv deleted file mode 100644 index 3068e67..0000000 --- a/results/group_A.csv +++ /dev/null @@ -1,7 +0,0 @@ -Team1,Team2,Wins1,Wins2 -ecuador,qatar,22,3 -senegal,qatar,27,0 -netherlands,qatar,25,4 -senegal,ecuador,17,12 -netherlands,ecuador,10,17 -netherlands,senegal,4,20 diff --git a/results/group_B.csv b/results/group_B.csv deleted file mode 100644 index 03b54ac..0000000 --- a/results/group_B.csv +++ /dev/null @@ -1,7 +0,0 @@ -Team1,Team2,Wins1,Wins2 -wales,england,1,28 -iran,england,11,18 -usa,england,10,18 -usa,iran,18,12 -wales,iran,3,25 -wales,usa,3,23 diff --git a/results/group_D.csv b/results/group_D.csv deleted file mode 100644 index c7e2e32..0000000 --- a/results/group_D.csv +++ /dev/null @@ -1,7 +0,0 @@ -Team1,Team2,Wins1,Wins2 -australia,france,7,22 -denmark,france,3,26 -tunisia,france,0,29 -denmark,australia,2,27 -tunisia,australia,4,26 -tunisia,denmark,11,16 diff --git a/results/group_F.csv b/results/group_F.csv deleted file mode 100644 index 16abf6d..0000000 --- a/results/group_F.csv +++ /dev/null @@ -1,7 +0,0 @@ -Team1,Team2,Wins1,Wins2 -canada,belgium,5,24 -morocco,belgium,9,16 -morocco,canada,20,5 -croatia,belgium,0,29 -croatia,canada,17,11 -croatia,morocco,6,20 diff --git a/results/gupos/group_A.csv b/results/gupos/group_A.csv deleted file mode 100644 index d6b206f..0000000 --- a/results/gupos/group_A.csv +++ /dev/null @@ -1,7 +0,0 @@ -Team1,Team2,Wins1,Wins2,T1 %,T2 % -ecuador,qatar,22,3,"0,88","0,12" -senegal,qatar,27,0,1,0 -netherlands,qatar,25,4,"0,86","0,14" -senegal,ecuador,17,12,"0,59","0,41" -netherlands,ecuador,10,17,"0,37","0,63" -netherlands,senegal,4,20,"0,17","0,83" diff --git a/results/gupos/group_B.csv b/results/gupos/group_B.csv deleted file mode 100644 index a618713..0000000 --- a/results/gupos/group_B.csv +++ /dev/null @@ -1,7 +0,0 @@ -Team1,Team2,Wins1,Wins2,T1 %,T2 % -wales,england,1,28,"0,03","0,97" -iran,england,11,18,"0,38","0,62" -usa,england,10,18,"0,36","0,64" -usa,iran,18,12,"0,6","0,4" -wales,iran,3,25,"0,11","0,89" -wales,usa,3,23,"0,12","0,88" diff --git a/results/gupos/group_C.csv b/results/gupos/group_C.csv deleted file mode 100644 index 03370ef..0000000 --- a/results/gupos/group_C.csv +++ /dev/null @@ -1,7 +0,0 @@ -Team1,Team2,Wins1,Wins2,T1 %,T2 % -saudi-arabia,argentina,2,28,"0,07","0,93" -poland,argentina,8,20,"0,29","0,71" -mexico,argentina,2,26,"0,07","0,93" -mexico,saudi-arabia,9,17,"0,35","0,65" -poland,saudi-arabia,21,7,"0,75","0,25" -poland,mexico,23,4,"0,85","0,15" diff --git a/results/gupos/group_D.csv b/results/gupos/group_D.csv deleted file mode 100644 index 9c1effa..0000000 --- a/results/gupos/group_D.csv +++ /dev/null @@ -1,7 +0,0 @@ -Team1,Team2,Wins1,Wins2,T1 %,T2 % -australia,france,7,22,"0,24","0,76" -denmark,france,3,26,"0,10","0,90" -tunisia,france,0,29,0,1 -denmark,australia,2,27,"0,07","0,93" -tunisia,australia,4,26,"0,13","0,87" -tunisia,denmark,11,16,"0,41","0,59" diff --git a/results/gupos/group_F.csv b/results/gupos/group_F.csv deleted file mode 100644 index f9f583c..0000000 --- a/results/gupos/group_F.csv +++ /dev/null @@ -1,7 +0,0 @@ -Team1,Team2,Wins1,Wins2,T1 %,T2 % -canada,belgium,5,24,"0,17","0,83" -morocco,belgium,9,16,"0,36","0,64" -morocco,canada,20,5,"0,8","0,2" -croatia,belgium,0,29,0,1 -croatia,canada,17,11,"0,61","0,39" -croatia,morocco,6,20,"0,23","0,77" diff --git a/results/gupos/group_G.csv b/results/gupos/group_G.csv deleted file mode 100644 index c748aa2..0000000 --- a/results/gupos/group_G.csv +++ /dev/null @@ -1,7 +0,0 @@ -Team1,Team2,Wins1,Wins2,T1 %,T2 % -serbia,brazil,4,23,"0,15","0,85" -switzerland,brazil,4,24,"0,142857142857143","0,857142857142857" -cameroon,brazil,7,20,"0,26","0,74" -switzerland,serbia,20,7,"0,74","0,26" -cameroon,serbia,20,6,"0,77","0,23" -cameroon,switzerland,19,7,"0,73","0,27" diff --git a/results/gupos/group_H.csv b/results/gupos/group_H.csv deleted file mode 100644 index ed82b64..0000000 --- a/results/gupos/group_H.csv +++ /dev/null @@ -1,7 +0,0 @@ -Team1,Team2,Wins1,Wins2,T1 %,T2 % -ghana,portugal,4,22,"0,15","0,85" -uruguay,portugal,6,22,"0,21","0,79" -south-korea,portugal,12,13,"0,48","0,52" -uruguay,ghana,19,5,"0,79","0,21" -south-korea,ghana,22,4,"0,85","0,15" -south-korea,uruguay,20,9,"0,69","0,31" diff --git a/results/quarter/?/alemania-br.csv b/results/quarter/?/alemania-br.csv deleted file mode 100644 index f6d4cfe..0000000 --- a/results/quarter/?/alemania-br.csv +++ /dev/null @@ -1,2 +0,0 @@ -Team1,Team2,Wins1,Wins2,T1 %,T2 % -brazil,germany,15,13,"0,535714285714286","0,464285714285714" diff --git a/results/quarter/?/bel-cameroon.csv b/results/quarter/?/bel-cameroon.csv deleted file mode 100644 index f6bffd6..0000000 --- a/results/quarter/?/bel-cameroon.csv +++ /dev/null @@ -1,2 +0,0 @@ -Team1,Team2,Wins1,Wins2,T1 %,T2 % -cameroon,belgium,6,20,"0,230769230769231","0,769230769230769" diff --git a/results/quarter/?/morooco-br.csv b/results/quarter/?/morooco-br.csv deleted file mode 100644 index 8f63116..0000000 --- a/results/quarter/?/morooco-br.csv +++ /dev/null @@ -1,2 +0,0 @@ -Team1,Team2,Wins1,Wins2,T1 %,T2 % -brazil,morocco,20,7,"0,740740740740741","0,259259259259259" diff --git a/results/quarter/?/spa-cameroon.csv b/results/quarter/?/spa-cameroon.csv deleted file mode 100644 index c383d5a..0000000 --- a/results/quarter/?/spa-cameroon.csv +++ /dev/null @@ -1,2 +0,0 @@ -Team1,Team2,Wins1,Wins2,T1 %,T2 % -cameroon,spain,17,9,"0,653846153846154","0,346153846153846" diff --git a/results/quarter/q3.csv b/results/quarter/q3.csv deleted file mode 100644 index db31791..0000000 --- a/results/quarter/q3.csv +++ /dev/null @@ -1,2 +0,0 @@ -Team1,Team2,Wins1,Wins2,T1 %,T2 % -england,argentina,11,17,"0,392857142857143","0,607142857142857" diff --git a/results/semi/semi.csv b/results/semi/semi.csv index 5b8bc12..a6d785c 100644 --- a/results/semi/semi.csv +++ b/results/semi/semi.csv @@ -1,2 +1,3 @@ Team1,Team2,Wins1,Wins2,T1 %,T2 % -brazil,france,14,13,"0,52","0,48" +france,brazil,14,13,"0,52","0,48" +argentina,belgium,12,15,"0,44","0,56" diff --git a/spain-belgium.csv b/spain-belgium.csv index 6064af8..5b74081 100644 --- a/spain-belgium.csv +++ b/spain-belgium.csv @@ -1,2 +1,2 @@ ,Team1,Team2,Wins1,Wins2 -0,belgium,spain,15,11 +0, diff --git a/france-argentina.csv b/temp/group_H2.csv similarity index 51% rename from france-argentina.csv rename to temp/group_H2.csv index aba290d..3c66772 100644 --- a/france-argentina.csv +++ b/temp/group_H2.csv @@ -1,2 +1,2 @@ ,Team1,Team2,Wins1,Wins2 -0,argentina,france,16,8 +0,uruguay,portugal,6,22 diff --git a/temp/group_H3.csv b/temp/group_H3.csv new file mode 100644 index 0000000..c26db35 --- /dev/null +++ b/temp/group_H3.csv @@ -0,0 +1,2 @@ +,Team1,Team2,Wins1,Wins2 +0,south-korea,portugal,12,13 diff --git a/group_B4.csv b/temp/group_H4.csv similarity index 54% rename from group_B4.csv rename to temp/group_H4.csv index 44d32df..c1fbbdc 100644 --- a/group_B4.csv +++ b/temp/group_H4.csv @@ -1,2 +1,2 @@ ,Team1,Team2,Wins1,Wins2 -0,usa,iran,18,12 +0,uruguay,ghana,19,5 diff --git a/temp/group_H5.csv b/temp/group_H5.csv new file mode 100644 index 0000000..abee773 --- /dev/null +++ b/temp/group_H5.csv @@ -0,0 +1,2 @@ +,Team1,Team2,Wins1,Wins2 +0,south-korea,ghana,22,4 diff --git a/temp/group_H6.csv b/temp/group_H6.csv new file mode 100644 index 0000000..9e63800 --- /dev/null +++ b/temp/group_H6.csv @@ -0,0 +1,2 @@ +,Team1,Team2,Wins1,Wins2 +0,south-korea,uruguay,20,9 diff --git a/textual_results.txt b/textual_results.txt index 5b49ed0..d6d3542 100644 --- a/textual_results.txt +++ b/textual_results.txt @@ -9,31 +9,31 @@ H - portugal korea-sur ----------------------------- -Senegal usa 49 -- Usa -Argetntina Australia 51 -- arg +Senegal usa -- Usa +Argetntina Australia -- arg -Francia Polonia 50 -- fra -England Ecuador 52 -- eng +Francia Polonia -- fra +England Ecuador -- eng -germany maruecos 53 -- ger -Belgica spain 55 -- bel +germany maruecos -- ger +Belgica spain -- bel -brasil korea 54 -- bra -portugal cameroon 56 -- cam +brasil korea -- bra +portugal cameroon -- cam ---------------------------- -fra usa (1) -- fra -ger bra (2) -- bra -arg eng (3) -- arg -bel cam (4) -- bel +fra usa -- fra +ger bra -- bra +arg eng -- arg +bel cam -- bel --------------------------- semifinal -fra bra (1) -- fra -bel arg (2) -- +fra bra -- fra +bel arg -- bel --------------------------- final y 3er lugar -fra arg (1) -- -bra bel (2) -- +fra bel -- fra +bra arg -- bra diff --git a/usa-argen.csv b/usa-argen.csv deleted file mode 100644 index 5fbc39b..0000000 --- a/usa-argen.csv +++ /dev/null @@ -1,2 +0,0 @@ -,Team1,Team2,Wins1,Wins2 -0,argentina,usa,21,5 diff --git a/usa-england.csv b/usa-england.csv deleted file mode 100644 index d507e4f..0000000 --- a/usa-england.csv +++ /dev/null @@ -1,2 +0,0 @@ -,Team1,Team2,Wins1,Wins2 -0,england,usa,19,6