From 7dabecf9147036c97c8425a362e07a3ca4f3ad78 Mon Sep 17 00:00:00 2001
From: Jack Medrek <jackmedrek@Jacks-MacBook-Pro-2.local>
Date: Tue, 2 Jan 2024 18:36:32 -0500
Subject: [PATCH 1/5] improved layout/style of TopoEditBox.vue

---
 src/components/TopoEditToolbox.vue | 124 +++++++++++++++++++----------
 1 file changed, 80 insertions(+), 44 deletions(-)

diff --git a/src/components/TopoEditToolbox.vue b/src/components/TopoEditToolbox.vue
index 32b11f0..33f3290 100644
--- a/src/components/TopoEditToolbox.vue
+++ b/src/components/TopoEditToolbox.vue
@@ -42,59 +42,95 @@ const finishEdit = () => {
 </script>
 
 <template>
-  <el-card class="card">
-    <el-row :gutter="30">
-      <el-col
-        >Load preset topology:<el-select size="20px">
+
+  <el-card class="card p-4">
+  
+    <div class="flex-container">
+      <span class="label-margin">Load preset:</span> 
+      <el-select class="dropdown" style="margin-right:45px;">
+        <el-option 
+          v-for="item in presetTopos"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value" 
+        />
+      </el-select>
+    </div>
+
+    <div class="flex-container mt-4">
+      <span class="label-margin">Add node:</span>
+      <el-select class="dropdown" v-model="nodeType">
+        <el-option-group
+          v-for="group in nodeTypes"
+          :key="group.label"
+          :label="group.label"
+        >
           <el-option
-            class="item"
-            v-for="item in presetTopos"
+            v-for="item in group.types"
             :key="item.value"
             :label="item.label"
-            :value="item.value"
-          /> </el-select
-      ></el-col>
-    </el-row>
-    <el-row :gutter="30">
-      <el-col>
-        Add a
-        <el-select size="20px" v-model="nodeType">
-          <el-option-group v-for="group in nodeTypes" :key="group.label" :label="group.label">
-            <el-option
-              class="item"
-              v-for="item in group.types"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-option-group>
-        </el-select>
-        <el-button size="small" @click="addNode" type="primary" :icon="Plus" circle />
-      </el-col>
-    </el-row>
-    <el-row :gutter="30">
-      <el-col>
-        Connect<el-button size="small" @click="connect" type="info" :icon="Switch" circle />
-      </el-col>
-    </el-row>
+            :value="item.value" 
+          />
+        </el-option-group>
+      </el-select>
+
+      <el-button 
+        class="circular-button" 
+        @click="addNode"
+        type="primary"
+        :icon="Plus" 
+        circle
+      />
+    </div>
+
+    <div class="flex-container mt-4">
+      <span class="label-margin">Connect</span>
+      <el-button
+        class="circular-button"
+        @click="connect"
+        type="info"
+        :icon="Switch" 
+        circle  
+      />
+    </div>
+
+    <div class="flex-container mt-4">
+      <span class="label-margin">Finish</span>
+      <el-button 
+        class="circular-button"
+        @click="finishEdit"
+        type="danger"
+        :icon="Check" 
+        circle
+      />
+    </div>
 
-    <el-row :gutter="30">
-      <el-col>
-        Finish<el-button size="small" @click="finishEdit" type="danger" :icon="Check" circle />
-      </el-col>
-    </el-row>
   </el-card>
+  
 </template>
 
 <style scoped>
 .card {
-  /* margin-top: 2px; */
-  height: 150px;
-  /* background-color:white; */
-  /* width: 380px; */
-  font-size: 0.87rem;
+  padding: 20px;
+}
+.flex-container {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 5px;
+}
+.label-margin {
+  margin-right: 8px;
+}
+.dropdown {
+  width: 120px;
+}
+.circular-button {
+  border-radius: 50%;
+  width: 30px;
+  height: 30px;
 }
-.item {
-  font-size: 0.82rem;
+.button-margin {
+  margin-left: 8px;
 }
 </style>

From ca6896588619846f6dc3c0a1e0f680ef134f7da7 Mon Sep 17 00:00:00 2001
From: Jack Medrek <jackmedrek@Jacks-MacBook-Pro-2.local>
Date: Wed, 3 Jan 2024 17:04:38 -0500
Subject: [PATCH 2/5] added logic for different node types in ConstructTopology

---
 src/core/network.ts | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/core/network.ts b/src/core/network.ts
index 34dd2c6..c1b7a4d 100644
--- a/src/core/network.ts
+++ b/src/core/network.ts
@@ -94,12 +94,37 @@ export class NetworkHub {
     for (const n of this.Nodes.value) {
       if (n.id == 0) continue
 
-      if (n.type == NODE_TYPE.TSN || n.type == NODE_TYPE.TSCH) {
-        n.neighbors = this.kdTree.FindKNearest(n.pos, 4, 20)
-      } else {
-        n.neighbors = this.kdTree.FindKNearest(n.pos, 1, this.Config.value.grid_size)
+      let neighbors: any = []
+
+      switch (n.type) {
+        // 5G UE connects to one 5G tower and wired end systems
+        case NODE_TYPE.FIVE_G_UE:
+          neighbors = this.kdTree.FindKNearest(n.pos, 1, 20)
+          break
+
+        // 5G tower / base station connects one TSN bridge and end systems + multiple 5G UEs
+        case NODE_TYPE.FIVE_G_BS:
+          neighbors = this.kdTree.FindKNearest(n.pos, 1000, 20) // k = 1000, arbitrarily large
+          break
+
+        // TSCH node connects to multiple other TSCH nodes and wired end systems
+        case NODE_TYPE.TSCH:
+          neighbors = this.kdTree.FindKNearest(n.pos, 4, 20)
+          break
+
+        // TSN bridge connects multiple TSN bridges, 5G tower and end systems
+        case NODE_TYPE.TSN:
+          neighbors = this.kdTree.FindKNearest(n.pos, 4, 20)
+          break
+
+        // end system connects to one network node
+        default:
+          neighbors = this.kdTree.FindKNearest(n.pos, 1, 20)
+          break
       }
 
+      n.neighbors = neighbors
+
       n.neighbors.forEach((nn: number) => {
         this.AddLink(n.id, nn)
       })

From cea8ac613bb7b4679ad9dc371213b244b1fd8d5c Mon Sep 17 00:00:00 2001
From: Jack Medrek <jackmedrek@Jacks-MacBook-Pro-2.local>
Date: Wed, 3 Jan 2024 18:50:28 -0500
Subject: [PATCH 3/5] reduced padding and el-select option line height

---
 src/components/TopoEditToolbox.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/TopoEditToolbox.vue b/src/components/TopoEditToolbox.vue
index 33f3290..63fbce5 100644
--- a/src/components/TopoEditToolbox.vue
+++ b/src/components/TopoEditToolbox.vue
@@ -47,7 +47,7 @@ const finishEdit = () => {
   
     <div class="flex-container">
       <span class="label-margin">Load preset:</span> 
-      <el-select class="dropdown" style="margin-right:45px;">
+      <el-select class="dropdown" style="margin-right:55px;">
         <el-option 
           v-for="item in presetTopos"
           :key="item.value"
@@ -111,7 +111,7 @@ const finishEdit = () => {
 
 <style scoped>
 .card {
-  padding: 20px;
+  padding: 10px;
 }
 .flex-container {
   display: flex;
@@ -125,6 +125,10 @@ const finishEdit = () => {
 .dropdown {
   width: 120px;
 }
+.el-select-dropdown__item {
+  line-height: 25px;
+  height: 25px; 
+}
 .circular-button {
   border-radius: 50%;
   width: 30px;

From 39a496071b7dc3eafea7124c62fc8e54fbfc84cf Mon Sep 17 00:00:00 2001
From: Jack Medrek <jackmedrek@Jacks-MacBook-Pro-2.local>
Date: Mon, 8 Jan 2024 16:01:20 -0500
Subject: [PATCH 4/5] added type checking for nodes in EstablishConnection

---
 src/core/network.ts | 56 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 44 insertions(+), 12 deletions(-)

diff --git a/src/core/network.ts b/src/core/network.ts
index 4b1a42a..92169b3 100644
--- a/src/core/network.ts
+++ b/src/core/network.ts
@@ -207,29 +207,61 @@ export class NetworkHub {
       let neighbors: any = []
 
       switch (n.type) {
-        // 5G UE connects to one 5G tower and wired end systems
+        // 5G UE connects to one 5G tower and multiple wired end systems
         case NODE_TYPE.FIVE_G_UE:
-          neighbors = this.kdTree.FindKNearest(n.pos, 1, 20)
-          break
+          const ueBsNeighbors = this.kdTree.FindKNearest(n.pos, 1, 20)
+          const validUeBs = ueBsNeighbors.find(nn => this.Nodes.value[nn].type === NODE_TYPE.FIVE_G_GNB)
+          if (validUeBs !== undefined) neighbors.push(validUeBs)
+
+          const ueEndNeighbors = this.kdTree.FindKNearest(n.pos, 1000, 20)
+          const validUeEnd = ueEndNeighbors.find(nn => this.Nodes.value[nn].type >= NODE_TYPE.END_SYSTEM_SERVER)
+          if (validUeEnd !== undefined) neighbors.push(validUeEnd)
 
-        // 5G tower / base station connects one TSN bridge and end systems + multiple 5G UEs
-        case NODE_TYPE.FIVE_G_BS:
-          neighbors = this.kdTree.FindKNearest(n.pos, 1000, 20) // k = 1000, arbitrarily large
           break
+  
+        // 5G GNB connects to a TSN, an end system, and multiple 5G UEs
+        case NODE_TYPE.FIVE_G_GNB:
+          const bsNeighbors = this.kdTree.FindKNearest(n.pos, 1, 20)
+          const validGnbTsn = bsNeighbors.find(nn => this.Nodes.value[nn].type === NODE_TYPE.TSN)
+          const validBsEnd = bsNeighbors.find(nn => this.Nodes.value[nn].type >= NODE_TYPE.END_SYSTEM_SERVER)
+          if (validGnbTsn !== undefined) neighbors.push(validGnbTsn)
+          if (validBsEnd !== undefined) neighbors.push(validBsEnd)
+
+          const gnbUeNeighbors = this.kdTree.FindKNearest(n.pos, 1000, 20)
+          const validUes = gnbUeNeighbors.filter(nn => this.Nodes.value[nn].type === NODE_TYPE.FIVE_G_UE)
+          neighbors.push(...validUes)
 
+          break
+  
         // TSCH node connects to multiple other TSCH nodes and wired end systems
         case NODE_TYPE.TSCH:
-          neighbors = this.kdTree.FindKNearest(n.pos, 4, 20)
+          const tschNeighbors = this.kdTree.FindKNearest(n.pos, 1000, 20)
+          const validTsch = tschNeighbors.filter(nn => this.Nodes.value[nn].type === NODE_TYPE.TSCH)
+          const validTschEnd = tschNeighbors.find(nn => this.Nodes.value[nn].type >= NODE_TYPE.END_SYSTEM_SERVER)
+          neighbors.push(...validTsch)
+          if (validTschEnd !== undefined) neighbors.push(validTschEnd)
           break
-
+  
         // TSN bridge connects multiple TSN bridges, 5G tower and end systems
         case NODE_TYPE.TSN:
-          neighbors = this.kdTree.FindKNearest(n.pos, 4, 20)
+          const tsnNeighbors = this.kdTree.FindKNearest(n.pos, 1000, 20)
+          const validTsn = tsnNeighbors.filter(nn => this.Nodes.value[nn].type === NODE_TYPE.TSN)
+          const validTsnGnb = tsnNeighbors.find(nn => this.Nodes.value[nn].type === NODE_TYPE.FIVE_G_GNB)
+          const validTsnEnd = tsnNeighbors.find(nn => this.Nodes.value[nn].type >= NODE_TYPE.END_SYSTEM_SERVER)
+          neighbors.push(...validTsn)
+          if (validTsnGnb !== undefined) neighbors.push(validTsnGnb)
+          if (validTsnEnd !== undefined) neighbors.push(validTsnEnd)
+          
           break
-
+  
         // end system connects to one network node
         default:
-          neighbors = this.kdTree.FindKNearest(n.pos, 1, 20)
+          const networkNeighbors = this.kdTree.FindKNearest(n.pos, 1, 20)
+          const validNetwork = networkNeighbors.find(nn => 
+            this.Nodes.value[nn].type === NODE_TYPE.TSN || 
+            this.Nodes.value[nn].type === NODE_TYPE.TSCH || 
+            this.Nodes.value[nn].type === NODE_TYPE.FIVE_G_UE)
+          if (validNetwork !== undefined) neighbors.push(validNetwork)
           break
       }
 
@@ -310,7 +342,7 @@ export class NetworkHub {
 
   AddLink(v1: number, v2: number) {
     if (v1 > v2) {
-      ;[v1, v2] = [v2, v1]
+      [v1, v2] = [v2, v1]
     }
     // Cantor pairing
     const uid = 0.5 * (v1 + v2) * (v1 + v2 + 1) + v2

From 928fce8c3d51e559c3bda4a8ac7add5989f89ee4 Mon Sep 17 00:00:00 2001
From: Jack Medrek <jackmedrek@Jacks-MacBook-Pro-2.local>
Date: Mon, 8 Jan 2024 21:15:44 -0500
Subject: [PATCH 5/5] fixed linter errors

---
 src/core/network.ts | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/core/network.ts b/src/core/network.ts
index 92169b3..a2af811 100644
--- a/src/core/network.ts
+++ b/src/core/network.ts
@@ -204,11 +204,11 @@ export class NetworkHub {
     for (const n of this.Nodes.value) {
       if (n.id == 0) continue
 
-      let neighbors: any = []
+      const neighbors: any = []
 
       switch (n.type) {
         // 5G UE connects to one 5G tower and multiple wired end systems
-        case NODE_TYPE.FIVE_G_UE:
+        case NODE_TYPE.FIVE_G_UE: {
           const ueBsNeighbors = this.kdTree.FindKNearest(n.pos, 1, 20)
           const validUeBs = ueBsNeighbors.find(nn => this.Nodes.value[nn].type === NODE_TYPE.FIVE_G_GNB)
           if (validUeBs !== undefined) neighbors.push(validUeBs)
@@ -218,9 +218,9 @@ export class NetworkHub {
           if (validUeEnd !== undefined) neighbors.push(validUeEnd)
 
           break
-  
+        }
         // 5G GNB connects to a TSN, an end system, and multiple 5G UEs
-        case NODE_TYPE.FIVE_G_GNB:
+        case NODE_TYPE.FIVE_G_GNB: {
           const bsNeighbors = this.kdTree.FindKNearest(n.pos, 1, 20)
           const validGnbTsn = bsNeighbors.find(nn => this.Nodes.value[nn].type === NODE_TYPE.TSN)
           const validBsEnd = bsNeighbors.find(nn => this.Nodes.value[nn].type >= NODE_TYPE.END_SYSTEM_SERVER)
@@ -232,18 +232,18 @@ export class NetworkHub {
           neighbors.push(...validUes)
 
           break
-  
+        }
         // TSCH node connects to multiple other TSCH nodes and wired end systems
-        case NODE_TYPE.TSCH:
+        case NODE_TYPE.TSCH: {
           const tschNeighbors = this.kdTree.FindKNearest(n.pos, 1000, 20)
           const validTsch = tschNeighbors.filter(nn => this.Nodes.value[nn].type === NODE_TYPE.TSCH)
           const validTschEnd = tschNeighbors.find(nn => this.Nodes.value[nn].type >= NODE_TYPE.END_SYSTEM_SERVER)
           neighbors.push(...validTsch)
           if (validTschEnd !== undefined) neighbors.push(validTschEnd)
           break
-  
+        }
         // TSN bridge connects multiple TSN bridges, 5G tower and end systems
-        case NODE_TYPE.TSN:
+        case NODE_TYPE.TSN: {
           const tsnNeighbors = this.kdTree.FindKNearest(n.pos, 1000, 20)
           const validTsn = tsnNeighbors.filter(nn => this.Nodes.value[nn].type === NODE_TYPE.TSN)
           const validTsnGnb = tsnNeighbors.find(nn => this.Nodes.value[nn].type === NODE_TYPE.FIVE_G_GNB)
@@ -253,9 +253,9 @@ export class NetworkHub {
           if (validTsnEnd !== undefined) neighbors.push(validTsnEnd)
           
           break
-  
+        }
         // end system connects to one network node
-        default:
+        default: {
           const networkNeighbors = this.kdTree.FindKNearest(n.pos, 1, 20)
           const validNetwork = networkNeighbors.find(nn => 
             this.Nodes.value[nn].type === NODE_TYPE.TSN || 
@@ -263,6 +263,7 @@ export class NetworkHub {
             this.Nodes.value[nn].type === NODE_TYPE.FIVE_G_UE)
           if (validNetwork !== undefined) neighbors.push(validNetwork)
           break
+          }
       }
 
       n.neighbors = neighbors