Merge remote-tracking branch 'origin/Jason'

CodingProgrammer · CodingProgrammer · commit 5503d983a6aa · 2017-12-19T09:27:41.000+08:00
diff --git a/058_Length of Last Word.py b/058_Length of Last Word.py
diff --git a/066_Plus One.py b/066_Plus One.py
diff --git a/069(Binary)_Sqrt(x).py b/069(Binary)_Sqrt(x).py
@@ -0,0 +1,19 @@
+class Solution:
+    def mySqrt(self, x):
+        """
+        :type x: int
+        :rtype: int
+        """
+        if 0 == x:
+            return 0
+        i = 1
+        j = x / 2 + 1
+        while(i <= j):
+            center = int((i + j) / 2 )
+            if center ** 2 == x:
+                return center
+            elif center ** 2 > x:
+                j = center - 1
+            else:
+                i = center + 1
+        return j
diff --git a/069(Func)_ Sqrt(x).py b/069(Func)_ Sqrt(x).py
@@ -0,0 +1,8 @@
+class Solution:
+    def mySqrt(self, x):
+        """
+        :type x: int
+        :rtype: int
+        """
+        import math
+        return int(math.sqrt(x))
diff --git a/083(ListNode)_Remove Duplicates from Sorted List.py b/083(ListNode)_Remove Duplicates from Sorted List.py
@@ -0,0 +1,18 @@
+# Definition for singly-linked list.
+# class ListNode:
+#     def __init__(self, x):
+#         self.val = x
+#         self.next = None
+
+class Solution:
+    def deleteDuplicates(self, head):
+        """
+        :type head: ListNode
+        :rtype: ListNode
+        """
+        cur = head
+        while cur:
+            while cur.next and cur.val == cur.next.val:
+                cur.next = cur.next.next
+            cur = cur.next
+        return head
diff --git a/088_ Merge Sorted Array.py b/088_ Merge Sorted Array.py
@@ -0,0 +1,18 @@
+class Solution:
+    def merge(self, nums1, m, nums2, n):
+        """
+        :type nums1: List[int]
+        :type m: int
+        :type nums2: List[int]
+        :type n: int
+        :rtype: void Do not return anything, modify nums1 in-place instead.
+       """
+        while m > 0 and n > 0:
+            if nums1[m - 1] > nums2[n - 1]:
+                nums1[m + n - 1] = nums1[m - 1]
+                m -= 1
+            else:
+                nums1[m + n - 1] = nums2[n - 1]
+                n -= 1
+        if n > 0:
+            nums1[:n] = nums2[:n]
diff --git a/100(FK1)_Same Tree.py b/100(FK1)_Same Tree.py
@@ -0,0 +1,17 @@
+# Definition for a binary tree node.
+# class TreeNode:
+#     def __init__(self, x):
+#         self.val = x
+#         self.left = None
+#         self.right = None
+
+class Solution:
+    def isSameTree(self, p, q):
+        """
+        :type p: TreeNode
+        :type q: TreeNode
+        :rtype: bool
+        """
+        if p and q:
+            return  (p.val == q.val and self.isSameTree(p.left, q.left) and self.isSameTree(p.right, q.right))
+        return p is q
diff --git a/100_Same Tree b/100_Same Tree
@@ -0,0 +1,20 @@
+# Definition for a binary tree node.
+# class TreeNode:
+#     def __init__(self, x):
+#         self.val = x
+#         self.left = None
+#         self.right = None
+
+class Solution:
+    def isSameTree(self, p, q):
+        """
+        :type p: TreeNode
+        :type q: TreeNode
+        :rtype: bool
+        """
+        if p == None and q == None:
+            return True
+        elif p and q and p.val == q.val:
+            return self.isSameTree(p.left, q.left) and self.isSameTree(p.right, q.right)
+        return False
+  
diff --git a/100_Same Tree.py b/100_Same Tree.py
@@ -0,0 +1,20 @@
+# Definition for a binary tree node.
+# class TreeNode:
+#     def __init__(self, x):
+#         self.val = x
+#         self.left = None
+#         self.right = None
+
+class Solution:
+    def isSameTree(self, p, q):
+        """
+        :type p: TreeNode
+        :type q: TreeNode
+        :rtype: bool
+        """
+        if p == None and q == None:
+            return True
+        elif p and q and p.val == q.val:
+            return self.isSameTree(p.left, q.left) and self.isSameTree(p.right, q.right)
+        return False
+  
