2020-03-03

JiayangWu · JiayangWu · commit ab2ef8b46a10 · 2020-03-03T14:03:40.000-05:00
diff --git a/0994.腐烂的橘子/0994-腐烂的橘子.py b/0994.腐烂的橘子/0994-腐烂的橘子.py
@@ -4,36 +4,40 @@ def orangesRotting(self, grid):
         :type grid: List[List[int]]
         :rtype: int
         """
+        from collections import deque
+        if not grid or not grid[0]:
+            return 0
+        
+        m, n = len(grid), len(grid[0])
         dx = [1, -1, 0, 0]
         dy = [0, 0, 1, -1]
-        rotlist = list()
-        for i in range(len(grid)):
-            for j in range(len(grid[0])):
+        
+        queue = deque()
+        for i in range(m):
+            for j in range(n):
                 if grid[i][j] == 2:
-                    rotlist.append([i, j])
-        minute = 0
-        while(rotlist):
-            newrotlist = list()
-            for rotnode in rotlist:
-                x0 = rotnode[0]
-                y0 = rotnode[1]
-                
+                    queue.append((i, j))
+
+        res = 0
+        while queue:     
+            for i in range(len(queue)):
+                pair = queue.popleft()
+                x0, y0 = pair[0], pair[1]
                 for k in range(4):
                     x = x0 + dx[k]
                     y = y0 + dy[k]
-                    
-                    if 0 <= x < len(grid) and 0 <= y < len(grid[0]) and grid[x][y] == 1:
+
+                    if 0 <= x < m and 0 <= y < n and grid[x][y] == 1:
                         grid[x][y] = 2
-                        newrotlist.append([x,y])
-            if not newrotlist:
+                        queue.append((x, y))
+            if not queue:
                 break
-                
-            rotlist = newrotlist[:]
-            minute += 1
-            
-        for row in grid:
-            for i in row:
-                if i == 1:#�������ʵ�
+            res += 1
+        for i in range(m):
+            for j in range(n):
+                if grid[i][j] == 1:
                     return -1
-        return minute
-            
+        return res
+                    
+        
+        
diff --git a/面试题10.01.合并排序的数组/面试题10.01-合并排序的数组.py b/面试题10.01.合并排序的数组/面试题10.01-合并排序的数组.py
@@ -0,0 +1,10 @@
+class Solution(object):
+    def merge(self, A, m, B, n):
+        """
+        :type A: List[int]
+        :type m: int
+        :type B: List[int]
+        :type n: int
+        :rtype: None Do not return anything, modify A in-place instead.
+        """
+        A[:] = sorted(A[:m] + B)
