fastsort 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5138e2c24fc0375ad7ce6ab52e0d2687c92298fd27ce998d6aaf718c2c43a846
-  data.tar.gz: 640b5566de987806787c1d8f38d1f77d8a6c476f0caf37077989fff8533d159e
+  metadata.gz: 9c7b13967306e965a337cf00b9b8debca59787d6ee788af65b3242e606507ae2
+  data.tar.gz: 04a5570f6b32a7eea2f18e22e174ef53591e7968ff9b4fe1bc5222148c1f070d
 SHA512:
-  metadata.gz: dc0abc389f64ee1fbea1b2e74643e130a87c69f3cdee81a904eaf7adfa0561f530ee43ca79e6a5d8eb40ca5812385a9a190a699b1acf6fdddb94a84b8ff25954
-  data.tar.gz: 713c5b8999af7a93a7f466c8ea2eb17ec36479f94d91736c1b8900efe22d689e7295720d3a2e992d5458f79539344ae6ad9053421f90529675f702224d08b32c
+  metadata.gz: 961c2cc4b1a10d4dbd97408546d02294ffa884a784da0655cc96a4cb74848ff50aa757c71fe3e18ec102e706bce77bd99c14e8d1d34a31af5a2180aae57ec291
+  data.tar.gz: 17ffc5adb2895eb51c53f45512771111be4a9c4f50892fdf63d61e7ed8489b7427d12ef7386ebb46d3b104674ed1ea5894f4a0708038f688e7019b6ea742e767

data/README.md

@@ -30,14 +30,17 @@ arr = [
 
 sorter001 = Fastsort::Quicksort.new(arr)
 sorter002 = Fastsort::Mergesort.new(arr)
+sorter003 = Fastsort::Sonicsort.new(arr)
 
 sorter001.sort_array
+sorter002.sort_array
+sorter003.sort_array
 
 puts "Sorted Array: #{sorter001.array}"
 puts "Sorted Array: #{sorter002.array}"
+puts "Sorted Array: #{sorter003.array}"
+
 
-Sorted Array Quicksort: [1, 6, 7, 9, 10, 12, 14, 15, 18, 21, 21, 22, 24, 25, 30, 31, 34, 38, 39, 40, 41, 45, 53, 55, 57, 59, 60, 63, 66, 67, 67, 69, 71, 75, 75, 75, 79, 79, 79, 80, 83, 83, 85, 87, 92, 92, 93, 97, 98, 99]
-Sorted Array Mergesort: [1, 6, 7, 9, 10, 12, 14, 15, 18, 21, 21, 22, 24, 25, 30, 31, 34, 38, 39, 40, 41, 45, 53, 55, 57, 59, 60, 63, 66, 67, 67, 69, 71, 75, 75, 75, 79, 79, 79, 80, 83, 83, 85, 87, 92, 92, 93, 97, 98, 99]
 
 
 ```

data/lib/fastsort/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fastsort
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/fastsort.rb

@@ -92,41 +92,74 @@ module Fastsort
 
     def sort_quick_and_merge
       raise ArgumentError, 'Array cannot be empty' if array.empty?
-      sort_and_merge(0, array.length - 1)
+      quicksort(0, array.length - 1)
+      merge_sort(0, array.length - 1)
       self
     end
 
     private
 
-    def sort_and_merge(from_idx, to_idx)
+    def quicksort(from_idx, to_idx)
       return if from_idx >= to_idx
 
-      # Use Quicksort before Mergesort
       pivot_idx = quicksort_partition(from_idx, to_idx)
 
-      # Continue with Mergesort on both sides of the pivot
-      sort_and_merge(from_idx, pivot_idx - 1)
-      sort_and_merge(pivot_idx + 1, to_idx)
+      quicksort(from_idx, pivot_idx - 1)
+      quicksort(pivot_idx + 1, to_idx)
     end
 
     def quicksort_partition(from_idx, to_idx)
-      pivot_idx = array[to_idx]
-      pointer_a_idx = pointer_b_idx = from_idx
+      pivot_idx = to_idx
+      pivot_value = array[pivot_idx]
 
-      while pointer_a_idx < to_idx
-        if array[pointer_a_idx] <= pivot_idx
+      raise ArgumentError, 'Invalid pivot value' if pivot_value.nil?
+
+      pointer_b_idx = from_idx
+
+      ((from_idx...to_idx).to_a).each do |pointer_a_idx|
+        current_value = array[pointer_a_idx]
+
+        next if current_value.nil?
+
+        if current_value <= pivot_value
           swap_values(pointer_a_idx, pointer_b_idx)
           pointer_b_idx += 1
         end
-        pointer_a_idx += 1
       end
 
-      swap_values(pointer_b_idx, to_idx)
+      swap_values(pointer_b_idx, pivot_idx)
       pointer_b_idx
     end
 
+
+    def merge_sort(from_idx, to_idx)
+      return if from_idx >= to_idx
+
+      middle_idx = (from_idx + to_idx) / 2
+
+      merge_sort(from_idx, middle_idx)
+      merge_sort(middle_idx + 1, to_idx)
+      merge_subarrays(from_idx, middle_idx, to_idx)
+    end
+
+    def merge_subarrays(from_idx, middle_idx, to_idx)
+      left = array[from_idx..middle_idx]
+      right = array[(middle_idx + 1)..to_idx]
+
+      result = []
+
+      until left.empty? || right.empty?
+        result << (left.first <= right.first ? left.shift : right.shift)
+      end
+
+      result.concat(left).concat(right)
+
+      array[from_idx..to_idx] = result
+    end
+
     def swap_values(let_idx_a, let_idx_b)
       array[let_idx_a], array[let_idx_b] = array[let_idx_b], array[let_idx_a]
     end
   end
+
 end

data/main.rb

@@ -36,10 +36,12 @@ arr = [
 
 sorter_001 = Fastsort::Quicksort.new(arr)
 sorter_002 = Fastsort::Mergesort.new(arr)
+sorter_003 = Fastsort::Sonicsort.new(arr)
 
 sorter_001.sort_array
 sorter_002.sort_array
+sorter_003.sort_quick_and_merge
 
-# puts "Sorted Array: #{sorter_001.array}"
 puts "Sorted Array Quicksort: #{sorter_001.array}"
 puts "Sorted Array Mergesort: #{sorter_002.array}"
+puts "Sorted Array Sonicsort: #{sorter_003.array}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastsort
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Dants0
@@ -23,6 +23,7 @@ files:
 - Rakefile
 - fastsort-0.1.0.gem
 - fastsort-0.1.1.gem
+- fastsort-0.1.2.gem
 - fastsort.gemspec
 - lib/fastsort.rb
 - lib/fastsort/version.rb