Skip to content

Commit 698fdfb

Browse files
committed
Simplify implementation
1 parent 6c7384b commit 698fdfb

17 files changed

Lines changed: 58 additions & 135 deletions

File tree

config.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,14 @@
560560
"prerequisites": [],
561561
"difficulty": 2
562562
},
563+
{
564+
"slug": "tournament",
565+
"name": "Tournament",
566+
"uuid": "452756cd-f85d-4853-8775-59a15abdc61e",
567+
"practices": [],
568+
"prerequisites": [],
569+
"difficulty": 3
570+
},
563571
{
564572
"slug": "triangle",
565573
"name": "Triangle",
@@ -806,15 +814,6 @@
806814
"prerequisites": [],
807815
"difficulty": 5
808816
},
809-
{
810-
"slug": "tournament",
811-
"name": "Tournament",
812-
"uuid": "452756cd-f85d-4853-8775-59a15abdc61e",
813-
"practices": [],
814-
"prerequisites": [],
815-
"difficulty": 5,
816-
"status": "wip"
817-
},
818817
{
819818
"slug": "transpose",
820819
"name": "Transpose",

exercises/practice/tournament/.meta/config.json

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,6 @@
99
"test": [
1010
"tournament.vader"
1111
],
12-
"editor": [
13-
"inputs/01.txt",
14-
"inputs/02.txt",
15-
"inputs/03.txt",
16-
"inputs/04.txt",
17-
"inputs/05.txt",
18-
"inputs/06.txt",
19-
"inputs/07.txt",
20-
"inputs/08.txt",
21-
"inputs/09.txt",
22-
"inputs/10.txt",
23-
"inputs/11.txt",
24-
"inputs/12.txt"
25-
],
2612
"example": [
2713
".meta/example.vim"
2814
]

exercises/practice/tournament/.meta/example.vim

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
let s:HEADER = 'Team | MP | W | D | L | P'
22

3-
function! Tally(relative_input_csv) abort
4-
let l:lines = readfile(a:relative_input_csv)
5-
if empty(l:lines)
6-
return s:HEADER
3+
function! Tally(lines) abort
4+
if empty(a:lines)
5+
return [s:HEADER]
76
endif
87

9-
let l:team_data = s:ProcessGameResults(l:lines)
8+
let l:team_data = s:ProcessGameResults(a:lines)
109
let l:team_standings = s:PrepareStandings(l:team_data)
1110
let l:rows = s:BuildTableRows(l:team_standings)
1211

13-
return s:HEADER . "\n" . join(l:rows, "\n")
12+
return [s:HEADER] + l:rows
1413
endfunction
1514

1615
function! s:ProcessGameResults(lines) abort
@@ -59,12 +58,12 @@ function! s:BuildTableRows(teams) abort
5958
let l:rows = []
6059
for l:team_data in a:teams
6160
let l:row = printf('%-30s | %2d | %2d | %2d | %2d | %2d',
62-
\ l:team_data['name'],
63-
\ l:team_data['MP'],
64-
\ l:team_data['W'],
65-
\ l:team_data['D'],
66-
\ l:team_data['L'],
67-
\ l:team_data['P'])
61+
\ l:team_data['name'],
62+
\ l:team_data['MP'],
63+
\ l:team_data['W'],
64+
\ l:team_data['D'],
65+
\ l:team_data['L'],
66+
\ l:team_data['P'])
6867
call add(l:rows, l:row)
6968
endfor
7069

exercises/practice/tournament/inputs/01.txt

Whitespace-only changes.

exercises/practice/tournament/inputs/02.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

exercises/practice/tournament/inputs/03.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

exercises/practice/tournament/inputs/04.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

exercises/practice/tournament/inputs/05.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

exercises/practice/tournament/inputs/06.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

exercises/practice/tournament/inputs/07.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)