feat: use station mode by default

Author: VincentHardouin

assets/arrondissements.geojson assets/arrondissements.json

@@ -1,3 +1,4 @@
 - [ ] UX - Map - Améliorer le responsive : se baser sur la hauteur de fenêtre aussi
 - [ ] Trouver un nom
 - [ ] Mode de Jeu - Ajouter un mode par temps entre stations
+- [ ] Unique Stop - Renommer en station

docs/TODO.md

@@ -1,6 +1,8 @@
+import arrondissements from '../assets/arrondissements.json';
 import { getSeededRandomStations, pickStations } from './pick-stations.js';
 import { getAdjacentStops, getRoutes, getStops, getUniqueStops } from './utils.js';
 import { verifyIfConnected } from './graph.js';
+import { ParisMap } from './map.js';
 
 const stations = getUniqueStops();
 const adjacentStops = getAdjacentStops();
@@ -22,11 +24,12 @@ export class AlreadyAddedError extends Error {
 }
 
 export class Game {
-  constructor(seed) {
-    this.pick = pickStations({ stations, adjacentStops, random: getSeededRandomStations(seed) });
+  constructor({ seed, mode }) {
+    this.pick = pickStations({ stations, adjacentStops, random: getSeededRandomStations(seed), mode });
     this.instruction = `Aujourd'hui, nous allons de <span class="start">${this.pick.start.stop_name}</span> jusqu'à <span class="end">${this.pick.end.stop_name}</span> en passant par le moins de stations possible.`;
     this.currentState = new Map();
     this.adjacentStops = adjacentStops;
+    this.mode = mode;
   }
 
   init() {

src/Game.js

@@ -7,7 +7,7 @@ import { searchStations } from '../utils.front.js';
 import FinishModal from './FinishModal.vue';
 
 const props = defineProps(['seed']);
-let game = new Game(props.seed);
+let game = new Game({ seed: props.seed, mode: 'station' });
 
 const sortedStations = getUniqueStops().map(d => d.stop_name).sort();
 
@@ -28,7 +28,7 @@ onMounted(() => {
 });
 
 watch(() => props.seed, (newSeed) => {
-  game = new Game(newSeed);
+  game = new Game({ seed: newSeed, mode: 'station' });
   game.init();
   instruction.value = game.instruction;
 });

src/components/Game.vue

@@ -1,11 +1,11 @@
-function computeSmallestStationsPath({ start, end, adjacentStops }) {
+function computeSmallestStationsPath({ start, end, adjacentStops, mode }) {
   if (!stopExists(adjacentStops, start))
     throw new Error('Start stop does not exist');
 
   if (!stopExists(adjacentStops, end))
     throw new Error('End stop does not exist');
 
-  const graph = computeGraph(adjacentStops, start, end);
+  const graph = computeGraph(adjacentStops, start, end, mode);
   return graph.dijkstra(start, end);
 }
 
@@ -25,13 +25,13 @@ function verifyIfConnected({ start, end, adjacentStops, stationsToVerify }) {
   return graph.isConnectedTo(start, end);
 }
 
-function computeGraph(adjacentStops, start, end) {
+function computeGraph(adjacentStops, start, end, mode = 'time') {
   const graph = new Graph();
 
   adjacentStops.forEach(({ from_stop_id, from_stop_unique_id, to_stop_id, to_stop_unique_id, duration }) => {
     graph.addNode(from_stop_id);
     graph.addNode(to_stop_id);
-    graph.addEdge(from_stop_id, to_stop_id, duration);
+    graph.addEdge(from_stop_id, to_stop_id, mode === 'time' ? duration : 1);
 
     if (from_stop_unique_id === start || from_stop_unique_id === end) {
       graph.addNode(from_stop_unique_id);

src/graph.js

@@ -29,7 +29,7 @@ function makeRandom(seed) {
   return next;
 }
 
-function pickStations({ stations, adjacentStops, random = getRandomStations } = {}) {
+function pickStations({ stations, adjacentStops, random = getRandomStations, mode } = {}) {
   const MIN_DISTANCE = 5;
 
   let start = null;
@@ -38,7 +38,7 @@ function pickStations({ stations, adjacentStops, random = getRandomStations } =
 
   do {
     [start, end] = random(stations);
-    path = computeSmallestStationsPath({ start: start.stop_unique_id, end: end.stop_unique_id, adjacentStops });
+    path = computeSmallestStationsPath({ start: start.stop_unique_id, end: end.stop_unique_id, adjacentStops, mode });
   } while (path.distance < MIN_DISTANCE);
 
   return {

src/pick-stations.js

@@ -4,7 +4,7 @@ import { Game } from '../src/Game.js';
 describe('game', () => {
   describe('#getInformation', () => {
     it('should return all stats for game', () => {
-      const game = new Game('123');
+      const game = new Game({ seed: Number.parseInt('2eeea1', 16), mode: 'station' });
       game.parisMap = {
         addStation: () => {
         },
@@ -14,27 +14,16 @@ describe('game', () => {
       game.addStation({ station: game.pick.end.stop_name, color: '#e52228' });
 
       expect(game.getInformation()).to.deep.equal({
-        minTry: 17,
+        minTry: 6,
         stops: [
-          'Mairie de Montreuil - Ligne 9',
-          'Croix de Chavaux - Ligne 9',
-          'Robespierre - Ligne 9',
-          'Porte de Montreuil - Ligne 9',
-          'Maraîchers - Ligne 9',
-          'Buzenval - Ligne 9',
-          'Nation - Ligne 9',
-          'Nation - Ligne 6',
-          'Picpus - Ligne 6',
-          'Bel-Air - Ligne 6',
-          'Daumesnil - Ligne 6',
-          'Dugommier - Ligne 6',
-          'Bercy - Ligne 6',
-          'Quai de la Gare - Ligne 6',
-          'Chevaleret - Ligne 6',
-          'Nationale - Ligne 6',
-          'Place d\'Italie - Ligne 6',
-          'Corvisart - Ligne 6',
-          'Glacière - Ligne 6',
+          'Pernety - Ligne 13',
+          'Gaîté - Ligne 13',
+          'Gare Montparnasse - Ligne 13',
+          'Gare Montparnasse - Ligne 4',
+          'Vavin - Ligne 4',
+          'Raspail - Ligne 4',
+          'Denfert-Rochereau - Ligne 4',
+          'Mouton-Duvernet - Ligne 4',
         ],
         try: 0,
       });

tests/Game.spec.js

@@ -30,6 +30,80 @@ describe('graph', () => {
         ],
       });
     });
+
+    describe('when provided mode is time', () => {
+      it('should return the smallest duration', () => {
+        const adjacentStops = getAdjacentStops();
+
+        const start = {
+          stop_unique_id: 'IDFM:412687',
+          stop_name: 'Pernety',
+        };
+        const end = {
+          stop_unique_id: 'IDFM:73653',
+          stop_name: 'Mouton-Duvernet',
+        };
+
+        const path = computeSmallestStationsPath({
+          start: start.stop_unique_id,
+          end: end.stop_unique_id,
+          adjacentStops,
+          mode: 'time',
+        });
+
+        expect(path).to.deep.equal({
+          distance: 437,
+          path: [
+            'IDFM:463229',
+            'IDFM:463184',
+            'IDFM:462954',
+            'IDFM:462955',
+            'IDFM:22172',
+            'IDFM:22155',
+            'IDFM:22158',
+            'IDFM:463103',
+            'IDFM:463104',
+            'IDFM:22144',
+          ],
+        });
+      });
+    });
+
+    describe('when provided mode is station', () => {
+      it('should return the smallest path', () => {
+        const adjacentStops = getAdjacentStops();
+
+        const start = {
+          stop_unique_id: 'IDFM:412687',
+          stop_name: 'Pernety',
+        };
+        const end = {
+          stop_unique_id: 'IDFM:73653',
+          stop_name: 'Mouton-Duvernet',
+        };
+
+        const path = computeSmallestStationsPath({
+          start: start.stop_unique_id,
+          end: end.stop_unique_id,
+          adjacentStops,
+          mode: 'station',
+        });
+
+        expect(path).to.deep.equal({
+          distance: 7,
+          path: [
+            'IDFM:22222',
+            'IDFM:22230',
+            'IDFM:22157',
+            'IDFM:22143',
+            'IDFM:463016',
+            'IDFM:22131',
+            'IDFM:463104',
+            'IDFM:22144',
+          ],
+        });
+      });
+    });
   });
 
   describe('#verifyIsConnected', () => {