renew project

Author: linjing-lab

README.md

@@ -97,6 +97,7 @@ By the way, I didn't complete all the iterative data types, in order to develop
 
 - [sortingx-1.2.2](https://github.com/linjing-lab/sorting-algorithms/tree/v1.2.2) is the package that support `range`, `zip`, `dict_keys`, `dict_values`, `dict_items` additionally, you can choose what suitable data you want to input.
 - [sortingx-1.2.3](https://github.com/linjing-lab/sorting-algorithms/tree/v1.2.3) is the package that corrected the situation where elements are equal in `compare`, support more input data, like data as `[['Jack', (98, 100)], ['Bob', (98, 99)], ['Jessi', (98, 97)]]` and key as `lambda x: x[1][0]`.
+- [sortingx-1.3.0](https://github.com/linjing-lab/sorting-algorithms/tree/v1.3.0) is the final version that fully aligned with the `sorted`', reduces redundant data exchanging. like data as `[('Alex', 97, 90, 98, 95), ('Jack', 97, 88, 98, 92), ('Peter', 92, 95, 92, 96), ('Li', 97, 89, 98, 92)]` and key as `key=lambda x: x[1]`.
 
 ## LICENSE
 

README_release.md

@@ -12,5 +12,6 @@
 |v1.2.1|`pip install sortingx==1.2.1`|Delete Core Function to Make Builtin First|√|
 |v1.2.2|`pip install sortingx==1.2.2`|Change Convert Function to Make it More Robust|√|
 |v1.2.3|`pip install sortingx==1.2.3`|Add Verify Function to Solve Comparison of Equal|√|
+|v1.3.0|`pip install sortingx==1.3.0`|Revamp Redundant Data Exchanging About Equal Elements|√|
 
 </div>

sortingx/__init__.py

@@ -16,6 +16,6 @@
 
 from .sorting import bubble, insert, shell, heap, quick, merge, __all__
 
-__version__ = '1.2.3'
+__version__ = '1.3.0'
 
 assert sys.version_info >= (3, 7, 0)

sortingx/sorting.py

@@ -58,7 +58,7 @@ def insert(__iterable: Iterable[_T], key: Optional[Callable[[_T], SupportsRichCo
             high: int = index - 1
             while low <= high: # sequence conforming to monotonicity
                 mid: int = (low + high) // 2
-                if (keyc < compare[mid] if reverse else keyc > compare[mid]):
+                if (keyc <= compare[mid] if reverse else keyc >= compare[mid]):
                     low: int = mid + 1
                 else:
                     high: int = mid - 1
@@ -129,9 +129,10 @@ def build(root: int, end: int) -> None:
         for root in range(length // 2 - 1 , -1, -1):
             build(root, length)
         for end in range(length - 1, 0, -1):
-            __iterable[0], __iterable[end] = __iterable[end], __iterable[0]
-            if key != None:
-                compare[0], compare[end] = compare[end], compare[0]
+            if compare[0] != compare[end]:
+                __iterable[0], __iterable[end] = __iterable[end], __iterable[0]
+                if key != None:
+                    compare[0], compare[end] = compare[end], compare[0]
             build(0, end)
     return __iterable
 
@@ -164,12 +165,14 @@ def partition(l: int, r: int) -> int:
         for ind in range(l, r):
             if (val < compare[ind] if reverse else val > compare[ind]):
                 index += 1
-                __iterable[index], __iterable[ind] = __iterable[ind], __iterable[index]
-                if key != None:
-                    compare[index], compare[ind] = compare[ind], compare[index]
-        __iterable[index + 1], __iterable[r] = __iterable[r], __iterable[index + 1]
-        if key != None:
-            compare[index + 1], compare[r] = compare[r], compare[index + 1]
+                if compare[index] != compare[ind]:
+                    __iterable[index], __iterable[ind] = __iterable[ind], __iterable[index]
+                    if key != None:
+                        compare[index], compare[ind] = compare[ind], compare[index]
+        if compare[index + 1] != compare[r]:
+            __iterable[index + 1], __iterable[r] = __iterable[r], __iterable[index + 1]
+            if key != None:
+                compare[index + 1], compare[r] = compare[r], compare[index + 1]
         return index + 1
     if compare and not verify(compare):
         solve(0, len(__iterable) - 1)
@@ -200,7 +203,7 @@ def merg(low: int, mid: int, high: int) -> None:
         result: List[_T] = []
         store: List[_T] = []
         while i < len(left) and j < len(right):
-            if (rc[j] < lc[i] if reverse else rc[j] > lc[i]):
+            if (rc[j] <= lc[i] if reverse else rc[j] >= lc[i]):
                 result.append(left[i])
                 store.append(lc[i])
                 i += 1

test_.py

@@ -16,6 +16,6 @@ def __repr__(self):
     Student('Peter', 'B', 10),
 )
 
-test = six.merge(student_objects, key=attrgetter('grade', 'age'))
 output = sorted(student_objects, key=attrgetter('grade', 'age'))
+test = six.merge(student_objects, key=attrgetter('grade', 'age'))
 print(test, '\n', output)

test_reverse.py

@@ -1,5 +1,6 @@
 # 导包
 from typing import List
+import sortingx
 
 # 测试
 class Reverser:
@@ -11,7 +12,7 @@ def __init__(self, genre: str, method: List[str], part: List[bool]=None, ret: Li
             assert len(part) == len(method)
         if ret != None:
             assert len(ret) == len(method)
-        self.method = 'galley.' + genre
+        self.method = 'sortingx.' + genre
         self.call = method # genre.def
         self.part = part
         self.ret = ret

test_sortingx.py

@@ -0,0 +1,8 @@
+import sortingx
+
+with open('./data/test.txt', 'rt', encoding='utf-8') as fout:
+    strings = fout.readlines()
+    data = [string.strip('\n') for string in strings]
+
+for value in data:
+    print(sortingx.heap(eval(value)))