2021-15: Lint

2021/15/sol1.rb

@@ -9,11 +9,14 @@ def dijk(grid, start, end_)
   until queue.empty?
     x, y = queue.min_by(&dist)
     d = dist[[x, y]]
-    return d if [x, y] == end_
+    return d if end_ == [x, y]
+
     queue.delete([x, y])
     [[-1, 0], [1, 0], [0, -1], [0, 1]].each do |dx, dy|
-      next unless (0...grid.size) === x + dx && (0...grid[0].size) === y + dy
-      next if dist.has_key?([x + dx, y + dy])
+      next unless (0...grid.size).include?(x + dx) && (0...grid[0].size).include?(y + dy)
+
+      next if dist.key?([x + dx, y + dy])
+
       cost = grid[x + dx] && grid[x + dx][y + dy]
       dist[[x + dx, y + dy]] = d + cost
       queue << [x + dx, y + dy]

2021/15/sol2.rb

@@ -12,7 +12,7 @@ def cost(grid, x, y)
   ym = y % grid[0].size
   ans = grid[xm][ym] + xx + yy
   ans = ans % 9
-  ans = 9 if ans == 0
+  ans = 9 if ans.zero?
   ans
 end
 
@@ -29,10 +29,13 @@ def dijk(grid, xmax, ymax, start, end_)
   until pqueue.empty?
     x, y = pqueue.pop
     d = dist[[x, y]]
-    return d if [x, y] == end_
+    return d if end_ == [x, y]
+
     [[-1, 0], [1, 0], [0, -1], [0, 1]].each do |dx, dy|
-      next unless (0..xmax) === x + dx && (0..ymax) === y + dy
-      next if dist.has_key?([x + dx, y + dy])
+      next unless (0..xmax).include?(x + dx) && (0..ymax).include?(y + dy)
+
+      next if dist.key?([x + dx, y + dy])
+
       cost = cost(grid, x + dx, y + dy)
       dist[[x + dx, y + dy]] = d + cost
       pqueue.push(d + cost, [x + dx, y + dy])