Merge branch 'master' into 29-using-vitest-for-unit-testing

.vscode/settings.json

@@ -3,6 +3,7 @@
         "Anusha",
         "Huda",
         "jamesoswald",
+        "mosueout",
         "peaceiris",
         "peircemyheart",
         "radx",

package.json

@@ -31,11 +31,11 @@
   },
   "homepage": "https://github.com/James-Oswald/PeirceMyHeart#readme",
   "devDependencies": {
-    "@types/node": "20.8.0",
-    "gts": "^5.0.1",
-    "typedoc": "^0.25.1",
+    "@types/node": "20.8.3",
+    "gts": "^5.2.0",
+    "typedoc": "^0.25.2",
     "typescript": "~5.2.2",
-    "vite": "^4.4.9",
+    "vite": "^4.4.11",
     "vitest": "^0.34.6"
   },
   "dependencies": {

src/AEG/AEGTree.ts

@@ -66,7 +66,6 @@ export class AEGTree {
      * @returns True, if the node can be inserted. Else, false
      */
     public canInsert(incomingNode: AtomNode | CutNode): boolean {
-        console.log("checking can insert");
         const currentCut: CutNode = this.sheet.getCurrentCut(incomingNode);
         for (let i = 0; i < currentCut.children.length; i++) {
             if (this.overlaps(incomingNode, currentCut.children[i])) {
@@ -87,8 +86,6 @@ export class AEGTree {
         }
 
         const currentCut: CutNode = this.sheet.getCurrentCut(incomingNode);
-        //const originalChildren: (AtomNode | CutNode)[] = currentCut.children;
-        //==============CHANGEDDDD=========
         const originalChildren: (AtomNode | CutNode)[] = [...currentCut.children];
         currentCut.children.push(incomingNode);
 

src/AEG/AtomNode.ts

@@ -29,10 +29,10 @@ export class AtomNode {
      * @param rect The rectangle to be set as the boundary box of this node.
      * @param val The value of the proposition represented by this node.
      */
-    public constructor(val: string, origin: Point, rect: Rectangle) {
-        this.rect = rect;
-        this.identifier = val;
-        this.origin = origin;
+    public constructor(val?: string, origin?: Point, rect?: Rectangle) {
+        this.rect = rect ?? new Rectangle();
+        this.identifier = val ?? "";
+        this.origin = origin ?? new Point();
     }
 
     /**

src/AEG/CutNode.ts

@@ -38,8 +38,6 @@ export class CutNode {
         for (let i = 0; i < this.children.length; i++) {
             const child: CutNode | AtomNode = this.children[i];
             if (child instanceof CutNode && this.children[i].containsNode(newNode)) {
-                //======DEBUGGG=======
-                console.log("current cut: " + this.children[i]);
                 //newNode can be placed at least one layer deeper
                 return child.getCurrentCut(newNode);
             }
@@ -77,7 +75,6 @@ export class CutNode {
         if (otherNode instanceof AtomNode) {
             return this.ellipse.containsShape(otherNode.rect);
         } else if (otherNode instanceof CutNode) {
-            //ELLIPSE TO BE IMPLEMENTED ACCURATELY
             return this.ellipse.containsShape(otherNode.ellipse as Ellipse);
         } else {
             throw Error("containsNode expected AtomNode or CutNode");