Merge branch 'master' of https://github.com/kennidenni/INF219

theghostrecords · theghostrecords · commit c8fbd13165eb · 2018-04-12T17:00:29.000+02:00
diff --git a/Kruskal/js/Controller.js b/Kruskal/js/Controller.js
@@ -10,33 +10,15 @@
 var Controller = /** @class */ (function () {
     function Controller() {
     }
-    Controller.prototype.addNode = function (x, y) {
-        viewer.addNodeToGraph(x, y);
+    Controller.prototype.highlightEdge = function (node1, node2, edgeId, weight) {
+        viewer.setHighlightEdge(node1, node2, edgeId, weight);
     };
-    Controller.prototype.connectTwoNodes = function (node1, node2) {
-        viewer.connectTheseNodes(node1, node2);
-    };
-    Controller.prototype.resetGraph = function () {
-        viewer.resetMyAll();
-    };
-    Controller.prototype.highlightMyEdge = function (edgeId, weight) {
-        viewer.setHighlightEdge(edgeId, weight);
-    };
-    Controller.prototype.dehighlightMyEdge = function (edgeId) {
-        viewer.setDehighlightEdge(edgeId);
-    };
-    Controller.prototype.removeMyEdge = function (edgeId) {
-        viewer.removeEdge(edgeId);
+    Controller.prototype.dehighlightEdge = function (node1, node2, edgeId) {
+        viewer.dehighlightEdge(node1, node2, edgeId);
     };
     Controller.prototype.selectTwoNodes = function (node1, node2) {
         viewer.selectTheseNodes(node1, node2);
     };
-    Controller.prototype.deselectTwoNodes = function (node1, node2) {
-        viewer.deselectTheseNodes(node1, node2);
-    };
-    Controller.prototype.excludeEdgeText = function (index) {
-        viewer.excludeText(index);
-    };
     Controller.prototype.excludeEdges = function (edgeList) {
         viewer.excludeEdges(edgeList);
     };
diff --git a/Kruskal/js/Controller.ts b/Kruskal/js/Controller.ts
@@ -10,42 +10,18 @@
     ///<reference path="Methods.ts"/>
 
 class Controller {
-    addNode(x: number, y: number) {
-        viewer.addNodeToGraph(x, y);
+    highlightEdge(node1: number, node2: number, edgeId: number, weight: number) {
+        viewer.setHighlightEdge(node1, node2, edgeId, weight);
     }
 
-    connectTwoNodes(node1: number, node2: number) {
-        viewer.connectTheseNodes(node1, node2);
-    }
-
-    resetGraph() {
-        viewer.resetMyAll();
-    }
-
-    highlightMyEdge(edgeId: number, weight: number) {
-        viewer.setHighlightEdge(edgeId, weight);
-    }
-
-    dehighlightMyEdge(edgeId: number) {
-        viewer.setDehighlightEdge(edgeId);
-    }
-
-    removeMyEdge(edgeId: number) {
-        viewer.removeEdge(edgeId);
+    dehighlightEdge(node1: number, node2: number, edgeId: number) {
+        viewer.dehighlightEdge(node1, node2, edgeId);
     }
 
     selectTwoNodes(node1: number, node2: number) {
         viewer.selectTheseNodes(node1, node2);
     }
 
-    deselectTwoNodes(node1: number, node2: number){
-        viewer.deselectTheseNodes(node1, node2);
-    }
-
-    excludeEdgeText(index: number) {
-        viewer.excludeText(index);
-    }
-
     excludeEdges(edgeList : any) {
         viewer.excludeEdges(edgeList);
     }
diff --git a/Kruskal/js/KruskalAlgorithm.js b/Kruskal/js/KruskalAlgorithm.js
@@ -26,17 +26,15 @@ function startKruskal() {
         }
         var _b = edgeList.pop(), node1 = _b[0], node2 = _b[1], weight = _b[2];
         currentEdge = getEdgeId(node1, node2);
+        controller.selectTwoNodes(node1, node2);
         if (connected(node1, node2) == false) {
-            controller.selectTwoNodes(node1, node2);
-            controller.highlightMyEdge(currentEdge, weight);
+            controller.highlightEdge(node1, node2, currentEdge, weight);
             union(node1, node2);
             j++;
         }
         else {
-            controller.dehighlightMyEdge(currentEdge);
-            controller.excludeEdgeText(currentEdge);
+            controller.dehighlightEdge(node1, node2, currentEdge);
         }
-        controller.deselectTwoNodes(node1, node2);
     }
     arr = [];
     queue = [];
diff --git a/Kruskal/js/KruskalAlgorithm.ts b/Kruskal/js/KruskalAlgorithm.ts
@@ -34,19 +34,18 @@ function startKruskal() {
 
         let [node1, node2, weight] = edgeList.pop();
         currentEdge = getEdgeId(node1, node2);
+        controller.selectTwoNodes(node1, node2);
 
         if (connected(node1, node2) == false) {
-            controller.selectTwoNodes(node1, node2);
-            controller.highlightMyEdge(currentEdge, weight);
-
+            controller.highlightEdge(node1, node2, currentEdge, weight);
             union(node1, node2);
             j++;
+
         } else {
-            controller.dehighlightMyEdge(currentEdge);
-            controller.excludeEdgeText(currentEdge);
+            controller.dehighlightEdge(node1, node2, currentEdge);
         }
-        controller.deselectTwoNodes(node1, node2);
     }
+
     arr = [];
     queue = [];
     currentEdge = 0;
diff --git a/Kruskal/js/Methods.js b/Kruskal/js/Methods.js
@@ -9,8 +9,13 @@ var MAX_NODES = 10;
 var edges = 0;
 var totalWeight = 0;
 function highlightThisEdge(index) {
+    //Blue
     $("#edge" + index).css({ "stroke": "rgb(16, 130, 219)", "stroke-width": "6" });
 }
+function selectThisEdge(index) {
+    //Orange
+    $("#edge" + index).css({ "stroke": "rgb(255, 165, 0)", "stroke-width": "6" });
+}
 function dehighlightThisEdge(index) {
     $("#edge" + index).css({ "stroke": "rgb(0, 0, 0)", "stroke-width": "2" });
 }
@@ -22,7 +27,7 @@ function transparentEdge(index) {
     $("#edge" + index).css({ "opacity": 0.15 });
     $("#edgeWeight" + index).css({ "opacity": 0.15 });
 }
-function deTransparentEdge(index) {
+function detransparentEdge(index) {
     $("#edge" + index).css({ "opacity": 1 });
     $("#edgeWeight" + index).css({ "opacity": 1 });
 }
@@ -36,7 +41,7 @@ function removeThisNode() {
     removeNode(--nodes);
 }
 function selectNodes(n1, n2, select) {
-    if (select == true) {
+    if (select) {
         $("#node" + n1).addClass("selected");
         $("#node" + n2).addClass("selected");
     }
@@ -114,11 +119,14 @@ function excludeEdgeText(i) {
 }
 function includeEdgeText(i) {
     $("#edgeContent" + i).css({ "opacity": 1 });
-    $("#edgeContent" + i).css({ "color": "black" });
+    dehighlightEdgeText(i);
 }
 function higlightEdgeText(i) {
     $("#edgeContent" + i).css({ "color": "blue" });
 }
-function deHighlightEdgeText(i) {
+function dehighlightEdgeText(i) {
     $("#edgeContent" + i).css({ "color": "black" });
 }
+function selectEdgeText(i) {
+    $("#edgeContent" + i).css({ "color": "orange" });
+}
diff --git a/Kruskal/js/Methods.ts b/Kruskal/js/Methods.ts
@@ -4,17 +4,22 @@
 ///<reference path="KruskalAlgorithm".ts"/>
 ///<reference path="exampleGraphs".ts"/>
 
-
 let randomWeight = 0;
 let nodes: number = 0;
 let MAX_NODES: number = 10;
 let edges: number = 0;
 let totalWeight: number = 0;
 
 function highlightThisEdge(index: number) {
+    //Blue
     $("#edge" + index).css({ "stroke": "rgb(16, 130, 219)", "stroke-width": "6" });
 }
 
+function selectThisEdge(index: number) {
+    //Orange
+    $("#edge" + index).css({ "stroke": "rgb(255, 165, 0)", "stroke-width": "6" });
+}
+
 function dehighlightThisEdge(index: number) {
     $("#edge" + index).css({ "stroke": "rgb(0, 0, 0)", "stroke-width": "2" });
 }
@@ -29,7 +34,7 @@ function transparentEdge(index: number) {
     $("#edgeWeight" + index).css({ "opacity": 0.15 });
 }
 
-function deTransparentEdge(index: number) {
+function detransparentEdge(index: number) {
     $("#edge" + index).css({ "opacity": 1 });
     $("#edgeWeight" + index).css({ "opacity": 1 });
 }
@@ -46,7 +51,7 @@ function removeThisNode() {
 }
 
 function selectNodes(n1: number, n2: number, select: boolean) {
-    if (select == true) {
+    if (select) {
         $("#node" + n1).addClass("selected");
         $("#node" + n2).addClass("selected");
     }
@@ -135,13 +140,17 @@ function excludeEdgeText(i: number) {
 
 function includeEdgeText(i: number) {
     $("#edgeContent" + i).css({ "opacity": 1 });
-    $("#edgeContent" + i).css({ "color": "black" });
+    dehighlightEdgeText(i);
 }
 
 function higlightEdgeText(i: number) {
     $("#edgeContent" + i).css({ "color": "blue" });
 }
 
-function deHighlightEdgeText(i: number) {
+function dehighlightEdgeText(i: number) {
     $("#edgeContent" + i).css({ "color": "black" });
-}
+}
+
+function selectEdgeText(i: number) {
+    $("#edgeContent" + i).css({ "color": "orange"});
+}
diff --git a/Kruskal/js/View.js b/Kruskal/js/View.js
diff --git a/Kruskal/js/View.ts b/Kruskal/js/View.ts

Original file line number	Diff line number	Diff line change
`@@ -26,17 +26,15 @@ function startKruskal() {`
`26`	`26`	`}`
`27`	`27`	`var _b = edgeList.pop(), node1 = _b[0], node2 = _b[1], weight = _b[2];`
`28`	`28`	`currentEdge = getEdgeId(node1, node2);`
	`29`	`+ controller.selectTwoNodes(node1, node2);`
`29`	`30`	`if (connected(node1, node2) == false) {`
`30`		`- controller.selectTwoNodes(node1, node2);`
`31`		`- controller.highlightMyEdge(currentEdge, weight);`
	`31`	`+ controller.highlightEdge(node1, node2, currentEdge, weight);`
`32`	`32`	`union(node1, node2);`
`33`	`33`	`j++;`
`34`	`34`	`}`
`35`	`35`	`else {`
`36`		`- controller.dehighlightMyEdge(currentEdge);`
`37`		`- controller.excludeEdgeText(currentEdge);`
	`36`	`+ controller.dehighlightEdge(node1, node2, currentEdge);`
`38`	`37`	`}`
`39`		`- controller.deselectTwoNodes(node1, node2);`
`40`	`38`	`}`
`41`	`39`	`arr = [];`
`42`	`40`	`queue = [];`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,13 @@ var MAX_NODES = 10;`
`9`	`9`	`var edges = 0;`
`10`	`10`	`var totalWeight = 0;`
`11`	`11`	`function highlightThisEdge(index) {`
	`12`	`+ //Blue`
`12`	`13`	`$("#edge" + index).css({ "stroke": "rgb(16, 130, 219)", "stroke-width": "6" });`
`13`	`14`	`}`
	`15`	`+function selectThisEdge(index) {`
	`16`	`+ //Orange`
	`17`	`+ $("#edge" + index).css({ "stroke": "rgb(255, 165, 0)", "stroke-width": "6" });`
	`18`	`+}`
`14`	`19`	`function dehighlightThisEdge(index) {`
`15`	`20`	`$("#edge" + index).css({ "stroke": "rgb(0, 0, 0)", "stroke-width": "2" });`
`16`	`21`	`}`
`@@ -22,7 +27,7 @@ function transparentEdge(index) {`
`22`	`27`	`$("#edge" + index).css({ "opacity": 0.15 });`
`23`	`28`	`$("#edgeWeight" + index).css({ "opacity": 0.15 });`
`24`	`29`	`}`
`25`		`-function deTransparentEdge(index) {`
	`30`	`+function detransparentEdge(index) {`
`26`	`31`	`$("#edge" + index).css({ "opacity": 1 });`
`27`	`32`	`$("#edgeWeight" + index).css({ "opacity": 1 });`
`28`	`33`	`}`
`@@ -36,7 +41,7 @@ function removeThisNode() {`
`36`	`41`	`removeNode(--nodes);`
`37`	`42`	`}`
`38`	`43`	`function selectNodes(n1, n2, select) {`
`39`		`- if (select == true) {`
	`44`	`+ if (select) {`
`40`	`45`	`$("#node" + n1).addClass("selected");`
`41`	`46`	`$("#node" + n2).addClass("selected");`
`42`	`47`	`}`
`@@ -114,11 +119,14 @@ function excludeEdgeText(i) {`
`114`	`119`	`}`
`115`	`120`	`function includeEdgeText(i) {`
`116`	`121`	`$("#edgeContent" + i).css({ "opacity": 1 });`
`117`		`- $("#edgeContent" + i).css({ "color": "black" });`
	`122`	`+ dehighlightEdgeText(i);`
`118`	`123`	`}`
`119`	`124`	`function higlightEdgeText(i) {`
`120`	`125`	`$("#edgeContent" + i).css({ "color": "blue" });`
`121`	`126`	`}`
`122`		`-function deHighlightEdgeText(i) {`
	`127`	`+function dehighlightEdgeText(i) {`
`123`	`128`	`$("#edgeContent" + i).css({ "color": "black" });`
`124`	`129`	`}`
	`130`	`+function selectEdgeText(i) {`
	`131`	`+ $("#edgeContent" + i).css({ "color": "orange" });`
	`132`	`+}`