Skip to content

Commit dc4ee90

Browse files
philiphoangphiliphoang
committed
Devlis implementert MergeSort, mangler visualiseringsdelen
1 parent c4b477c commit dc4ee90

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+36337
-0
lines changed

‎PortJob/MergeSort/.idea/MergeSort.iml‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎PortJob/MergeSort/.idea/modules.xml‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎PortJob/MergeSort/.idea/typescript-compiler.xml‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎PortJob/MergeSort/.idea/vcs.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎PortJob/MergeSort/.idea/workspace.xml‎

Lines changed: 486 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎PortJob/MergeSort/MergeSort.html‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<title>MergeSort</title>
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
6+
<!-- Bootstrap -->
7+
<link href="css/bootstrap.min.css" rel="stylesheet" media="screen">
8+
<link href="css/style.css" rel="stylesheet">
9+
10+
<!-- Insert this line above script imports -->
11+
<script>if (typeof module === 'object') {
12+
window.module = module; module = undefined;
13+
}</script>
14+
15+
<script src="js/jquery.min.js"></script>
16+
<script src="js/jquery-ui-1.12.0/jquery-ui.min.js"></script>
17+
<script src="js/bootstrap.min.js"></script>
18+
19+
<script src="js/methods.js"></script>
20+
<script src="js/arrowMethods.js"></script>
21+
<script src="js/view.js"></script>
22+
<script src="js/MergeSortAlgorithm.js"></script>
23+
<script src="js/eventManager.js"></script>
24+
25+
26+
<!-- For debugging -->
27+
<!-- <script type='text/js' src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script> -->
28+
29+
<!-- Insert this line after script imports -->
30+
<script>if (window.module) module = window.module;</script>
31+
<script> startMergeSort();</script>
32+
</head>
33+
34+
35+
<body>
36+
<div class="container text-center">
37+
<img id="paused" class="pauseIcon" src="assets/pause.png"/>
38+
<h1 id="header">MergeSort</h1>
39+
<div id="array" class="row insertionSort">
40+
<div id="indices"></div>
41+
<ul id='arrayUl' class='insElements'>
42+
<img id="leftBracket" class="bracket" src="assets/square_left.png"/>
43+
<img id="rightBracket" class="bracket" src="assets/square_right.png"/>
44+
<div id="leftArrow" class="arrow hidden"><img src="assets/up_arrow.png"/><div class="arrowText"></div></div>
45+
</ul>
46+
</div>
47+
<script src="js/fillWithListElements.js"></script>
48+
<br>
49+
<div class="row underArray">
50+
51+
<button id="togglePause" class="btn btn-primary" onclick="viewer.pause()">Play/Pause</button>
52+
<button id="backward" class="btn btn-primary" onclick="viewer.backward()">Backward</button>
53+
<button id="forward" class="btn btn-primary" onclick="viewer.forward()">Forward</button>
54+
<!-- TODO: speed buttons -->
55+
</div>
56+
<br>
57+
<div class="row">
58+
<button id="start" class="btn btn-primary" onclick="startMergeSort()">Merge</button>
59+
<!-- TODO: Play if paused -->
60+
<button id="random" class="btn btn-primary" onclick="getArray('random')">Random</button>
61+
<button id="almost" class="btn btn-primary" onclick="getArray('amostSorted')">Almost Sorted</button>
62+
<button id="sorted" class="btn btn-primary" onclick="getArray('sorted')">Sorted</button>
63+
<button id="invertedSorted" class="btn btn-primary" onclick="getArray('inverted')">Inverted Sorted</button>
64+
</div>
65+
66+
</div>
67+
68+
</body>
69+
</html>

‎PortJob/MergeSort/assets/pause.png‎

2.17 KB
Loading

‎PortJob/MergeSort/assets/square_left.png‎

7.06 KB
Loading

‎PortJob/MergeSort/assets/square_right.png‎

6.63 KB
Loading

‎PortJob/MergeSort/assets/up_arrow.png‎

294 Bytes
Loading

0 commit comments

Comments
 (0)