From 4a76e77e3fbfeb2dbd5a0488e680abfa4d6aa00d Mon Sep 17 00:00:00 2001 From: Christian Gallo Date: Wed, 10 Mar 2021 18:41:56 -0500 Subject: [PATCH 01/20] Added new files --- src/pages/Starter/SampleLayout.vue | 13 + src/repositories/Modules/Routing/Routing.js | 4 + src/routes/starterRouter.js | 7 + src/views/Modules/Clustering/KMeans.vue | 39 +++ src/views/Modules/Routing/ClarkeAndWright.vue | 6 +- src/views/Modules/Routing/NodesTable.vue | 249 ++++++++++++++---- src/views/Modules/Routing/Sweep.vue | 4 +- src/views/Modules/Routing/TSPMainPage.vue | 15 ++ src/views/Modules/Routing/fileReader.js | 75 ++++++ 9 files changed, 351 insertions(+), 61 deletions(-) create mode 100644 src/views/Modules/Clustering/KMeans.vue create mode 100644 src/views/Modules/Routing/TSPMainPage.vue create mode 100644 src/views/Modules/Routing/fileReader.js diff --git a/src/pages/Starter/SampleLayout.vue b/src/pages/Starter/SampleLayout.vue index 1d763a9..367a7f4 100644 --- a/src/pages/Starter/SampleLayout.vue +++ b/src/pages/Starter/SampleLayout.vue @@ -172,6 +172,19 @@ }" > + + +
diff --git a/src/repositories/Modules/Routing/Routing.js b/src/repositories/Modules/Routing/Routing.js index 5a260c2..e014e15 100644 --- a/src/repositories/Modules/Routing/Routing.js +++ b/src/repositories/Modules/Routing/Routing.js @@ -14,6 +14,10 @@ class Routing{ solveClarkAndWright(NodesDTO){ return axios.post(`${this.basePath}/routingModule/solveClarkAndWright`,NodesDTO); } + + solveSweep(NodesDTO){ + return axios.post(`${this.basePath}/routingModule/solveSweep`,NodesDTO); + } } export default new Routing(); \ No newline at end of file diff --git a/src/routes/starterRouter.js b/src/routes/starterRouter.js index 5389a3d..ad805f3 100644 --- a/src/routes/starterRouter.js +++ b/src/routes/starterRouter.js @@ -29,6 +29,8 @@ import ClarkeAndWright from 'src/views/Modules/Routing/ClarkeAndWright'; import Opt3Move from 'src/views/Modules/Routing/Opt3Move'; import Sweep from 'src/views/Modules/Routing/Sweep'; +import KMeans from 'src/views/Modules/Clustering/KMeans'; + Vue.use(Router); export default new Router({ @@ -151,6 +153,11 @@ export default new Router({ name: 'sp', components: { default: Sweep } }, + { + path: 'K-Means', + name: 'km', + components: {default: KMeans} + } ] } ], diff --git a/src/views/Modules/Clustering/KMeans.vue b/src/views/Modules/Clustering/KMeans.vue new file mode 100644 index 0000000..9285ad6 --- /dev/null +++ b/src/views/Modules/Clustering/KMeans.vue @@ -0,0 +1,39 @@ + + + + + \ No newline at end of file diff --git a/src/views/Modules/Routing/ClarkeAndWright.vue b/src/views/Modules/Routing/ClarkeAndWright.vue index 81f0bb5..5fa12a2 100644 --- a/src/views/Modules/Routing/ClarkeAndWright.vue +++ b/src/views/Modules/Routing/ClarkeAndWright.vue @@ -1,5 +1,7 @@ diff --git a/src/views/Modules/Routing/TSPMainPage.vue b/src/views/Modules/Routing/TSPMainPage.vue index def2c4f..425214b 100644 --- a/src/views/Modules/Routing/TSPMainPage.vue +++ b/src/views/Modules/Routing/TSPMainPage.vue @@ -1,12 +1,52 @@ From 61ee4ed120b57fc3c457d7b38e3ff06b21cdd89d Mon Sep 17 00:00:00 2001 From: Christian Gallo Date: Wed, 24 Mar 2021 16:24:18 -0500 Subject: [PATCH 03/20] Finished TSP Main page --- src/pages/Starter/SampleLayout.vue | 22 +--- src/routes/starterRouter.js | 6 ++ src/views/Modules/Routing/ClarkeAndWright.vue | 8 +- src/views/Modules/Routing/TSPMainPage.vue | 101 +++++++++++++----- 4 files changed, 86 insertions(+), 51 deletions(-) diff --git a/src/pages/Starter/SampleLayout.vue b/src/pages/Starter/SampleLayout.vue index 367a7f4..ee470b4 100644 --- a/src/pages/Starter/SampleLayout.vue +++ b/src/pages/Starter/SampleLayout.vue @@ -149,26 +149,8 @@ }" > - - - diff --git a/src/routes/starterRouter.js b/src/routes/starterRouter.js index ad805f3..31068ee 100644 --- a/src/routes/starterRouter.js +++ b/src/routes/starterRouter.js @@ -28,6 +28,7 @@ import NearestNeighbour from 'src/views/Modules/Routing/NearestNeighbor'; import ClarkeAndWright from 'src/views/Modules/Routing/ClarkeAndWright'; import Opt3Move from 'src/views/Modules/Routing/Opt3Move'; import Sweep from 'src/views/Modules/Routing/Sweep'; +import TSP from 'src/views/Modules/Routing/TSPMainPage'; import KMeans from 'src/views/Modules/Clustering/KMeans'; @@ -157,6 +158,11 @@ export default new Router({ path: 'K-Means', name: 'km', components: {default: KMeans} + }, + { + path: 'TSP', + name: 'tsp', + components: {default: TSP} } ] } diff --git a/src/views/Modules/Routing/ClarkeAndWright.vue b/src/views/Modules/Routing/ClarkeAndWright.vue index 424b669..6576b78 100644 --- a/src/views/Modules/Routing/ClarkeAndWright.vue +++ b/src/views/Modules/Routing/ClarkeAndWright.vue @@ -1,15 +1,13 @@ @@ -17,7 +15,6 @@ import RRepository from './../../../repositories/Modules/Routing/Routing'; import NodesTable from './NodesTable.vue'; import RoutingSolution from './RoutingSolution.vue'; -import TSPMainPage from './TSPMainPage.vue'; export default { @@ -62,7 +59,6 @@ export default { components: { 'nodes-table': NodesTable, 'routing-solution': RoutingSolution, - TSPMainPage } } diff --git a/src/views/Modules/Routing/TSPMainPage.vue b/src/views/Modules/Routing/TSPMainPage.vue index 425214b..a4d23e4 100644 --- a/src/views/Modules/Routing/TSPMainPage.vue +++ b/src/views/Modules/Routing/TSPMainPage.vue @@ -3,50 +3,101 @@
+ + + - - WHAT IS V.I.P? -

