Commit Graph

91 Commits

Author SHA1 Message Date
674e919cc0 Merge branch 'changeorder' of UBB/sort into master 2018-11-17 17:12:04 -03:00
369f41c886
order the algorithms from worse to best 2018-11-17 17:11:08 -03:00
6ff4147448
optimize swap 2018-11-17 17:00:00 -03:00
751e6d9cb4 Merge branch 'fixmem' of UBB/sort into master 2018-11-17 15:19:17 -03:00
aeb5a8d958
fix memory leak 2018-11-17 15:18:27 -03:00
03c1305f57 Make bitonic work for non powers of 2 (#24) 2018-11-17 15:12:24 -03:00
ca5946b92a Merge branch 'cleanup' of UBB/sort into master 2018-11-17 13:36:44 -03:00
18fc551db3
cleanup files 2018-11-17 13:35:31 -03:00
429ef47a78
make swap function shared between sorting algorithms 2018-11-17 13:35:16 -03:00
c32dd469d0
make timer display show hours and minutes 2018-11-17 13:34:25 -03:00
c4d22ac4da Merge branch 'selection_sort' of UBB/sort into master 2018-11-17 11:56:20 -03:00
e41b6e9b1b
resolve conflicts 2018-11-17 11:55:26 -03:00
bc9a6573da Merge branch 'limits' of UBB/sort into master 2018-11-17 11:40:14 -03:00
a91f3e2b59 agregar bitonicsort for a power of 2 2018-11-16 14:37:39 -03:00
bdb847e6d9
check input of n and values from stdin 2018-11-16 13:25:47 -03:00
67aab5f842 selectionsort 2018-11-16 09:41:22 -03:00
ff5f118989 Merge branch 'fixtest' of UBB/sort into master 2018-11-14 20:21:54 -03:00
a04bf8a8e0
fix fprintf in tests 2018-11-14 20:21:15 -03:00
d65c8fbb33 Merge branch 'fixprint' of UBB/sort into master 2018-11-14 20:18:35 -03:00
9980b9491b
fix fprintf 2018-11-14 20:17:41 -03:00
ab5e427460 Merge branch 'mergesort' of UBB/sort into master 2018-11-14 20:13:09 -03:00
0f6c3f3b53 Merge branch 'cleanquicksort' of UBB/sort into master 2018-11-14 20:12:12 -03:00
81cceab40c Merge branch 'updatereadme' of UBB/sort into master 2018-11-14 20:11:14 -03:00
38ec48f814 Merge branch 'checkmemory' of UBB/sort into master 2018-11-14 20:10:35 -03:00
d0b5e27c17
clean up quick sort source files 2018-11-14 18:06:41 -03:00
0875b5ffba
add missing doc 2018-11-14 17:57:01 -03:00
0fa4c08a72
implement merge sort 2018-11-14 17:53:45 -03:00
74b9b9131c
update readme information 2018-11-14 16:32:07 -03:00
1024e6f8dc
add check to malloc calls 2018-11-14 16:21:26 -03:00
fa78806865 Merge branch 'fgets' of UBB/sort into master 2018-11-13 12:25:40 -03:00
7baa09423d
merge changes 2018-11-13 12:25:09 -03:00
d2412aea42 Merge branch 'countsort' of UBB/sort into master 2018-11-13 12:20:51 -03:00
f2763bf41f
merge changes 2018-11-13 12:20:01 -03:00
57cbc0cc4b Merge remote-tracking branch 'origin/master' into fgets 2018-11-13 12:10:00 -03:00
9350a8c887 Merge branch 'quicksort' of UBB/sort into master 2018-11-13 12:03:12 -03:00
047cc09008 Agregación de Quick_Sort 2018-11-13 11:59:21 -03:00
a43a470e7f
allow all algorithms to be run or a mix of them 2018-11-13 11:27:16 -03:00
6b395a8b0a
add missing doc 2018-11-13 09:18:03 -03:00
051d2b22cd
remove extra include 2018-11-13 09:16:15 -03:00
601b3c95ca
add count sort 2018-11-13 09:15:33 -03:00
9f99802fae
show when timer stops 2018-11-12 18:31:00 -03:00
ff70e7df27
fix buffer overflow 2018-11-12 18:29:51 -03:00
e3f5691462 Merge branch 'fixinput' of UBB/sort into master 2018-11-12 14:54:41 -03:00
f56d1195d5 Merge branch 'fixinput' of https://git.cromer.cl/UBB/sort into fixinput 2018-11-12 14:52:46 -03:00
7bb163ae33 fix problem when invalid data is passed via stdin 2018-11-12 14:52:24 -03:00
5ed1fe740e Merge branch 'optimizetest' of UBB/sort into master 2018-11-12 14:50:41 -03:00
d9aab389a1
fix problem when invalid data is passed via stdin 2018-11-12 14:46:02 -03:00
a6731de4cd
exit loop at fail 2018-11-12 14:19:47 -03:00
b1a97f34d9 Merge branch 'fixprint' of UBB/sort into master 2018-11-11 20:16:41 -03:00
a31eababb7
fix generation of random numbers to be more dynamic 2018-11-11 20:15:30 -03:00