Merge branch 'master' into master

Author: smaybius

.gitignore

@@ -1,2 +1,3 @@
 zig-cache/
 build_runner.zig
+__pycache__/

C++/Morwenn's rewrite of Summer Dragonfly's GrailSort/grailsort.h

@@ -133,7 +133,7 @@ namespace grailsort_detail
         }
 
         template<typename RandomAccessIterator, typename Compare, typename T>
-        static int BinarySearchLeft(RandomAccessIterator array, int start, int length, const T& target, Compare comp) {
+        static int BinarySearchLeft(RandomAccessIterator array, int start, int length, T&& target, Compare comp) {
             int left  = 0;
             int right = length;
 
@@ -153,7 +153,7 @@ namespace grailsort_detail
 
         // Credit to Anonymous0726 for debugging
         template<typename RandomAccessIterator, typename Compare, typename T>
-        static int BinarySearchRight(RandomAccessIterator array, int start, int length, const T& target, Compare comp) {
+        static int BinarySearchRight(RandomAccessIterator array, int start, int length, T&& target, Compare comp) {
             int left  = 0;
             int right = length;
 
@@ -283,7 +283,10 @@ namespace grailsort_detail
             }
 
             if(buffer != left) {
-                std::swap_ranges(buffer, buffer + (middle - left), left);
+                while (left != middle) {
+                    std::iter_swap(buffer, left);
+                    ++buffer; ++left;
+                }
             }
         }
 
@@ -985,7 +988,7 @@ namespace grailsort_detail
 
         template<typename RandomAccessIterator, typename BufferIterator, typename Compare>
         void CombineOutOfPlace(RandomAccessIterator array, int firstKey, int start, int length, int subarrayLen, int blockLen,
-                               int mergeCount, int lastSubarrays, BufferIterator extBuffer, int extBufferLen, Compare comp) {
+                               int mergeCount, int lastSubarrays, BufferIterator extBuffer, Compare comp) {
             std::move(array + (start - blockLen), array + start, extBuffer);
 
             int fullMerge = 2 * subarrayLen;
@@ -1070,7 +1073,7 @@ namespace grailsort_detail
             //                                   block fits into our external buffer.
             if(buffer && blockLen <= extBufferLen) {
                 CombineOutOfPlace(array, firstKey, start, length, subarrayLen, blockLen, mergeCount, lastSubarrays,
-                                  extBuffer, extBufferLen, comp);
+                                  extBuffer, comp);
             }
             else {
                 CombineInPlace(array, firstKey, start, length, subarrayLen, blockLen,
@@ -1186,8 +1189,8 @@ namespace grailsort_detail
                 return;
             }
 
-            BufferIterator extBuffer;
-            int extBufferLen;
+            BufferIterator extBuffer{};
+            int extBufferLen = 0;
 
             int blockLen = 1;
 

…ritten Grailsort for Python/GrailSort.py …ritten Grailsort for Python/GrailSort.pyPython/thatsOven's Rewritten Grailsort for Python/GrailSort.py renamed to Python/Amari Calipso's Rewritten Grailsort for Python/GrailSort.py Python/thatsOven's Rewritten Grailsort for Python/GrailSort.py renamed to Python/Amari Calipso's Rewritten Grailsort for Python/GrailSort.py

@@ -34,6 +34,7 @@ def arrayCopy(fromArray, fromIndex, toArray, toIndex, length):   # thanks to Bee
  # The Holy Grail Sort Project
  # Project Manager:      Summer Dragonfly
  # Project Contributors: 666666t
+ #                       Amari Calipso
  #                       Anonymous0726
  #                       aphitorite
  #                       Control
@@ -47,7 +48,6 @@ def arrayCopy(fromArray, fromIndex, toArray, toIndex, length):   # thanks to Bee
  #                       MP
  #                       phoenixbound
  #                       Spex_guy
- #                       thatsOven
  #                       _fluffyy
  #                       
  #                       
@@ -60,7 +60,7 @@ def arrayCopy(fromArray, fromIndex, toArray, toIndex, length):   # thanks to Bee
 #
 # ** Written and maintained by The Holy Grail Sort Project
 #
-# Primary author: thatsOven
+# Primary author: Amari Calipso
 #
 # Current status: Working (Passing all tests) + Stable
 

Python/DeveloperSort's Tester for Python/tester.py

@@ -43,11 +43,11 @@
  #
 # Editor : DeveloperSort
 
-# importing Python\thatsOven's Rewritten Grailsort for Python\GrailSort.py
+# importing Python\Amari Calipso's Rewritten Grailsort for Python\GrailSort.py
 # i know, it looks messy.
 import sys
 originalPath = sys.path[0]
-sys.path[0] += "\\..\\thatsOven's Rewritten Grailsort for Python\\"
+sys.path[0] += "\\..\\Amari Calipso's Rewritten Grailsort for Python\\"
 import GrailSort
 sys.path[0] = originalPath
 

Python/thatsOven's Rewritten Grailsort for Python/__pycache__/GrailSort.cpython-38.pyc

@@ -7,14 +7,15 @@ A diverse array of heavily refactored versions of Andrey Astrelin's GrailSort.h,
 # Current implementations featured in our repo:
 * Summer Dragonfly et al.'s Rewritten Grailsort for **Java** (ALL TESTS PASSING / POTENTIALLY FIXED)
 * 666666t's Rewritten Grailsort for **Rust**
-* thatsOven's Rewritten Grailsort for **Python**
+* Amari Calipso's Rewritten Grailsort for **Python**
 * Enver's Rewritten Grailsort for **JavaScript**
 * Summer Dragonfly's *Simple* Rewritten Grailsort for **C**
 * Morwenn's adaptation of Summer Dragonfly's Java Rewritten Grailsort for **C++**
 * \_fluffyy's Rewritten Grailsort for **Python**
 * Gaming32's Rewritten Grailsort for **Cython**
 * SpexGuy's Rewritten Grailsort for **Zig**
 * AceOfSpadesProduc100's Rewritten Grailsort for **C#**
+* Amari Calipso's Rewritten Grailsort for **V**
 * *more to come!*
 
 # What is Grailsort?
@@ -62,6 +63,7 @@ Now, there *are* some glaring flaws with Grailsort, but they're now easier than
    * Summer Dragonfly / MusicTheorist
  * Project Contributors:
    * 666666t
+   * Amari Calipso
    * Anonymous0726
    * aphitorite
    * Control
@@ -74,7 +76,6 @@ Now, there *are* some glaring flaws with Grailsort, but they're now easier than
    * MP
    * phoenixbound
    * Spex_guy
-   * thatsOven
    * \_fluffyy
    * AceOfSpadesProduc100
  * Special thanks to "The Studio" Discord community!