Bugfixes og fjernet død kode

Author: theghostrecords

UnionFind/js/Controller.js

@@ -26,19 +26,16 @@ var Controller = /** @class */ (function () {
     };
     Controller.prototype.connected = function (firstIndex, secondIndex) {
         viewer.screenLockThis(true);
-        //Kossen gjør eg detta?? - fixed tror jeg
         this.algorithm.connected(firstIndex, secondIndex);
         viewer.screenLockThis(false);
     };
     Controller.prototype.union = function (firstIndex, secondIndex) {
         viewer.screenLockThis(true);
-        //samme som over - fixed tror jeg
         this.algorithm.union(firstIndex, secondIndex);
         viewer.screenLockThis(false);
     };
     Controller.prototype.find = function (index) {
         viewer.screenLockThis(true);
-        //SEND HELP PLEASE
         this.algorithm.find(index);
         viewer.screenLockThis(false);
     };
@@ -57,9 +54,6 @@ var Controller = /** @class */ (function () {
     Controller.prototype.highlightNode = function (index, color) {
         viewer.highlightThisNode(index, color);
     };
-    Controller.prototype.invertPauseState = function () {
-        this.algorithm.invertPause();
-    };
     Controller.prototype.setAlgorithm = function (algo) {
         this.algorithm = algo;
     };

UnionFind/js/Controller.ts

@@ -11,12 +11,10 @@ let jColor = 0;
 
 class Controller {
 
-    //algorithm og methodToUse skal ikke være string, men dei e det for nå
-    //programmet vil ikje fungere
     private algorithm: IAlgorithm;
     private methodToUse: string = "Union";
     private speed: number;
-    private GUI: IView; // Mulig forskjellig View for ulike algoritmer?
+    private GUI: IView;
 
     initController(algo: IAlgorithm) {
         manager.start();
@@ -36,21 +34,18 @@ class Controller {
 
     connected(firstIndex: number, secondIndex: number) {
         viewer.screenLockThis(true);
-        //Kossen gjør eg detta?? - fixed tror jeg
         this.algorithm.connected(firstIndex, secondIndex);
         viewer.screenLockThis(false);
     }
 
     union(firstIndex: number, secondIndex: number) {
         viewer.screenLockThis(true);
-        //samme som over - fixed tror jeg
         this.algorithm.union(firstIndex, secondIndex);
         viewer.screenLockThis(false);
     }
 
     find(index: number) {
         viewer.screenLockThis(true);
-        //SEND HELP PLEASE
         this.algorithm.find(index);
         viewer.screenLockThis(false);
     }
@@ -75,10 +70,6 @@ class Controller {
         viewer.highlightThisNode(index, color);
     }
 
-    invertPauseState() {
-        this.algorithm.invertPause();
-    }
-
     setAlgorithm(algo: IAlgorithm) {
         this.algorithm = algo;
     }

UnionFind/js/EventManager.js

@@ -43,6 +43,12 @@ var EventManager = /** @class */ (function () {
     EventManager.prototype.pause = function () {
         clearInterval(this.eventThread);
     };
+    EventManager.prototype.clear = function () {
+        this.pause();
+        this.nextEvents = [];
+        this.previousEvents = [];
+        this.start();
+    };
     return EventManager;
 }());
 var FrontendEvent = /** @class */ (function () {
@@ -54,15 +60,3 @@ var FrontendEvent = /** @class */ (function () {
     return FrontendEvent;
 }());
 var manager = new EventManager();
-/*
-/** How to add FrontendEvents to manager
-for(var i=0; i<10; i++) {
-    var f = function(k) {
-        return function() {console.log("Going forward, step " + k);};
-    }(i);
-    var b = function(k) {
-        return function() {console.log("Going backward, step " + k);}
-    }(i);
-    manager.addEvent(new FrontendEvent(f,b));
-}
-*/

UnionFind/js/EventManager.ts

@@ -3,14 +3,14 @@
  *
  */
 
-declare var $ : any;
+declare var $: any;
 
 /** Manager for events stored in queue. Manager is also responsible for executing events automatically */
 class EventManager {
-    delayTime:number = 400; // Original value
-    nextEvents:FrontendEvent[] = [];
-    previousEvents:FrontendEvent[] = [];
-    eventThread : number;
+    delayTime: number = 400; // Original value
+    nextEvents: FrontendEvent[] = [];
+    previousEvents: FrontendEvent[] = [];
+    eventThread: number;
 
     // Executing the next event in the queue, adding it to 'previous'
     next() {
@@ -29,51 +29,45 @@ class EventManager {
     previous() {
         if (this.previousEvents.length == 0)
             return;
-        var event :FrontendEvent = (<FrontendEvent>this.previousEvents.pop());
+        var event: FrontendEvent = (<FrontendEvent>this.previousEvents.pop());
         //this.delayTime = 0; //TODO: Should there be a delay when stepping backwards?
         event.previous();
         this.nextEvents.unshift(event);
     }
 
-    addEvent(event : FrontendEvent) {
+    addEvent(event: FrontendEvent) {
         this.nextEvents.push(event);
     }
 
     start() {
         clearInterval(this.eventThread);
         var manager = this; // Anonymous functions cannot access this...
-        this.eventThread = setInterval(function() {
+        this.eventThread = setInterval(function () {
             manager.next();
-        },  manager.delayTime);
+        }, manager.delayTime);
     }
 
     pause() {
         clearInterval(this.eventThread);
     }
+
+    clear(): void {
+        this.pause();
+        this.nextEvents = [];
+        this.previousEvents = [];
+        this.start();
+    }
 }
 
 class FrontendEvent {
-    next : Function;
-    previous : Function;
-    duration:number;
-    constructor(n : Function, p : Function, d:number) {
+    next: Function;
+    previous: Function;
+    duration: number;
+    constructor(n: Function, p: Function, d: number) {
         this.next = n;
         this.previous = p;
         this.duration = d;
     }
 }
 
-var manager:EventManager = new EventManager();
-
-/*
-/** How to add FrontendEvents to manager
-for(var i=0; i<10; i++) {
-    var f = function(k) {
-        return function() {console.log("Going forward, step " + k);};
-    }(i);
-    var b = function(k) {
-        return function() {console.log("Going backward, step " + k);}
-    }(i);
-    manager.addEvent(new FrontendEvent(f,b));
-}
-*/
+var manager: EventManager = new EventManager();

UnionFind/js/IAlgorithm.ts

@@ -26,18 +26,6 @@ interface IAlgorithm {
      */
     getArray(): number[];
 
-    /**
-     *  Called when the pause-button (SPACE) is hit
-     *  Sets the pause variable to !pause
-     */
-    invertPause(): void;
-
-    /**
-     *  Set the Controller for this algorithm
-     * @param Controller
-     */
-    setController(control: Controller): void;
-
     /**
      *  Set the current state of the algorithm to the given array
      * @param array

UnionFind/js/QuickFind.js

@@ -1,6 +1,6 @@
 /**
  * File created by Philip Hoang 06.2.
- * written by Øyvind ;););)
+ * written by Øyvind
  * based on QuickFind.Java
  */
 ///<reference path="Controller.ts"/>
@@ -13,29 +13,22 @@ var QuickFind = /** @class */ (function () {
         for (var i = 0; i < size; i++) {
             this.arr[i] = i;
         }
-        this.pause = false;
     }
     QuickFind.prototype.union = function (aIndex, bIndex) {
         var aRoot = this.arr[aIndex];
         var bRoot = this.arr[bIndex];
         if (aRoot == bRoot) {
-            this.delay(this.getDelayTime() * 2);
             control.setSelectedIndex(aIndex, false);
             control.setSelectedIndex(bIndex, false);
             return;
         }
         control.saveState(this.arr);
         for (var i = 0; i < this.arr.length; i++) {
-            while (this.pause) {
-                this.delay(this.getDelayTime());
-            }
             control.setArrow(i);
-            this.delay(this.getDelayTime());
             if (this.arr[i] == aRoot) {
                 control.setValueAtIndex(i, bRoot);
                 control.connectNodes(i, bRoot);
                 this.arr[i] = bRoot;
-                this.delay(this.getDelayTime());
             }
         }
         control.setArrow(-1);
@@ -51,30 +44,19 @@ var QuickFind = /** @class */ (function () {
         }
         else
             control.redCross(aIndex, bIndex, true);
-        this.delay(this.getDelayTime());
-        this.removeHighlighFromRoot(aIndex);
-        this.removeHighlighFromRoot(bIndex);
+        control.setSelectedIndex(bIndex, false);
+        control.removeHighlight(this.arr[bIndex]);
+        control.setSelectedIndex(aIndex, false);
+        control.removeHighlight(this.arr[aIndex]);
         control.checkMark(aIndex, bIndex, false);
         control.redCross(aIndex, bIndex, false);
         return connected;
     };
     QuickFind.prototype.getName = function () {
         return this.name;
     };
-    QuickFind.prototype.removeHighlighFromRoot = function (pIndex) {
-        control.removeHighlight(this.arr[pIndex]);
-    };
-    QuickFind.prototype.delay = function (delayTime) {
-        /*
-        let start = new Date().getTime();
-        for (let i = 0; i < 1e7; i++) {
-            if ((new Date().getTime() - start) > delayTime)
-                break;
-        }*/
-    };
     QuickFind.prototype.find = function (pIndex) {
         var root = this.simpleFind(pIndex, "green");
-        this.delay(this.getDelayTime());
         control.removeHighlight(root);
         control.setSelectedIndex(pIndex, false);
         return root;
@@ -83,7 +65,6 @@ var QuickFind = /** @class */ (function () {
         var root = this.arr[pIndex];
         if (pIndex != root) {
             control.highlightNode(pIndex, "orange");
-            this.delay(this.getDelayTime());
             control.removeHighlight(pIndex);
         }
         control.highlightNode(root, color);
@@ -95,20 +76,11 @@ var QuickFind = /** @class */ (function () {
     QuickFind.prototype.setArray = function (array) {
         this.arr = array;
     };
-    QuickFind.prototype.isPause = function () {
-        return this.pause;
-    };
-    QuickFind.prototype.invertPause = function () {
-        this.pause = !this.pause;
-    };
     QuickFind.prototype.connectedNoGUIUpdate = function (a, b) {
         return this.arr[a] == this.arr[b];
     };
     QuickFind.prototype.getDelayTime = function () {
         return this.DELAY + control.getSpeed();
     };
-    QuickFind.prototype.setController = function (control) {
-        //
-    };
     return QuickFind;
 }());