quciksort

Author: johannes67890

benches/sort_benchmark.rs

@@ -1,11 +1,12 @@
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use sorting_algorithm::bubblesort;
+use sorting_algorithm::quicksort;
 
 fn sort_arrays_benchmark(c: &mut Criterion) {
     let mut arr = black_box([-2,-7,2,10,20,9]);
 
-    c.bench_function("Bubblesort", |b| b.iter(|| bubblesort(&mut arr)));
-
+    c.bench_function("Bubble Sort", |b| b.iter(|| bubblesort(&mut arr)));
+    c.bench_function("Quick Sort", |b| b.iter(|| quicksort(&mut arr)));
 }
 
 criterion_group!(benches, sort_arrays_benchmark);

src/lib.rs

@@ -15,8 +15,8 @@ mod tests {
     }
     #[test]
     fn test_quick_sort() {
-        let mut array = [10, 7, 8, 9, 1, 5];
-        let sorted = quicksort(&mut array);
-        assert_eq!(sorted, &[1, 5, 7, 8, 9, 10]);
+        let mut arr = [6, 2, 4, 1, 9, -2, 5];
+        quicksort(&mut arr);
+        assert_eq!(arr, [-2, 1, 2, 4, 5, 6, 9]);
     }
 }

src/quciksort.rs

@@ -1,26 +1,24 @@
-pub fn quicksort(array: &mut [i32]) -> &[i32] {
+pub fn quicksort<T: Ord>(array: &mut [T]) {
     let low: isize = 0;
     let high: isize = (array.len() - 1) as isize;
 
-   sort(array, low, high);
+    sort(array, low, high);
 
-
-    fn sort(array: &mut [i32], low: isize, high: isize) -> &[i32]{
+    fn sort<T: Ord>(array: &mut [T], low: isize, high: isize){
         if low < high {
             let pi: isize = temp(array, low, high);
 
             sort(array, low, pi - 1);
             sort(array, (pi + 1) as isize, high);
-         }
-         array
+         
     }
 
-    fn temp(array: &mut [i32], low: isize, high: isize) -> isize {
-        let temp = array[high as usize];
+    fn temp<T: Ord>(array: &mut [T], low: isize, high: isize) -> isize {
         let mut i = low - 1; 
 
         for j in 0..high {
-            if array[j as usize] < temp {
+            if &array[j as usize] < &array[high as usize] {
+
                 i += 1;
 
                 array.swap(i as usize, j as usize);
@@ -30,6 +28,5 @@ pub fn quicksort(array: &mut [i32]) -> &[i32] {
        array.swap((i + 1) as usize, high as usize);
        i + 1
     }
-
-    array
+    }
 }