From 096e8eedbffffbfae92eb7ff3cdd3771e07a059f Mon Sep 17 00:00:00 2001 From: Timur Shemsedinov Date: Mon, 14 Oct 2019 23:48:32 +0300 Subject: [PATCH 1/9] Fix video Closes #16 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 005400b..669b1c4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # Different implementation of iterations as a code abstraction -[![Массивы, объекты, классы, прототипы](https://img.youtube.com/vi/VBMGnAPfmsY/0.jpg)](https://www.youtube.com/watch?v=/VBMGnAPfmsY) +[![Массивы, объекты, классы, прототипы](https://img.youtube.com/vi/VBMGnAPfmsY/0.jpg)](https://www.youtube.com/watch?v=VBMGnAPfmsY) [![Итерирование, циклы и итераторы](https://img.youtube.com/vi/lq3b5_UGJas/0.jpg)](https://www.youtube.com/watch?v=lq3b5_UGJas) From 9c7edda86fa583dd1f94e9b4c5ff56337addc125 Mon Sep 17 00:00:00 2001 From: Timur Shemsedinov Date: Tue, 15 Oct 2019 12:16:04 +0300 Subject: [PATCH 2/9] Add nested loops task --- Exercises/6-matrix.js | 9 +++++++++ Exercises/6-matrix.test | 13 +++++++++++++ Solutions/6-matrix.js | 15 +++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 Exercises/6-matrix.js create mode 100644 Exercises/6-matrix.test create mode 100644 Solutions/6-matrix.js diff --git a/Exercises/6-matrix.js b/Exercises/6-matrix.js new file mode 100644 index 0000000..b768c0a --- /dev/null +++ b/Exercises/6-matrix.js @@ -0,0 +1,9 @@ +'use strict'; + +const max = matrix => { + // Use nested for loop to find max value in 2d matrix + // For example max([[1, 2, 3], [4, 5, 6], [7, 8, 9]]) + // should return 9 +}; + +module.exports = { max }; diff --git a/Exercises/6-matrix.test b/Exercises/6-matrix.test new file mode 100644 index 0000000..aedfec3 --- /dev/null +++ b/Exercises/6-matrix.test @@ -0,0 +1,13 @@ +({ + name: 'max', + length: [220, 300], + cases: [ + [[[10]], 10], + [[[1, 2], [3, 4], [5, 6]], 6], + [[[-1, 1], [2, -1], [-1, 0]], 2], + ], + test: max => { + const src = max.toString(); + if (!src.includes('for (')) throw new Error('Use for loop'); + } +}) diff --git a/Solutions/6-matrix.js b/Solutions/6-matrix.js new file mode 100644 index 0000000..78369e8 --- /dev/null +++ b/Solutions/6-matrix.js @@ -0,0 +1,15 @@ +'use strict'; + +const max = matrix => { + let value = matrix[0][0]; + for (let i = 0; i < matrix.length; i++) { + const row = matrix[i]; + for (let j = 0; j < row.length; j++) { + const cell = row[j]; + if (value < cell) value = cell; + } + } + return value; +}; + +module.exports = { max }; From d20b5b6b0fa8d6d9ca680ae225a2188b117fb31d Mon Sep 17 00:00:00 2001 From: Timur Shemsedinov Date: Tue, 15 Oct 2019 13:04:11 +0300 Subject: [PATCH 3/9] Add for..in task --- Exercises/7-ages.js | 19 +++++++++++++++++++ Exercises/7-ages.test | 24 ++++++++++++++++++++++++ Solutions/7-ages.js | 12 ++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 Exercises/7-ages.js create mode 100644 Exercises/7-ages.test create mode 100644 Solutions/7-ages.js diff --git a/Exercises/7-ages.js b/Exercises/7-ages.js new file mode 100644 index 0000000..fc8089b --- /dev/null +++ b/Exercises/7-ages.js @@ -0,0 +1,19 @@ +'use strict'; + +const ages = persons => { + // Use for..in to calculate age for each person + // For example ages({ + // lenin: { born: 1870, died: 1924 }, + // mao: { born: 1893, died: 1976 }, + // gandhi: { born: 1869, died: 1948 }, + // hirohito: { born: 1901, died: 1989 }, + // }) + // should return { + // lenin: 54, + // mao: 83, + // gandhi: 79, + // hirohito: 88, + // } +}; + +module.exports = { ages }; diff --git a/Exercises/7-ages.test b/Exercises/7-ages.test new file mode 100644 index 0000000..9802861 --- /dev/null +++ b/Exercises/7-ages.test @@ -0,0 +1,24 @@ +({ + name: 'ages', + length: [150, 190], + cases: [ + [ + { + lenin: { born: 1870, died: 1924 }, + mao: { born: 1893, died: 1976 }, + gandhi: { born: 1869, died: 1948 }, + hirohito: { born: 1901, died: 1989 }, + }, { + lenin: 54, + mao: 83, + gandhi: 79, + hirohito: 88, + } + ] + ], + test: ages => { + const src = ages.toString(); + if (!src.includes('for (')) throw new Error('Use for..in loop'); + if (!src.includes(' in ')) throw new Error('Use for..in loop'); + } +}) diff --git a/Solutions/7-ages.js b/Solutions/7-ages.js new file mode 100644 index 0000000..ccd520f --- /dev/null +++ b/Solutions/7-ages.js @@ -0,0 +1,12 @@ +'use strict'; + +const ages = persons => { + const data = {}; + for (const name in persons) { + const person = persons[name]; + data[name] = person.died - person.born; + } + return data; +}; + +module.exports = { ages }; From bebe19a84c4baa9ec3904128b3fd6659a4f95dc4 Mon Sep 17 00:00:00 2001 From: Timur Shemsedinov Date: Tue, 15 Oct 2019 13:30:55 +0300 Subject: [PATCH 4/9] Add exercises description --- Exercises.ru.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 Exercises.ru.md diff --git a/Exercises.ru.md b/Exercises.ru.md new file mode 100644 index 0000000..5ad702f --- /dev/null +++ b/Exercises.ru.md @@ -0,0 +1,47 @@ +# Упражнения + +## Итерирование циклами + +Руализуйте функцию `sum(...args)`, которая суммирует все свои аргументы, пятью +разными способами. Примеры вызовов с результатами: +```js +const a = sum(1, 2, 3) // a === 6 +const b = sum(0) // b === 0 +const c = sum() // c === 0 +const d = sum(1, -1, 1) // d === 1 +const e = sum(10, -1, -1, -1) // e === 7 +``` + +1. Цикл `for` +2. Цикл `for..of` +3. Цикл `while` +4. Цикл `do..while` +5. Метод `Array.prototype.reduce()` + +## Итерирование по двумерному массиву + +6. Найдите максимальный элемент в двумерном массиве +```js +const m = max([[1, 2, 3], [4, 5, 6], [7, 8, 9]]); +console.log(m); // 9 +``` + +## Итерирование объектов-справочников + +7. При помощи цикла `for..in` перебрать объект-справочник с датами рождения и +смерти людей и вернуть справочник с продолжительностью их жизни. Например: +```js +const persons = { + lenin: { born: 1870, died: 1924 }, + mao: { born: 1893, died: 1976 }, + gandhi: { born: 1869, died: 1948 }, + hirohito: { born: 1901, died: 1989 }, +}; +console.log(ages(persons)); +// { +// lenin: 54, +// mao: 83, +// gandhi: 79, +// hirohito: 88, +// } +``` From 3d19ce5ffe11804294819186852f18c7349fedc6 Mon Sep 17 00:00:00 2001 From: Timur Shemsedinov Date: Tue, 15 Oct 2019 22:31:50 +0300 Subject: [PATCH 5/9] Use pop instead of shift --- Solutions/3-while.js | 2 +- Solutions/4-do-while.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Solutions/3-while.js b/Solutions/3-while.js index 66b639c..45bcb50 100644 --- a/Solutions/3-while.js +++ b/Solutions/3-while.js @@ -3,7 +3,7 @@ const sum = (...args) => { let value = 0; while (args.length > 0) { - value += args.shift(); + value += args.pop(); } return value; }; diff --git a/Solutions/4-do-while.js b/Solutions/4-do-while.js index a2abea1..2d22dac 100644 --- a/Solutions/4-do-while.js +++ b/Solutions/4-do-while.js @@ -4,7 +4,7 @@ const sum = (...args) => { if (args.length === 0) return 0; let value = 0; do { - value += args.shift(); + value += args.pop(); } while (args.length > 0); return value; }; From 2c137056907d4916fcc1c25a097a2aa5e6862c36 Mon Sep 17 00:00:00 2001 From: Mikhail Alyoshyn <44239053+ArMANIAK@users.noreply.github.com> Date: Wed, 16 Oct 2019 17:49:20 +0300 Subject: [PATCH 6/9] Update Exercises.ru.md (#19) Misprint correction --- Exercises.ru.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Exercises.ru.md b/Exercises.ru.md index 5ad702f..038ef43 100644 --- a/Exercises.ru.md +++ b/Exercises.ru.md @@ -2,7 +2,7 @@ ## Итерирование циклами -Руализуйте функцию `sum(...args)`, которая суммирует все свои аргументы, пятью +Реализуйте функцию `sum(...args)`, которая суммирует все свои аргументы, пятью разными способами. Примеры вызовов с результатами: ```js const a = sum(1, 2, 3) // a === 6 From 9f1c8d448259e03b858999fdcab1aaa070dd4e3b Mon Sep 17 00:00:00 2001 From: Konstantin Gorshkov Date: Mon, 21 Oct 2019 23:33:38 +0600 Subject: [PATCH 7/9] Tasks 1-7 complete --- Exercises/1-for.js | 8 +++++--- Exercises/2-for-of.js | 8 +++++--- Exercises/3-while.js | 9 ++++++--- Exercises/4-do-while.js | 9 ++++++--- Exercises/5-reduce.js | 5 +---- Exercises/6-matrix.js | 13 ++++++++++--- Exercises/7-ages.js | 18 +++++------------- 7 files changed, 38 insertions(+), 32 deletions(-) diff --git a/Exercises/1-for.js b/Exercises/1-for.js index 62e6ab8..1814aa3 100644 --- a/Exercises/1-for.js +++ b/Exercises/1-for.js @@ -1,9 +1,11 @@ 'use strict'; const sum = (...args) => { - // Use for loop and accumulator variable - // to calculate sum of all given arguments - // For example sum(1, 2, 3) should return 6 + let result = 0; + for (let i = 0; i < args.length; i++) { + result += args[i]; + } + return result; }; module.exports = { sum }; diff --git a/Exercises/2-for-of.js b/Exercises/2-for-of.js index 9965f25..bb82597 100644 --- a/Exercises/2-for-of.js +++ b/Exercises/2-for-of.js @@ -1,9 +1,11 @@ 'use strict'; const sum = (...args) => { - // Use for..of loop and accumulator variable - // to calculate sum of all given arguments - // For example sum(1, 2, 3) should return 6 + let result = 0; + for (const i of args) { + result += i; + } + return result; }; module.exports = { sum }; diff --git a/Exercises/3-while.js b/Exercises/3-while.js index 6110b9f..032e5c9 100644 --- a/Exercises/3-while.js +++ b/Exercises/3-while.js @@ -1,9 +1,12 @@ 'use strict'; const sum = (...args) => { - // Use while loop and accumulator variable - // to calculate sum of all given arguments - // For example sum(1, 2, 3) should return 6 + let result = 0; + let i = 0; + while (i < args.length) { + result += args[i++]; + } + return result; }; module.exports = { sum }; diff --git a/Exercises/4-do-while.js b/Exercises/4-do-while.js index 22d4464..be50125 100644 --- a/Exercises/4-do-while.js +++ b/Exercises/4-do-while.js @@ -1,9 +1,12 @@ 'use strict'; const sum = (...args) => { - // Use do..while loop and accumulator variable - // to calculate sum of all given arguments - // For example sum(1, 2, 3) should return 6 + let result = 0; + let i = 0; + do { + result += args[i++] || 0; + } while (i < args.length); + return result; }; module.exports = { sum }; diff --git a/Exercises/5-reduce.js b/Exercises/5-reduce.js index a9cb44c..9840bca 100644 --- a/Exercises/5-reduce.js +++ b/Exercises/5-reduce.js @@ -1,8 +1,5 @@ 'use strict'; -const sum = (...args) => 0; -// Use Array.prototype.reduce method -// to calculate sum of all given arguments -// For example sum(1, 2, 3) should return 6 +const sum = (...args) => args.reduce((a, b) => a + b, 0); module.exports = { sum }; diff --git a/Exercises/6-matrix.js b/Exercises/6-matrix.js index b768c0a..c69e91b 100644 --- a/Exercises/6-matrix.js +++ b/Exercises/6-matrix.js @@ -1,9 +1,16 @@ 'use strict'; const max = matrix => { - // Use nested for loop to find max value in 2d matrix - // For example max([[1, 2, 3], [4, 5, 6], [7, 8, 9]]) - // should return 9 + let maxValueOfMatrix = 0; + for (const item of matrix) { + for (const value of item) { + if (value > maxValueOfMatrix) { + maxValueOfMatrix = value; + } + } + } + + return maxValueOfMatrix; }; module.exports = { max }; diff --git a/Exercises/7-ages.js b/Exercises/7-ages.js index fc8089b..4246a9d 100644 --- a/Exercises/7-ages.js +++ b/Exercises/7-ages.js @@ -1,19 +1,11 @@ 'use strict'; const ages = persons => { - // Use for..in to calculate age for each person - // For example ages({ - // lenin: { born: 1870, died: 1924 }, - // mao: { born: 1893, died: 1976 }, - // gandhi: { born: 1869, died: 1948 }, - // hirohito: { born: 1901, died: 1989 }, - // }) - // should return { - // lenin: 54, - // mao: 83, - // gandhi: 79, - // hirohito: 88, - // } + const result = {}; + for (const key in persons) { + result[key] = persons[key].died - persons[key].born; + } + return result; //return result }; module.exports = { ages }; From a054ff96caf152b7fc33da1b612113254eae4b3e Mon Sep 17 00:00:00 2001 From: pottsnoc <43334000+pottsnoc@users.noreply.github.com> Date: Tue, 22 Oct 2019 09:06:44 +0600 Subject: [PATCH 8/9] Update Exercises/4-do-while.js Co-Authored-By: Timur Shemsedinov --- Exercises/4-do-while.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Exercises/4-do-while.js b/Exercises/4-do-while.js index be50125..4a3f4ca 100644 --- a/Exercises/4-do-while.js +++ b/Exercises/4-do-while.js @@ -4,7 +4,7 @@ const sum = (...args) => { let result = 0; let i = 0; do { - result += args[i++] || 0; + result += args[i++]; } while (i < args.length); return result; }; From f5190d1df700b3a9b30d8f6e6a5af441b4e239fd Mon Sep 17 00:00:00 2001 From: pottsnoc <43334000+pottsnoc@users.noreply.github.com> Date: Tue, 22 Oct 2019 09:08:23 +0600 Subject: [PATCH 9/9] Update Exercises/4-do-while.js Co-Authored-By: Timur Shemsedinov --- Exercises/4-do-while.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Exercises/4-do-while.js b/Exercises/4-do-while.js index 4a3f4ca..49a8b4f 100644 --- a/Exercises/4-do-while.js +++ b/Exercises/4-do-while.js @@ -1,6 +1,7 @@ 'use strict'; const sum = (...args) => { + if (args.length === 0) return 0; let result = 0; let i = 0; do {