diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md index 2449150..ad7db79 100644 --- a/PULL_REQUEST_TEMPLATE.md +++ b/PULL_REQUEST_TEMPLATE.md @@ -1,10 +1,10 @@ ## DESCRIPTION -Nombre: -Usuario Platzi: +Nombre: johana rocio +Usuario Platzi: U19306483@UTP.EDU.PE ## Reto: -- [ ] Primer problema -- [ ] Segundo problema -- [ ] Tercer problema +- [X] Primer problema +- [X] Segundo problema +- [X] Tercer problema diff --git a/package-lock.json b/package-lock.json index fd061e8..92817cd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { - "name": "challenge-js-03", + "name": "javascript-challenges", "version": "1.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "challenge-js-03", + "name": "javascript-challenges", "version": "1.0.0", "license": "MIT", "devDependencies": { - "jest": "^29.0.1" + "jest": "29.0.1" } }, "node_modules/@ampproject/remapping": { diff --git a/src/factorial.js b/src/factorial.js index 4f3ae70..a9cb2b4 100644 --- a/src/factorial.js +++ b/src/factorial.js @@ -1,5 +1,17 @@ const factorial = (number) => { - // your code here + + var total = number; + + if (number === 1 || number === 0) + return 1; + + while (number > 1) { + number--; + total *= number; + } + + return total; + } module.exports = factorial; \ No newline at end of file diff --git a/src/fibonacci.js b/src/fibonacci.js index ea3270f..885635f 100644 --- a/src/fibonacci.js +++ b/src/fibonacci.js @@ -1,5 +1,18 @@ const fibonacci = (n) => { - // your code here + + var fibo = [1]; + + if (n === 1) { + return fibo; + } + + fibo.push(1); + + for(var i = 2, len = n; i < len; i++) { + fibo.push(fibo[i-1] + fibo[i-2]); + } + + return fibo; } module.exports = fibonacci; \ No newline at end of file diff --git a/src/primalidad.js b/src/primalidad.js index 8bdb849..ec2c6aa 100644 --- a/src/primalidad.js +++ b/src/primalidad.js @@ -1,5 +1,24 @@ const trialDivision = (number) => { - // your code here + +if(number % 1 == 0){ + + for (var i = 2; i < number; i++) { + if (number % i === 0) { + return false; + } + + } + + if (number === -1 || number === 0 || number === 1) { + return false; + } else { + return true; + } + + } else { + return false; + } + } module.exports = trialDivision; \ No newline at end of file