diff --git a/Exercises/1-random.js b/Exercises/1-random.js index ef5ccaf..a80ee69 100644 --- a/Exercises/1-random.js +++ b/Exercises/1-random.js @@ -1,9 +1,9 @@ 'use strict'; const random = (min, max) => { - // Generate random Number between from min to max - // Use Math.random() and Math.floor() - // See documentation at MDN + max = Math.floor(max); + const anyNumber = Math.floor(Math.random() * (max - min)) + min; + return anyNumber; }; module.exports = { random }; diff --git a/Exercises/2-key.js b/Exercises/2-key.js index ba7e53a..3e688f9 100644 --- a/Exercises/2-key.js +++ b/Exercises/2-key.js @@ -1,9 +1,13 @@ 'use strict'; const generateKey = (length, possible) => { - // Generate string of random characters - // Use Math.random() and Math.floor() - // See documentation at MDN + const number = possible.length; + let key = ''; + for (let i = 0; i < length; i++) { + const rand = Math.floor(Math.random() * number); + key += possible[rand]; + } + return key; }; module.exports = { generateKey }; diff --git a/Exercises/3-ip.js b/Exercises/3-ip.js index 1e2c406..df73db3 100644 --- a/Exercises/3-ip.js +++ b/Exercises/3-ip.js @@ -1,11 +1,10 @@ 'use strict'; const ipToInt = (ip = '127.0.0.1') => { - // Parse ip address as string, for example '10.0.0.1' - // to ['10', '0', '0', '1'] to [10, 0, 0, 1] - // and convert to Number value 167772161 with bitwise shift - // (10 << 8 << 8 << 8) + (0 << 8 << 8) + (0 << 8) + 1 === 167772161 - // Use Array.prototype.reduce of for loop + const f = (byte, replace) => (byte <<= 8) + parseInt(replace); + return ip.split('.').reduce(f, 0); }; +// console.log(ipToInt()); + module.exports = { ipToInt }; diff --git a/Exercises/4-methods.js b/Exercises/4-methods.js index c1038e8..53ec1aa 100644 --- a/Exercises/4-methods.js +++ b/Exercises/4-methods.js @@ -1,21 +1,14 @@ 'use strict'; -const methods = iface => { - // Introspect all properties of iface object and - // extract function names and number of arguments - // For example: { - // m1: x => [x], - // m2: function (x, y) { - // return [x, y]; - // }, - // m3(x, y, z) { - // return [x, y, z]; - // } - // will return: [ - // ['m1', 1], - // ['m2', 2], - // ['m3', 3] - // ] +const methods = (iface) => { + const names = []; + for (const name in iface) { + const fn = iface[name]; + if (typeof fn === 'function') { + names.push([name, fn.length]); + } + } + return names; }; module.exports = { methods };