diff --git a/package.json b/package.json index 174b854..f56b1fd 100644 --- a/package.json +++ b/package.json @@ -40,6 +40,7 @@ "vis-util": "^4.0.0", "vue": "^2.6.10", "vue-axios": "^2.1.5", + "vue-carousel": "^0.18.0", "vue-chartjs": "^3.4.0", "vue-cli": "^2.9.6", "vue-codemirror": "^4.0.6", diff --git a/public/img/Routing/clark/Step1.gif b/public/img/Routing/clark/Step1.gif new file mode 100644 index 0000000..6f72c15 Binary files /dev/null and b/public/img/Routing/clark/Step1.gif differ diff --git a/public/img/Routing/clark/Step2.gif b/public/img/Routing/clark/Step2.gif new file mode 100644 index 0000000..882ad6c Binary files /dev/null and b/public/img/Routing/clark/Step2.gif differ diff --git a/public/img/Routing/clark/Step3.gif b/public/img/Routing/clark/Step3.gif new file mode 100644 index 0000000..cee7fe0 Binary files /dev/null and b/public/img/Routing/clark/Step3.gif differ diff --git a/public/img/Routing/clark/Step4.gif b/public/img/Routing/clark/Step4.gif new file mode 100644 index 0000000..72b2808 Binary files /dev/null and b/public/img/Routing/clark/Step4.gif differ diff --git a/public/img/Routing/sweep/Step1.gif b/public/img/Routing/sweep/Step1.gif new file mode 100644 index 0000000..6f72c15 Binary files /dev/null and b/public/img/Routing/sweep/Step1.gif differ diff --git a/public/img/Routing/sweep/Step2.gif b/public/img/Routing/sweep/Step2.gif new file mode 100644 index 0000000..3443f0e Binary files /dev/null and b/public/img/Routing/sweep/Step2.gif differ diff --git a/public/img/Routing/sweep/Step3.gif b/public/img/Routing/sweep/Step3.gif new file mode 100644 index 0000000..64961fc Binary files /dev/null and b/public/img/Routing/sweep/Step3.gif differ diff --git a/public/img/Routing/tsp/Step1.gif b/public/img/Routing/tsp/Step1.gif new file mode 100644 index 0000000..8d6d1fc Binary files /dev/null and b/public/img/Routing/tsp/Step1.gif differ diff --git a/public/img/Routing/tsp/Step2.gif b/public/img/Routing/tsp/Step2.gif new file mode 100644 index 0000000..a11f371 Binary files /dev/null and b/public/img/Routing/tsp/Step2.gif differ diff --git a/public/img/Routing/tsp/Step3.gif b/public/img/Routing/tsp/Step3.gif new file mode 100644 index 0000000..609e7c3 Binary files /dev/null and b/public/img/Routing/tsp/Step3.gif differ diff --git a/src/pages/Starter/SampleLayout.vue b/src/pages/Starter/SampleLayout.vue index 1d763a9..26cbc9d 100644 --- a/src/pages/Starter/SampleLayout.vue +++ b/src/pages/Starter/SampleLayout.vue @@ -149,29 +149,30 @@ }" > - + + - +
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..a71a8df 100644 --- a/src/routes/starterRouter.js +++ b/src/routes/starterRouter.js @@ -28,6 +28,11 @@ 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 VRP from 'src/views/Modules/Routing/VRPMainPage'; + +import KMeans from 'src/views/Modules/Clustering/KMeans'; Vue.use(Router); @@ -151,6 +156,21 @@ export default new Router({ name: 'sp', components: { default: Sweep } }, + { + path: 'K-Means', + name: 'km', + components: {default: KMeans} + }, + { + path: 'TSP', + name: 'tsp', + components: {default: TSP} + }, + { + path: 'VRP', + name: 'vrp', + components: { default: VRP} + } ] } ], 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..a5bcc55 100644 --- a/src/views/Modules/Routing/ClarkeAndWright.vue +++ b/src/views/Modules/Routing/ClarkeAndWright.vue @@ -1,10 +1,24 @@