Skip to content

Commit 85a592a

Browse files
committed
Vet ikke hva som skjer, men må gjør det igjen? :(
1 parent c4a568e commit 85a592a

File tree

8 files changed

+250
-71
lines changed

8 files changed

+250
-71
lines changed

Kruskal/.idea/workspace.xml

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

Kruskal/css/style.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ body {
1212
overflow: hidden;
1313
}
1414

15-
div#graphUI.dfs {
16-
width: 50%;
15+
div#graphUI.kruskal {
16+
width: 80%;
1717
border: solid 3px #b6b6b6;
1818
border-radius: 10px;
1919
}
@@ -38,7 +38,7 @@ div#queueUI {
3838
padding-left: 30px;
3939
padding-top: 30px;
4040
padding-bottom: 15px;
41-
width: 20%;
41+
width: 50%;
4242
}
4343

4444
.right-bottom {

Kruskal/index.html

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,31 @@
66
<link rel="stylesheet" type="text/css" href="css/style.css"/>
77
<script src="js/jquery.min.js"></script>
88
<script src="js/bootstrap.min.js"></script>
9+
<script src="js/Methods.js"></script>
10+
<script src="js/View.js"></script>
911
<script src="js/graphController.js"></script>
10-
<script src="js/EventManager.js"></script>
12+
<script src="Bjs/EventManager.js"></script>
13+
<script src="js/KruskalAlgorithm.js"></script>
1114
<meta name="viewport" content="width=device-width, initial-scale=1">
1215

1316
</head>
1417

1518
<body>
1619
<script src="js/graphUI.js"></script>
1720

18-
<div id="graphUI" class="main-container dfs">
21+
<div id="graphUI" class="main-container kruskal">
1922
<svg id="edgeSvg" height="100%" width="100%"></svg>
2023
</div>
2124

2225
<div id="buttonDiv" class="bottom-container left-bottom">
2326
<!-- Testing: Creating a already defined graph -->
24-
<button id="graph" class="my-button" onclick="exampleGraph1()">Create</button>
25-
<button id="graph" class="my-button" onclick="highlightMe()">Create</button>
26-
<button id="kruskal" class="my-button" onclick="startKruskal(0);">Run</button>
27+
<button id="kruskal" class="my-button" onclick="manager.start()">Start</button>
28+
<button id="graph" class="my-button" onclick="highlightMe();">Highlight</button>
2729
<button id="prev" class="my-button" onclick="manager.previous();">Previous</button>
2830
<button id="next" class="my-button" onclick="manager.next();">Next</button>
2931
<button id="reset" class="my-button" onclick="resetGraph();">Reset</button>
3032
</div>
3133

32-
34+
<script>startKruskal(0);</script>
3335
</body>
3436
</html>

Kruskal/js/KruskalAlgorithm.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
"use strict";
12
/**
23
* File created by Philip Hoang 21.03.18
34
*/

Kruskal/js/Methods.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
"use strict";
12
///<reference path="graphUI.ts"/>
23
///<reference path="graphController.ts"/>
34
///<reference path="View.ts"/>

Kruskal/js/View.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
"use strict";
12
///<reference path="KruskalAlgorithm.ts"/>
23
///<reference path="graphController.ts"/>
34
///<reference path="graphUI.ts"/>

Kruskal/js/graphController.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
"use strict";
12
/**
23
* File created by Knut Anders Stokke, Kristiand Rosland, Ragnhild AAlvik
34
* Modified by Philip Hoang 21.03.2018

Kruskal/js/graphUI.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
"use strict";
12
///<reference path="graphController.ts"/>
23
///<reference path="KruskalAlgorithm.ts"/>
34
///<reference path="View.ts"/>

0 commit comments

Comments
 (0)