Various fixes and updated test file

Author: meatball133

exercises/concept/train-driver/.docs/hints.md

@@ -1,25 +1,21 @@
 # Hints
 
-## 1. Determine the total number of birds that you counted so far
+## 1. Create a list of all wagons
 
-- Refer to the exercise introduction for an example of how to use a for loop to iterate over an array.
-- Use a helper variable to store the total count and increase that variable as you go through the array.
-- Think about the correct initial value for that helper variable.
-- Refer back to the [array concept][concept-arrays] to recap how to retrieve values from an array.
 
-## 2. Calculate the number of visiting birds in a specific week
 
-- This task is similar to the first one.
-  You can copy your code as a starting point.
-- Think about which indexes in the array you would need to take into account for week number 1 and 2, respectively.
-- Now, find a general way to calculate the first and the last index that should be considered.
-- With that, you can set up the for loop to only iterate over the relevant section of the array.
+## 2. Move the first two elements to the end of the array
 
-## 3. Fix a counting mistake
 
-- Again, you need to set up a for loop to iterate over the whole bird count array.
-- This time you only need to visit every second entry in the array.
-- Change the step so the counter variable is increased accordingly after each iteration.
-- In the body of the for loop you can use the increment operator to change the value of an element in an array in place.
 
-[concept-arrays]: /tracks/javascript/concepts/arrays
+## 3. Add missing values
+
+
+
+## 4. Extend routing information
+
+
+
+## 5. Separate arrival time from routing information
+
+

exercises/concept/train-driver/.docs/instructions.md

@@ -80,7 +80,7 @@ Your friend has noticed that they don't need the arrival time in the routing inf
 Therefore your friend would like you to separate the arrival time from the routing information.
 
 Implement a function `separateArrivalTime` that accepts an object with the routing information.
-The function should return two objects.
+The function should return an array there the first elment of the arrival time and the second element is an object with the routing information.
 
 ```javascript
 routeInformation= {
@@ -90,5 +90,5 @@ routeInformation= {
   timeOfArrival: "10:10"
 };
 separateTimeOfArrival(routeInformation);
-// => {timeOfArrival: "10:10"}, {from: "Berlin", to: "Hamburg", length: "100"}
+// => ["10:10", {from: "Berlin", to: "Hamburg", length: "100"}]
 ```

exercises/concept/train-driver/.meta/exemplar.js

@@ -5,56 +5,56 @@
 // implementing this exercise.
 
 /**
- * Return each Wagons Wiegth.
+ * Return each Wagons id in form of an array.
  *
- * @param {number[]} eachWagonsWiegth
+ * @param {number[]} eachWagonsID
  * @returns {number[]} each Wagons Wiegth
  */