The Vertically Integrated Projects (VIP) Program unites undergraduate education and faculty research in a team-based context. Undergraduate VIP students earn academic credits, while faculty and graduate students benefit from the design/discovery efforts of their teams.

-

This program allows to:

-
    -
  • Create long-term research & development experiences.
  • -
  • Cultivates leadership & mentoring.
  • -
  • Benefits faculty research programs.
  • -
- + + Clark and Wright + +
+ + + + Nearest Neighbour + + + + - - WHAT IS V.I.P? -

The Vertically Integrated Projects (VIP) Program unites undergraduate education and faculty research in a team-based context. Undergraduate VIP students earn academic credits, while faculty and graduate students benefit from the design/discovery efforts of their teams.

-

This program allows to:

-
    -
  • Create long-term research & development experiences.
  • -
  • Cultivates leadership & mentoring.
  • -
  • Benefits faculty research programs.
  • -
- + + Sweep + + +
+ + + + Opt-3-Move + +
+ + + + + +
From a7504693edb34250423ee5fc5915320467841947 Mon Sep 17 00:00:00 2001 From: Christian Gallo Date: Thu, 10 Jun 2021 19:31:27 -0500 Subject: [PATCH 04/20] Data upload --- .../Modules/Routing/LoadFileComponent.vue | 13 ++ src/views/Modules/Routing/NearestNeighbor.vue | 7 + src/views/Modules/Routing/NodesTable.vue | 129 +++++++----------- src/views/Modules/Routing/RoutingSolution.vue | 6 +- src/views/Modules/Routing/TSPMainPage.vue | 2 +- 5 files changed, 75 insertions(+), 82 deletions(-) create mode 100644 src/views/Modules/Routing/LoadFileComponent.vue diff --git a/src/views/Modules/Routing/LoadFileComponent.vue b/src/views/Modules/Routing/LoadFileComponent.vue new file mode 100644 index 0000000..17bcab3 --- /dev/null +++ b/src/views/Modules/Routing/LoadFileComponent.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/views/Modules/Routing/NearestNeighbor.vue b/src/views/Modules/Routing/NearestNeighbor.vue index 2278d18..a76fe68 100644 --- a/src/views/Modules/Routing/NearestNeighbor.vue +++ b/src/views/Modules/Routing/NearestNeighbor.vue @@ -34,6 +34,7 @@ export default { id: 0, x: 1, y: 2, + c: }, { id: 1, @@ -41,6 +42,12 @@ export default { y: 4, } ], + vehicles: [ + { + id:1, + c: 10 + } + ], route: '', routeCost: '', solveStatus: false, diff --git a/src/views/Modules/Routing/NodesTable.vue b/src/views/Modules/Routing/NodesTable.vue index f743a78..95fca15 100644 --- a/src/views/Modules/Routing/NodesTable.vue +++ b/src/views/Modules/Routing/NodesTable.vue @@ -61,24 +61,28 @@ -
+

Load File

Drag and Drop here

- -