Merge pull request #1 from hustcc/master

merge

Author: styxschip

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: ['https://paypal.me/hustcc', 'https://atool.vip']

.travis.yml

@@ -2,5 +2,5 @@ language: node_js
 node_js:
   - "10"
 before_install:
-  - npm i -g lint-md
+  - npm i -g lint-md-cli
 script: lint-md ./

10.radixSort.md

@@ -7,7 +7,7 @@
 
 基数排序有两种方法：
 
-这三种排序算法都利用了桶的概念，但对桶的使用方法上有明显差异：
+这三种排序算法都利用了桶的概念，但对桶的使用方法上有明显差异案例看大家发的：
 
  - 基数排序：根据键值的每位数字来分配桶；
  - 计数排序：每个桶只存储单一键值；
@@ -49,7 +49,39 @@ function radixSort(arr, maxDigit) {
 }
 ```
 
-## 4. Java 代码实现
+
+## 4. python 代码实现
+
+```python
+def radix(arr):
+    
+    digit = 0
+    max_digit = 1
+    max_value = max(arr)
+    #找出列表中最大的位数
+    while 10**max_digit < max_value:
+        max_digit = max_digit + 1
+    
+    while digit < max_digit:
+        temp = [[] for i in range(10)]
+        for i in arr:
+            #求出每一个元素的个、十、百位的值
+            t = int((i/10**digit)%10)
+            temp[t].append(i)
+        
+        coll = []
+        for bucket in temp:
+            for i in bucket:
+                coll.append(i)
+                
+        arr = coll
+        digit = digit + 1
+
+    return arr
+```
+
+
+## 5. Java 代码实现
 
 ```java
 /**
@@ -134,7 +166,7 @@ public class RadixSort implements IArraySort {
 }
 ```
 
-## 5. PHP 代码实现
+## 6. PHP 代码实现
 
 ```php
 function radixSort($arr, $maxDigit = null)
@@ -169,4 +201,4 @@ function radixSort($arr, $maxDigit = null)
 
     return $arr;
 }
-```
+```

4.shellSort.md

@@ -99,7 +99,7 @@ public class ShellSort implements IArraySort {
         int[] arr = Arrays.copyOf(sourceArray, sourceArray.length);
 
         int gap = 1;
-        while (gap < arr.length) {
+        while (gap < arr.length/3) {
             gap = gap * 3 + 1;
         }
 

7.heapSort.md

@@ -10,7 +10,7 @@
 
 ## 1. 算法步骤
 
-1. 创建一个堆 H[0……n-1]；
+1. 将待排序序列构建成一个堆 H[0……n-1]，根据（升序降序需求）选择大顶堆或小顶堆；
 
 2. 把堆首（最大值）和堆尾互换；
 
@@ -254,4 +254,4 @@ function heapSort($arr) {
     }
     return $arr;
 }
-```
+```

8.countingSort.md

@@ -149,7 +149,11 @@ function countingSort($arr, $maxValue = null)
 
     $sortedIndex = 0;
     foreach ($bucket as $key => $len) {
-        if ($len !== null) $arr[$sortedIndex++] = $key;
+        if($len !== null){
+            for($j = 0; $j < $len; $j++){
+                $arr[$sortedIndex++] = $key;
+            }
+        }
     }
 
     return $arr;

src/pythonSortTest.py

@@ -1,4 +1,4 @@
-'''
+'''
 # Create by LokiSharp(loki.sharp#gmail) at 2017-1-22
 '''
 
@@ -176,6 +176,34 @@ def countingSort(arr, maxValue=None):
             bucket[j] -= 1
     return arr
 
+def radix_count(exp1):
+    global list
+    n = len(list)
+    output = [0] * (n)
+    count = [0] * (10)
+    for i in range(0, n):
+        index = (list[i] / exp1)
+        count[(index) % 10] += 1
+    for i in range(1,10):
+        count[i] += count[i - 1]
+    i = n - 1
+    while i >= 0:
+        index = (list[i]/exp1)
+        output[count[(index) % 10] - 1] = list[i]
+        count[(index) % 10] -= 1
+        i -= 1
+    i = 0
+    for i in range(0,len(list)):
+        list[i] = output[i]
+
+def radixSort():
+    global list
+    max1 = max(list)
+    exp = 1
+    while max1 / exp > 0:
+        radix_count(exp)
+        exp *= 10
+
 
 if __name__ == '__main__':
     sortTest(bubbleSort, TOTAL)
@@ -185,3 +213,4 @@ def countingSort(arr, maxValue=None):
     sortTest(mergeSort, TOTAL)
     sortTest(quickSort, TOTAL)
     sortTest(heapSort, TOTAL)
+    sortTest(radixSort, TOTAL)