finish one leetcode

sdwh · sdwh · commit 96c882cbb666 · 2015-06-01T16:48:31.000+08:00
diff --git a/[beta]Merged String Checker.py b/[beta]Merged String Checker.py
@@ -0,0 +1,16 @@
+def is_merge(s, part1, part2):
+    part1 = list(part1)
+    part2 = list(part2)
+    for i in range(len(s)):
+        if s[i] == part1[0]:
+            print(part1)
+            print(part1.pop())
+
+
+print(is_merge('codewars', 'cod', 'ewars'))
+print(is_merge('Bananas from Bahamas', 'Bahas', 'Bananas from am'))
+
+        #if s[i] in part1 and s[i] in part2:
+            #if is_merge(''.join(s[i+1:]),part1.pop()[::-1],part2[::-1]):
+            #    return True
+            #return False
diff --git a/[leetcode]Contains Duplicate.py b/[leetcode]Contains Duplicate.py
@@ -0,0 +1,11 @@
+class Solution:
+    # @param {integer[]} nums
+    # @return {boolean}
+    def containsDuplicate(self, nums):
+        res = None
+        for n in sorted(nums):
+            if n == res:
+                return True
+            else:
+                res = n
+        return False                
diff --git a/[leetcode]Majority Element.py b/[leetcode]Majority Element.py
@@ -0,0 +1,12 @@
+class Solution:
+    # @param {integer[]} nums
+    # @return {integer}
+    def majorityElement(self, nums):
+        sorted(nums)
+        numDict = {}
+        for n in nums:
+            numDict[n] = numDict.get(n,0) + 1
+        return max(numDict.values())
+
+test = Solution()
+print(test.majorityElement([1,2,3,4,4,4,5,7,7,7,4,7]))
diff --git a/[leetcode]ZigZag Conversion.py b/[leetcode]ZigZag Conversion.py
@@ -0,0 +1,15 @@
+class Solution:
+    # @param {string} s
+    # @param {integer} numRows
+    # @return {string}
+    def convert(self, s, numRows):
+        contain = [[] for __ in range(numRows)]
+        trans = tuple(range(numRows)) + tuple(range(numRows-1)[::-1])
+        shift = (numRows - 1) * 2 if numRows > 1 else 1
+        for i in range(len(s)):
+            contain[trans[i%shift]].append(s[i])
+        return ''.join([''.join(con) for con in contain])
+
+test = Solution()
+print(test.convert("PAYPALISHIRING", 3))
+print(test.convert("ABCD", 1))
