Skip to content

Add TWMS (Three-Way Merge Sort) #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GenericCherrySwitch wants to merge 127 commits into
base: master
Choose a base branch
from
Open

Add TWMS (Three-Way Merge Sort) #17

Changes from 1 commit
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
ea0f14b
Revamped Array Visualizer - More features, more streamlined, more use…
MusicTheorist Jun 2, 2019
9b85b33
Upload .jar
MusicTheorist Jun 2, 2019
2ef3314
Update README.md
MusicTheorist Jun 2, 2019
a44967c
Removed extra files
MusicTheorist Jun 2, 2019
8b77be0
Merge branch 'master' of https://github.com/MusicTheorist/ArrayVisual…
MusicTheorist Jun 2, 2019
c006bd3
Update README.md
MusicTheorist Jun 2, 2019
632e443
Update README.md
MusicTheorist Jun 2, 2019
4794f5a
Update GrailSort.java
MusicTheorist Jun 2, 2019
0a2ba6b
Update GrailSort.java
MusicTheorist Jun 2, 2019
6c78f58
Update README.md
MusicTheorist Jun 2, 2019
7a33fbb
Quick Sort fixed, imports cleaned
MusicTheorist Jun 3, 2019
2c177af
Merge branch 'master' of https://github.com/MusicTheorist/ArrayVisual…
MusicTheorist Jun 3, 2019
c9082a3
Bugs fixed
MusicTheorist Jun 3, 2019
ee44407
Update README.md
MusicTheorist Jun 3, 2019
f52bc10
Added visuals, optimizations, and bug fixes.
MusicTheorist Jun 6, 2019
dcaa4e2
Merge branch 'master' of https://github.com/MusicTheorist/ArrayVisual…
MusicTheorist Jun 6, 2019
82a0744
Update README.md
MusicTheorist Jun 6, 2019
2a3de23
Delete ArrayController.java
MusicTheorist Jun 6, 2019
89f056f
Delete different branch directories
MusicTheorist Jun 6, 2019
b6d4830
Merge branch 'master' of https://github.com/MusicTheorist/ArrayVisual…
MusicTheorist Jun 6, 2019
e84d32a
Indentations and imports.
MusicTheorist Jun 6, 2019
a3eb762
Update README.md
MusicTheorist Jun 6, 2019
e85f074
Array size slider
MusicTheorist Jun 8, 2019
e2995b8
Merge branch 'master' of https://github.com/MusicTheorist/ArrayVisual…
MusicTheorist Jun 8, 2019
522bcf2
Bug fixes
MusicTheorist Jun 8, 2019
62c47fa
Circular pointer bug fix
MusicTheorist Jun 9, 2019
f02484a
More bug fixes
MusicTheorist Jun 9, 2019
6b44dd0
Even more bug fixes
MusicTheorist Jun 10, 2019
ca34f5f
Reimplemented grailShift
MusicTheorist Jun 10, 2019
930783f
Volume in Run All fix
MusicTheorist Jun 10, 2019
7a30ac3
Pigeonhole Sort fix
MusicTheorist Jun 10, 2019
7a6f2aa
More bug fixes
MusicTheorist Jun 10, 2019
7f686e6
Shatter Sort patched
MusicTheorist Jun 10, 2019
feb98dc
Removed grailShift
MusicTheorist Jun 15, 2019
d88952a
Out of range error fixed
GeorgiiFirsov Jul 13, 2019
ff46cc3
Merge pull request #1 from GeorgyFirsov/patch-1
MusicTheorist Jul 13, 2019
623f9db
Delete manifest.mf
MusicTheorist Jul 29, 2019
49e761d
version 2.0
MusicTheorist Oct 13, 2019
cb714c2
resolving merge conflict
MusicTheorist Oct 13, 2019
77d0fff
version 2.0
MusicTheorist Oct 13, 2019
ad749f5
resetting repository
MusicTheorist Oct 13, 2019
e16114d
version 2.0
MusicTheorist Oct 13, 2019
1696c14
Update README.md
MusicTheorist Oct 13, 2019
c9de9b8
Update README.md
MusicTheorist Oct 13, 2019
4a36d68
Update README.md
MusicTheorist Oct 13, 2019
0bb4565
Update README.md
MusicTheorist Oct 13, 2019
70b0b3b
Update README.md
MusicTheorist Oct 13, 2019
a386d20
Update README.md
MusicTheorist Oct 13, 2019
d09fa1d
Update README.md
MusicTheorist Oct 13, 2019
ad8261f
Update README.md
MusicTheorist Oct 13, 2019
7ef3da4
Update README.md
MusicTheorist Oct 13, 2019
62e9759
Update README.md
MusicTheorist Oct 13, 2019
83c7e7e
Update README.md
MusicTheorist Oct 13, 2019
5646e5a
Update README.md
MusicTheorist Oct 13, 2019
d95ba5d
Update README.md
MusicTheorist Oct 13, 2019
3703b60
Update README.md
MusicTheorist Oct 13, 2019
7c3f535
Update README.md
MusicTheorist Oct 13, 2019
dce6447
ant build script; dist/jar without errors; new path for classgraph
MusicTheorist Oct 13, 2019
421032c
Merge branch 'master' of https://github.com/MusicTheorist/ArrayVisual…
MusicTheorist Oct 13, 2019
afe9a94
Update README.md
MusicTheorist Oct 13, 2019
37fdd02
Update README.md
MusicTheorist Oct 13, 2019
1c0285f
Update README.md
MusicTheorist Oct 13, 2019
d3f6c7a
updated classpath
MusicTheorist Oct 13, 2019
f2697a6
Merge branch 'master' of https://github.com/MusicTheorist/ArrayVisual…
MusicTheorist Oct 13, 2019
d6bcdeb
remove old classgraph dir
MusicTheorist Oct 13, 2019
b13a54b
replacing new lines
MusicTheorist Oct 13, 2019
bb5dd78
Update README.md
MusicTheorist Oct 13, 2019
d2f3ccb
Update README.md
MusicTheorist Oct 13, 2019
c121877
updated runnable .jar
MusicTheorist Oct 14, 2019
8a6beda
Merge branch 'master' of https://github.com/MusicTheorist/ArrayVisual…
MusicTheorist Oct 14, 2019
7057f1e
second attempt fixing build script & runnable .jar
MusicTheorist Oct 14, 2019
6530f4b
fix readme
MusicTheorist Oct 14, 2019
81a64f4
fix readme
MusicTheorist Oct 14, 2019
8a5eed3
new sorts and minor bug fixes
MusicTheorist Oct 19, 2019
552710f
Revert README
MusicTheorist Oct 19, 2019
fd885b3
Fix license
MusicTheorist Oct 19, 2019
e5ee5e4
Update README.md
MusicTheorist Oct 19, 2019
86207bc
Update README.md
MusicTheorist Oct 19, 2019
62bedeb
Update README.md
MusicTheorist Oct 19, 2019
d110ce8
Update README.md
MusicTheorist Oct 19, 2019
427b5fb
Corrected spelling of auxiliary
Felthry Apr 30, 2020
81ac7db
version 3.0
MusicTheorist May 22, 2020
1465ce6
Merge pull request #5 from Felthry/master
MusicTheorist May 22, 2020
5aa2169
Update README.md
MusicTheorist May 22, 2020
c1286a3
Update README.md
MusicTheorist May 22, 2020
7e5a7d0
Update README.md
MusicTheorist May 22, 2020
808f7fb
better changelog
MusicTheorist May 22, 2020
13ca1d8
better changelog
MusicTheorist May 22, 2020
718492f
minor change to .classpath
MusicTheorist May 22, 2020
43143d4
version 3.01
MusicTheorist May 22, 2020
800d659
version 3.1
MusicTheorist May 30, 2020
738a3df
version 3.1 readme
MusicTheorist May 30, 2020
990c7cf
add flipped min heap sort
landfillbaby May 23, 2020
1df1839
Merge pull request #6 from landfillbaby/master
MusicTheorist May 30, 2020
f04b130
finishing touches on version 3.1
MusicTheorist May 30, 2020
c9183ea
Update README.md
MusicTheorist May 30, 2020
e6d22a5
webhook test
MusicTheorist May 30, 2020
32695de
Merge branch 'master' of https://github.com/MusicTheorist/ArrayVisual…
MusicTheorist May 30, 2020
c7c2d88
version 3.11
MusicTheorist Jun 3, 2020
7ddcd43
changelog and remove unused import
MusicTheorist Jun 3, 2020
9680ca2
version 3.12
MusicTheorist Jun 4, 2020
466a1a7
v3.12 changelog
MusicTheorist Jun 4, 2020
6c7001f
version 3.2
MusicTheorist Jun 5, 2020
f668896
v3.12 changelog
MusicTheorist Jun 5, 2020
a6bfebd
port of @ceorron's Zip Sort
landfillbaby Jun 4, 2020
ce3d815
Merge pull request #7 from landfillbaby/master
MusicTheorist Jun 5, 2020
5c0c200
EXPERIMENTAL: Zipsorts
MusicTheorist Jun 5, 2020
c968a59
remove zipsorts
MusicTheorist Jun 5, 2020
f897d97
fix bogosorting
MusicTheorist Jun 5, 2020
cf1a04d
add /bin/ to .gitignore to comply with `ant clean` (#9)
landfillbaby Jun 8, 2020
3ddff65
Rename Java.xml to build.xml
MusicTheorist Jun 8, 2020
ca71239
Update README.md
MusicTheorist Jun 8, 2020
7a70b06
version 3.5
MusicTheorist Jun 8, 2020
a0ccf10
version 3.5 changelog
MusicTheorist Jun 8, 2020
df95d0b
Update README.md
MusicTheorist Jun 8, 2020
e88e8c0
Text Drop Shadow
aphitorite Jun 12, 2020
5ebb2b4
Merge pull request #49 from aphitorite/611-2
MusicTheorist Jun 12, 2020
74af3a6
Refactor Tree Sort
aphitorite Jun 15, 2020
3631533
Merge pull request #70 from aphitorite/614
MusicTheorist Jun 20, 2020
af0fde1
don't bother with classgraph's javadoc and sources
landfillbaby Jun 8, 2020
91f0b09
Fix
aphitorite Jun 21, 2020
2ec1666
don't compile *_disabled.java, disable SkaSort
landfillbaby Aug 11, 2020
7e91488
fix build for real this time
landfillbaby Aug 11, 2020
a87fba6
Merge pull request #76 from aphitorite/621
MusicTheorist Aug 24, 2020
feb3e74
Fix MergeSorting
aphitorite Aug 26, 2020
8c32d2d
add discord link
MusicTheorist Dec 24, 2020
ff9d8ea
Update README.md
MusicTheorist May 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update README.md
  • Loading branch information
@MusicTheorist
MusicTheorist authored Jun 6, 2019
commit 82a07448fa4815ffbb0da588598fe4ed2594b317
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# w0rthy's Array Visualizer - Revamped
54 sorting algorithms demonstrated through 5 unique graphic designs
54 sorting algorithms demonstrated through 10 unique graphic designs

This new version of the program features new additions inspired by Timo Bingmann's "The Sound of Sorting" and w0rthy's original visualizer.

Expand All @@ -14,6 +14,8 @@ This new version of the program features new additions inspired by Timo Bingmann
- Toggle Timo Bingmann's "end sweep" animation
- Refactored / optimized code

**If you are experiencing performance issues in Windows 10, look here: https://superuser.com/questions/988379/how-do-i-run-java-apps-upscaled-on-a-high-dpi-display

An executable .jar file is available in the dist folder. Have fun!

Videos this program is featured in:
Expand Down