- export function getListOfWagons(...eachWagonsWiegth) {
-  return eachWagonsWiegth;
+ export function getListOfWagons(...eachWagonsID) {
+  return eachWagonsID
 }
 
 /**
  * Reorder the array of wagons by moving the first 2 wagons to the end of the array.
  *
- * @param {number[]} eachWagonsWieght
+ * @param {number[]} eachWagonsID
  * @returns {number[]} reorderd list of wagons
  */
-export function fixListOfWagons(eachWagonsWieght) {
-  const [first, second, ...rest] = eachWagonsWieght;
+export function fixListOfWagons(eachWagonsID) {
+  const [first, second, ...rest] = eachWagonsID;
   return [...rest, first, second];
 }
 
 /**
- * Fixes the list of wagons by inserting an array of wagons after the first element in eachWagonsWieght.
+ * Fixes the array of wagons by inserting an array of wagons after the first element in eachWagonsID.
  *
- * @param {number[]} eachWagonsWieght
+ * @param {number[]} eachWagonsID
  * @param {number[]} missingWagons
  * @returns {number[]} corrected list of wagons
  */
-export function correctListOfWagons(eachWagonsWieght, missingWagons) {
-  const [first, ...rest] = eachWagonsWieght;
+export function correctListOfWagons(eachWagonsID, missingWagons) {
+  const [first, ...rest] = eachWagonsID;
   return [first, ...missingWagons, ...rest];
 }
 
 /**
- * Updates the route information by adding more routing information
+ * Extend route information by adding another object
  *
  * @param {Record<string, string>} route
  * @param {Record<string, string>} moreRouteInformation
- * @returns {Record<string, string>} updates route information
+ * @returns {Record<string, string>} extended route information
  */
-export function updateRoutingInformation(route, moreRouteInformation) {
+export function extendRouteInformation(route, moreRouteInformation) {
   return { ...route, ...moreRouteInformation };
 }
 
 /**
- * Remove arrival time from the route information object
+ * Separate arrival time from the route information object
  *
  * @param {Record<string, string>} route
- * @returns {Record<string, string>} object without arrival time
+ * @returns {[string, Record<string, string>]} array with arrival time and object without arrival time
  */
-export function removeTimeOfArrival(route) {
-  const { arrivalTime, ...rest } = route;
-  return rest;
+export function separateTimeOfArrival(route) {
+  const { timeOfArrival, ...rest } = route;
+  return [timeOfArrival, rest];
 }

exercises/concept/train-driver/train-driver.js

@@ -5,53 +5,53 @@
 // implementing this exercise.
 
 /**
- * Return each Wagons Wiegth.
+ * Return each Wagons id in form of an array.
  *
- * @param {number[]} eachWagonsWiegth
+ * @param {number[]} eachWagonsID
  * @returns {number[]} each Wagons Wiegth
  */
-export function getListOfWagons(eachWagonsWiegth) {
+export function getListOfWagons(eachWagonsID) {
   throw new Error('Please implement the getListOfWagons function');
 }
 
 /**
  * Reorder the array of wagons by moving the first 2 wagons to the end of the array.
  *
- * @param {number[]} eachWagonsWieght
+ * @param {number[]} eachWagonsID
  * @returns {number[]} reorderd list of wagons
  */
-export function fixListOfWagons(eachWagonsWieght) {
+export function fixListOfWagons(eachWagonsID) {
   throw new Error('Please implement the fixListOfWagons function');
 }
 
 /**
- * Fixes the list of wagons by inserting an array of wagons after the first element in eachWagonsWieght.
+ * Fixes the array of wagons by inserting an array of wagons after the first element in eachWagonsID.
  *
- * @param {number[]} eachWagonsWieght
+ * @param {number[]} eachWagonsID
  * @param {number[]} missingWagons
  * @returns {number[]} corrected list of wagons
  */
-export function correctListOfWagons(eachWagonsWieght, missingWagons) {
+export function correctListOfWagons(eachWagonsID, missingWagons) {
   throw new Error('Please implement the correctListOfWagons function');
 }
 
 /**
- * Updates the route information by adding more routing information
+ * Extend route information by adding another object
  *
  * @param {Record<string, string>} route
  * @param {Record<string, string>} moreRouteInformation
- * @returns {Record<string, string>} updates route information
+ * @returns {Record<string, string>} extended route information
  */
-export function updateRoutingInformation(route, moreRouteInformation) {
-  throw new Error('Please implement the updateRoutingInformation function');
+export function extendRouteInformation(route, moreRouteInformation) {
+  throw new Error('Please implement the extendRouteInformation function');
 }
 
 /**
- * Remove arrival time from the route information object
+ * Separate arrival time from the route information object
  *
  * @param {Record<string, string>} route
- * @returns {Record<string, string>} object without arrival time
+ * @returns {[string, Record<string, string>]} array with arrival time and object without arrival time
  */
-export function removeTimeOfArrival(route) {
-  throw new Error('Please implement the removeTimeOfArrival function');
+export function separateTimeOfArrival(route) {
+  throw new Error('Please implement the separateTimeOfArrival function');
 }

exercises/concept/train-driver/train-driver.spec.js

@@ -1,103 +1,103 @@
-import { getListOfWagons, fixListOfWagons, correctListOfWagons, updateRoutingInformation, removeTimeOfArrival } from './train-driver';
+import { getListOfWagons, fixListOfWagons, correctListOfWagons, extendRouteInformation, separateTimeOfArrival } from './train-driver';
 
 describe('getListOfWagons', () => {
   test('return the correct array', () => {
-    expect(getListOfWagons(4,5,2,7,4)).toEqual([4,5,2,7,4]);
+    expect(getListOfWagons(1,5,2,7,4)).toEqual([1,5,2,7,4]);
   });
 
   test('works for a few arrgument', () => {
-    expect(getListOfWagons(4,5)).toEqual([4,5]);
+    expect(getListOfWagons(1,5)).toEqual([1,5]);
   });
 
   test('works for a one arrgument', () => {
-    expect(getListOfWagons(5)).toEqual([5]);
+    expect(getListOfWagons(1)).toEqual([1]);
   });
 
   test('works for many argument', () => {
-    expect(getListOfWagons(4,5,6,3,6,8,4,1,4,7)).toEqual([4,5,6,3,6,8,4,1,4,7]);
+    expect(getListOfWagons(1,5,6,3,9,8,4,14,24,7)).toEqual([1,5,6,3,9,8,4,14,24,7]);
   });
 });
 
 describe('fixListOfWagons', () => {
   test('reorder the first 2 wagons to the end of the array', () => {
-    const eachWagonsWieght = [3, 0, 5, 1, 0, 4, 1, 0, 3, 4, 3, 0, 8, 0];
-    const expected = [5, 1, 0, 4, 1, 0, 3, 4, 3, 0, 8, 0, 3, 0];
-    expect(fixListOfWagons(eachWagonsWieght)).toEqual(expected);
+    const eachWagonsID = [3, 7, 1, 14, 10, 4, 12, 6, 23, 17, 13, 20, 8, 19];
+    const expected = [1, 14, 10, 4, 12, 6, 23, 17, 13, 20, 8, 19, 3, 7];
+    expect(fixListOfWagons(eachWagonsID)).toEqual(expected);
   });
 
-  test('works when only 2 wagons given', () => {
-    const eachWagonsWieght = [1, 2];
-    expect(fixListOfWagons(eachWagonsWieght)).toEqual([1, 2]);
+  test('works when only 3 wagons given', () => {
+    const eachWagonsID = [4, 2, 1];
+    expect(fixListOfWagons(eachWagonsID)).toEqual([1, 4, 2]);
   });
 
   test('works for a few wagons', () => {
-    const eachWagonsWieght = [3, 4, 3, 3, 2, 1, 0];
-    expect(fixListOfWagons(eachWagonsWieght)).toEqual([3, 3, 2, 1, 0, 3, 4]);
+    const eachWagonsID = [3, 4, 1, 5, 7, 9, 10];
+    expect(fixListOfWagons(eachWagonsID)).toEqual([1, 5, 7, 9, 10, 3, 4]);
   });
 });
 
 describe('correctListOfWagons', () => {
   test('returns a wagon wieght list with the inserted array of values', () => {
-    const eachWagonsWieght = [3, 0, 5, 1, 0, 4, 1, 0, 3, 4, 3, 0];
-    const missingWagons = [8, 0, 5, 8, 0, 8, 0];
-    const expected = [3, 8, 0, 5, 8, 0, 8, 0, 0, 5, 1, 0, 4, 1, 0, 3, 4, 3, 0];
-    expect(correctListOfWagons(eachWagonsWieght, missingWagons)).toEqual(expected);
+    const eachWagonsID = [1, 6, 11, 15, 13, 14, 17, 22, 2, 16, 19, 21];
+    const missingWagons = [8, 10, 5, 9, 3, 7, 20];
+    const expected = [1, 8, 10, 5, 9, 3, 7, 20, 6, 11, 15, 13, 14, 17, 22, 2, 16, 19, 21];
+    expect(correctListOfWagons(eachWagonsID, missingWagons)).toEqual(expected);
   });
 
   test('works for short arrays', () => {
-    const eachWagonsWieght = [2, 0, 1, 0];
-    const missingWagons = [8, 6, 0];
-    const expected = [2, 8, 6, 0, 0, 1, 0];
-    expect(correctListOfWagons(eachWagonsWieght, missingWagons)).toEqual(expected);
+    const eachWagonsID = [1, 7, 15, 24];
+    const missingWagons = [8, 6, 4];
+    const expected = [1, 8, 6, 4, 7, 15, 24];
+    expect(correctListOfWagons(eachWagonsID, missingWagons)).toEqual(expected);
   });
 
   test('works when missingWagons is longer', () => {
-    const eachWagonsWieght = [2, 0, 1, 0];
-    const missingWagons = [8, 6, 0, 5, 8, 0, 8, 0];
-    const expected = [2, 8, 6, 0, 5, 8, 0, 8, 0, 0, 1, 0];
-    expect(correctListOfWagons(eachWagonsWieght, missingWagons)).toEqual(expected);
+    const eachWagonsID = [1, 7, 15, 24];
+    const missingWagons = [8, 6, 4, 5, 9, 21, 2, 13];
+    const expected = [1, 8, 6, 4, 5, 9, 21, 2, 13, 7, 15, 24];
+    expect(correctListOfWagons(eachWagonsID, missingWagons)).toEqual(expected);
   });
 });
 
-describe('updateRoutingInformation', () => {
-  test('correctly updates route information', () => {
+describe('extendRouteInformation', () => {
+  test('correctly extend route information', () => {
     const route = {from: "Berlin", to: "Hamburg"};
     const moreRouteInformation = {timeOfArrival: "12:00", precipitation: "10", temperature: "5"};
     const expected = {from: "Berlin", to: "Hamburg", timeOfArrival: "12:00", precipitation: "10", temperature: "5"};
-    expect(updateRoutingInformation(route, moreRouteInformation)).toEqual(expected);
+    expect(extendRouteInformation(route, moreRouteInformation)).toEqual(expected);
   });
 
   test('works when not adding precipitation', () => {
     const route = {from: "Paris", to: "London"};
     const moreRouteInformation = {timeOfArrival: "10:30", temperature: "20"};
     const expected = {from: "Paris", to: "London", timeOfArrival: "10:30", temperature: "20"};
-    expect(updateRoutingInformation(route, moreRouteInformation)).toEqual(expected);
+    expect(extendRouteInformation(route, moreRouteInformation)).toEqual(expected);
   });
 
   test('works when written in diffrent order', () => {
     const route = {from: "Gothenburg", to: "Copenhagen"};
     const moreRouteInformation = {precipitation: "1", timeOfArrival: "21:20", temperature: "-6"};
     const expected = {from: "Gothenburg", to: "Copenhagen", precipitation: "1", timeOfArrival: "21:20", temperature: "-6"};
-    expect(updateRoutingInformation(route, moreRouteInformation)).toEqual(expected);
+    expect(extendRouteInformation(route, moreRouteInformation)).toEqual(expected);
   });
 });
 
-describe('removeTimeOfArrival', () => {
-  test('remove removeTimeOfArrival from object', () => {
+describe('separateTimeOfArrival', () => {
+  test('seperate timeOfArrival from object', () => {
     const route = {from: "Berlin", to: "Hamburg", timeOfArrival: "12:00", precipitation: "10", temperature: "5"};
-    const expected = {from: "Berlin", to: "Hamburg", precipitation: "10", temperature: "5"};
-    expect(removeTimeOfArrival(route)).toEqual(expected);
+    const expected = ["12:00", {from: "Berlin", to: "Hamburg", precipitation: "10", temperature: "5"}]
+    expect(separateTimeOfArrival(route)).toEqual(expected);
   });
 
-  test('remove removeTimeOfArrival with shorter object', () => {
+  test('seperate timeOfArrival with shorter object', () => {
     const route = {from: "Paris", to: "London", timeOfArrival: "10:30", temperature: "20"};
-    const expected = {from: "Paris", to: "London", temperature: "20"};
-    expect(removeTimeOfArrival(route)).toEqual(expected);
+    const expected = ["10:30", {from: "Paris", to: "London", temperature: "20"}]
+    expect(separateTimeOfArrival(route)).toEqual(expected);
   });
 
-  test('remove removeTimeOfArrival from object', () => {
+  test('seperate timeOfArrival from object', () => {
     const route = {from: "Gothenburg", to: "Copenhagen", precipitation: "1", timeOfArrival: "21:20", temperature: "-6"};
-    const expected = {from: "Gothenburg", to: "Copenhagen", precipitation: "1", temperature: "-6"};
-    expect(removeTimeOfArrival(route)).toEqual(expected);
+    const expected = ["21:20", {from: "Gothenburg", to: "Copenhagen", precipitation: "1", temperature: "-6"}]
+    expect(separateTimeOfArrival(route)).toEqual(expected);
   });
 });