@@ -90,15 +90,15 @@ def parse(text):
9090 i_hor = next (i for i , line in enumerate (lines ) if i > i_dim and line .startswith ('# Horizontal' ))
9191 i_ver = next (i for i , line in enumerate (lines ) if i > i_hor and line .startswith ('# Vertical' ))
9292 # Parse rows and columns
93- r , c = map (int , lines [i_dim + 1 ].split ())
93+ rows , cols = map (int , lines [i_dim + 1 ].split ())
9494 # Extract horizontal and vertical constraints
9595 row_clues = [list (map (int , line .split ())) for line in lines [i_hor + 1 :i_ver ]]
9696 col_clues = [list (map (int , line .split ())) for line in lines [i_ver + 1 :]]
97- return r , c , row_clues , col_clues
97+ return rows , cols , row_clues , col_clues
9898
9999
100- def solve (r_num , c_num ):
101- print_nonogram (solve_nonogram (r_num , c_num ))
100+ def solve (row_clues , col_clues ):
101+ print_nonogram (solve_nonogram (row_clues , col_clues ))
102102 # See an up arrow
103103
104104 url = PREFIX + 'up.html'
@@ -107,8 +107,8 @@ def solve(r_num, c_num):
107107 url2 = PREFIX + catch (requests .get (url ).text )
108108 # http://kohsamui:thailand@www.pythonchallenge.com/pc/rock/up.txt"
109109
110- r , c , r_num , c_num = parse (requests .get (url2 ).text )
111- print_nonogram (solve_nonogram (r_num , c_num ))
110+ rows , cols , row_clues , col_clues = parse (requests .get (url2 ).text )
111+ print_nonogram (solve_nonogram (row_clues , col_clues ))
112112 # See a python
113113
114114 url3 = PREFIX + 'python.html'
@@ -119,8 +119,8 @@ def solve(r_num, c_num):
119119if __name__ == "__main__" :
120120 r = requests .get (url )
121121 something = r .text
122- r , c , r_num , c_num = parse (something )
123- answer = solve (r_num , c_num )
122+ rows , cols , row_clues , col_clues = parse (something )
123+ answer = solve (row_clues , col_clues )
124124 print (answer )
125125 # "Free" as in "Free speech", not as in "free...
126126 # Google this sentence and the answer is beer
0 commit comments