From 8f1a13364deba6ef80023de9043be26a99123de5 Mon Sep 17 00:00:00 2001 From: Adelina Moroaca Date: Sat, 4 Nov 2023 13:05:11 +0200 Subject: [PATCH 1/3] Add javascript-exercises solution --- 01_helloWorld/helloWorld.js | 2 +- 02_repeatString/repeatString.js | 12 +++++++--- 02_repeatString/repeatString.spec.js | 12 +++++----- 03_reverseString/reverseString.js | 9 +++++--- 03_reverseString/reverseString.spec.js | 6 ++--- 04_removeFromArray/removeFromArray.js | 23 ++++++++++++++++--- 04_removeFromArray/removeFromArray.spec.js | 19 ++++++++++------ 05_sumAll/sumAll.js | 26 +++++++++++++++++++--- 05_sumAll/sumAll.spec.js | 10 ++++----- 06_leapYears/leapYears.js | 17 ++++++++++++-- 06_leapYears/leapYears.spec.js | 10 ++++----- 07_tempConversion/tempConversion.js | 15 ++++++++++--- 07_tempConversion/tempConversion.spec.js | 10 ++++----- 13 files changed, 122 insertions(+), 49 deletions(-) diff --git a/01_helloWorld/helloWorld.js b/01_helloWorld/helloWorld.js index df27036..b542f3b 100644 --- a/01_helloWorld/helloWorld.js +++ b/01_helloWorld/helloWorld.js @@ -1,5 +1,5 @@ const helloWorld = function() { - return '' + return 'Hello, World!' }; module.exports = helloWorld; diff --git a/02_repeatString/repeatString.js b/02_repeatString/repeatString.js index 4359bbe..c0c3d47 100644 --- a/02_repeatString/repeatString.js +++ b/02_repeatString/repeatString.js @@ -1,6 +1,12 @@ -const repeatString = function() { - +const repeatString = function(string, num) { + if (num < 0){ + return 'ERROR'; + } else { + return string.repeat(num); + } + }; -// Do not edit below this line +repeatString('hey', 3); module.exports = repeatString; + diff --git a/02_repeatString/repeatString.spec.js b/02_repeatString/repeatString.spec.js index 912ac20..4a8121b 100644 --- a/02_repeatString/repeatString.spec.js +++ b/02_repeatString/repeatString.spec.js @@ -4,19 +4,19 @@ describe('repeatString', () => { test('repeats the string', () => { expect(repeatString('hey', 3)).toEqual('heyheyhey'); }); - test.skip('repeats the string many times', () => { + test('repeats the string many times', () => { expect(repeatString('hey', 10)).toEqual('heyheyheyheyheyheyheyheyheyhey'); }); - test.skip('repeats the string 1 times', () => { + test('repeats the string 1 times', () => { expect(repeatString('hey', 1)).toEqual('hey'); }); - test.skip('repeats the string 0 times', () => { + test('repeats the string 0 times', () => { expect(repeatString('hey', 0)).toEqual(''); }); - test.skip('returns ERROR with negative numbers', () => { + test('returns ERROR with negative numbers', () => { expect(repeatString('hey', -1)).toEqual('ERROR'); }); - test.skip('repeats the string a random amount of times', function () { + test('repeats the string a random amount of times', function () { /*The number is generated by using Math.random to get a value from between 0 to 1, when this is multiplied by 1000 and rounded down with Math.floor it equals a number between 0 to 999 (this number will change everytime you run @@ -31,7 +31,7 @@ describe('repeatString', () => { was randomly generated. */ expect(repeatString('hey', number).match(/((hey))/g).length).toEqual(number); }); - test.skip('works with blank strings', () => { + test('works with blank strings', () => { expect(repeatString('', 10)).toEqual(''); }); }); diff --git a/03_reverseString/reverseString.js b/03_reverseString/reverseString.js index f6790f0..2cc0fbb 100644 --- a/03_reverseString/reverseString.js +++ b/03_reverseString/reverseString.js @@ -1,6 +1,9 @@ -const reverseString = function() { - +const reverseString = function(str) { + let stringIntoArray = str.split(""); + let arrayReverse = stringIntoArray.reverse(); + let arrayIntoString = arrayReverse.join(""); + return arrayIntoString; }; -// Do not edit below this line +reverseString('hello'); module.exports = reverseString; diff --git a/03_reverseString/reverseString.spec.js b/03_reverseString/reverseString.spec.js index 8adb887..b51c50e 100644 --- a/03_reverseString/reverseString.spec.js +++ b/03_reverseString/reverseString.spec.js @@ -5,14 +5,14 @@ describe('reverseString', () => { expect(reverseString('hello')).toEqual('olleh'); }); - test.skip('reverses multiple words', () => { + test('reverses multiple words', () => { expect(reverseString('hello there')).toEqual('ereht olleh') }) - test.skip('works with numbers and punctuation', () => { + test('works with numbers and punctuation', () => { expect(reverseString('123! abc!')).toEqual('!cba !321') }) - test.skip('works with blank strings', () => { + test('works with blank strings', () => { expect(reverseString('')).toEqual('') }) }); diff --git a/04_removeFromArray/removeFromArray.js b/04_removeFromArray/removeFromArray.js index 1bedeb0..82bba98 100644 --- a/04_removeFromArray/removeFromArray.js +++ b/04_removeFromArray/removeFromArray.js @@ -1,6 +1,23 @@ -const removeFromArray = function() { - +const removeFromArray = function(arr, ...removeItems) { + let duplicateArray = arr; + console.log('arr duplicates', duplicateArray); + for (let i=0; i < removeItems.length; i++) { + for (let j=0; j < arr.length; j++) { + if(removeItems[i] === arr[j]){ + duplicateArray.splice(j, 1); + } + } + } + return duplicateArray; }; +removeFromArray([1, 2, 3, 4], 1, 2, 4); + + + +removeFromArray([1, 2, 3, 4], 3); +removeFromArray([1, 2, 3], "1", 3) +removeFromArray([1, 2, 3, 4], 1, 2, 3, 4) -// Do not edit below this line module.exports = removeFromArray; + + diff --git a/04_removeFromArray/removeFromArray.spec.js b/04_removeFromArray/removeFromArray.spec.js index 21f34cf..cb4ef63 100644 --- a/04_removeFromArray/removeFromArray.spec.js +++ b/04_removeFromArray/removeFromArray.spec.js @@ -4,22 +4,27 @@ describe('removeFromArray', () => { test('removes a single value', () => { expect(removeFromArray([1, 2, 3, 4], 3)).toEqual([1, 2, 4]); }); - test.skip('removes multiple values', () => { + test('removes multiple values', () => { expect(removeFromArray([1, 2, 3, 4], 3, 2)).toEqual([1, 4]); }); - test.skip('ignores non present values', () => { + test('ignores non present values', () => { expect(removeFromArray([1, 2, 3, 4], 7, "tacos")).toEqual([1, 2, 3, 4]); }); - test.skip('ignores non present values, but still works', () => { + + + test('ignores non present values, but still works', () => { expect(removeFromArray([1, 2, 3, 4], 7, 2)).toEqual([1, 3, 4]); }); - test.skip('can remove all values', () => { + + test('can remove all values', () => { expect(removeFromArray([1, 2, 3, 4], 1, 2, 3, 4)).toEqual([]); }); - test.skip('works with strings', () => { + test('works with strings', () => { expect(removeFromArray(["hey", 2, 3, "ho"], "hey", 3)).toEqual([2, "ho"]); }); - test.skip('only removes same type', () => { + + + test('only removes same type', () => { expect(removeFromArray([1, 2, 3], "1", 3)).toEqual([1, 2]); }); -}); +}); \ No newline at end of file diff --git a/05_sumAll/sumAll.js b/05_sumAll/sumAll.js index 00880c7..884a269 100644 --- a/05_sumAll/sumAll.js +++ b/05_sumAll/sumAll.js @@ -1,6 +1,26 @@ -const sumAll = function() { - +const sumAll = function(num1, num2) { + if(num1 <= 0 ){ + return "ERROR"; + } else if(num1 < num2 && typeof(num1) === 'number' && typeof(num2) === 'number' ) { + //variable initialisation (int or string) + let sum = 0; + for ( let i= num1; i<= num2; i++){ + //operation on variable + sum += i; + } + return sum; + } else if (num2 < num1 && typeof(num1) === 'number' && typeof(num2) === 'number' ){ + let sumR = 0; + for ( let i= num2; i<= num1; i++){ + sumR += i; + } + return sumR; + } else { + return "ERROR"; + } }; -// Do not edit below this line +sumAll(5, 7) +sumAll(7, 5) + module.exports = sumAll; diff --git a/05_sumAll/sumAll.spec.js b/05_sumAll/sumAll.spec.js index 1a9fb7c..a171e5f 100644 --- a/05_sumAll/sumAll.spec.js +++ b/05_sumAll/sumAll.spec.js @@ -4,19 +4,19 @@ describe('sumAll', () => { test('sums numbers within the range', () => { expect(sumAll(1, 4)).toEqual(10); }); - test.skip('works with large numbers', () => { + test('works with large numbers', () => { expect(sumAll(1, 4000)).toEqual(8002000); }); - test.skip('works with larger number first', () => { + test('works with larger number first', () => { expect(sumAll(123, 1)).toEqual(7626); }); - test.skip('returns ERROR with negative numbers', () => { + test('returns ERROR with negative numbers', () => { expect(sumAll(-10, 4)).toEqual('ERROR'); }); - test.skip('returns ERROR with non-number parameters', () => { + test('returns ERROR with non-number parameters', () => { expect(sumAll(10, "90")).toEqual('ERROR'); }); - test.skip('returns ERROR with non-number parameters', () => { + test('returns ERROR with non-number parameters', () => { expect(sumAll(10, [90, 1])).toEqual('ERROR'); }); }); diff --git a/06_leapYears/leapYears.js b/06_leapYears/leapYears.js index 681eeef..310fc1e 100644 --- a/06_leapYears/leapYears.js +++ b/06_leapYears/leapYears.js @@ -1,6 +1,19 @@ -const leapYears = function() { +const leapYears = function(num) { + if (num % 4 === 0 && !(num % 100 === 0)){ + return true; + } else if (num % 400 === 0 && !(num % 100 === 0)){ + return true; + } else if (num % 400 === 0){ + return true; + } else { + return false; + } }; -// Do not edit below this line +leapYears(2000) +leapYears(1985) + module.exports = leapYears; + + diff --git a/06_leapYears/leapYears.spec.js b/06_leapYears/leapYears.spec.js index 6fdaba9..2cd4110 100644 --- a/06_leapYears/leapYears.spec.js +++ b/06_leapYears/leapYears.spec.js @@ -4,19 +4,19 @@ describe('leapYears', () => { test('works with non century years', () => { expect(leapYears(1996)).toBe(true); }); - test.skip('works with non century years', () => { + test('works with non century years', () => { expect(leapYears(1997)).toBe(false); }); - test.skip('works with ridiculously futuristic non century years', () => { + test('works with ridiculously futuristic non century years', () => { expect(leapYears(34992)).toBe(true); }); - test.skip('works with century years', () => { + test('works with century years', () => { expect(leapYears(1900)).toBe(false); }); - test.skip('works with century years', () => { + test('works with century years', () => { expect(leapYears(1600)).toBe(true); }); - test.skip('works with century years', () => { + test('works with century years', () => { expect(leapYears(700)).toBe(false); }); }); diff --git a/07_tempConversion/tempConversion.js b/07_tempConversion/tempConversion.js index 14153e0..984e4a1 100644 --- a/07_tempConversion/tempConversion.js +++ b/07_tempConversion/tempConversion.js @@ -1,10 +1,19 @@ -const convertToCelsius = function() { +const convertToCelsius = function(temp) { + let Ftemp = temp; + let intoCelsius = (Ftemp - 32)* 5/9 + return Math.round(intoCelsius*10)/10; }; -const convertToFahrenheit = function() { +const convertToFahrenheit = function(temp) { + let cTemp = temp; + let intoFahrenheit = (cTemp * 9/5 + 32) + return Math.round(intoFahrenheit* 10) / 10; }; -// Do not edit below this line +convertToCelsius(32) +convertToFahrenheit(0) + + module.exports = { convertToCelsius, convertToFahrenheit diff --git a/07_tempConversion/tempConversion.spec.js b/07_tempConversion/tempConversion.spec.js index c4f9742..7d0cc93 100644 --- a/07_tempConversion/tempConversion.spec.js +++ b/07_tempConversion/tempConversion.spec.js @@ -4,22 +4,22 @@ describe('convertToCelsius', () => { test('works', () => { expect(convertToCelsius(32)).toEqual(0); }); - test.skip('rounds to 1 decimal', () => { + test('rounds to 1 decimal', () => { expect(convertToCelsius(100)).toEqual(37.8); }); - test.skip('works with negatives', () => { + test('works with negatives', () => { expect(convertToCelsius(-100)).toEqual(-73.3); }); }); describe('convertToFahrenheit', () => { - test.skip('works', () => { + test('works', () => { expect(convertToFahrenheit(0)).toEqual(32); }); - test.skip('rounds to 1 decimal', () => { + test('rounds to 1 decimal', () => { expect(convertToFahrenheit(73.2)).toEqual(163.8); }); - test.skip('works with negatives', () => { + test('works with negatives', () => { expect(convertToFahrenheit(-10)).toEqual(14); }); }); From 660b82042a8ef3887237f0a186c8555eca27172b Mon Sep 17 00:00:00 2001 From: Adelina Moroaca Date: Fri, 22 Dec 2023 15:55:16 +0200 Subject: [PATCH 2/3] Add calculator solution --- 08_calculator/calculator.js | 49 ++++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/08_calculator/calculator.js b/08_calculator/calculator.js index c22e8d2..956a850 100644 --- a/08_calculator/calculator.js +++ b/08_calculator/calculator.js @@ -1,25 +1,52 @@ -const add = function() { - +const add = function(a, b) { + return a + b; }; -const subtract = function() { - +const subtract = function(a, b) { + return a - b; }; -const sum = function() { - + +let arrayDemo = [1, 2, 3, 4, 5]; +let sumNumbers = 0; +for (i = 0; i < arrayDemo.length; i++){ + sumNumbers += arrayDemo[i]; +} + +// const sum = function(array) { +// let sumNr = 0; +// for(i =0; i < array.length; i++){ +// sumNr+= array[i]; +// } +// return sumNr; +// }; + +const sum = function(array) { + return array.reduce((total, value) => total + value , 0); }; -const multiply = function() { +const multiply = function(array) { + return array.reduce((value1, value2) => value1 * value2); }; -const power = function() { - +const power = function(num1, num2) { + return Math.pow(num1,num2); }; -const factorial = function() { - +let arrayN = [1, 2, 3, 4, 5]; +let sumN = 0; +for (i = 0; i < arrayN.length; i++){ + sumN += arrayN[i]; +} + + +const factorial = function(num) { + let total = 1; + for(i=1; i <= num; i++) { + total *= i; + } + return total; }; // Do not edit below this line From 1dce6620191d591491b1028760356aae559a1498 Mon Sep 17 00:00:00 2001 From: Adelina Moroaca Date: Sat, 23 Dec 2023 16:12:05 +0200 Subject: [PATCH 3/3] Add palindrome solution --- 09_palindromes/palindromes.js | 17 ++++++++++++++--- 09_palindromes/palindromes.spec.js | 19 ++++++++++++------- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/09_palindromes/palindromes.js b/09_palindromes/palindromes.js index 8d21018..3d0f4c1 100644 --- a/09_palindromes/palindromes.js +++ b/09_palindromes/palindromes.js @@ -1,6 +1,17 @@ -const palindromes = function () { - +const palindromes = function(str) { + let strL = str.toString().toLowerCase().toUpperCase().replace(/[.,\/#!$%\^&\*;:{}=\-_`~()]/g,"").replace(/[\W_]+/g, ""); + let newStr = ''; + for(i = strL.length; i >= 0; i--){ + newStr += strL.charAt(i); + // console.log(newStr) + } + if (strL === newStr) { + return true; + } else { + return false; + } }; - +palindromes('lid off a daffodil') // true +palindromes('tacos') // false // Do not edit below this line module.exports = palindromes; diff --git a/09_palindromes/palindromes.spec.js b/09_palindromes/palindromes.spec.js index 90d53e4..d019a7f 100644 --- a/09_palindromes/palindromes.spec.js +++ b/09_palindromes/palindromes.spec.js @@ -4,25 +4,30 @@ describe('palindromes', () => { test('works with single words', () => { expect(palindromes('racecar')).toBe(true); }); - test.skip('works with punctuation ', () => { + test('works with punctuation ', () => { expect(palindromes('racecar!')).toBe(true); }); - test.skip('works with upper-case letters ', () => { + test('works with upper-case letters ', () => { expect(palindromes('Racecar!')).toBe(true); }); - test.skip('works with multiple words', () => { + + //de facut + test('works with multiple words', () => { expect(palindromes('A car, a man, a maraca.')).toBe(true); }); - test.skip('works with multiple words', () => { + + //de facut + test('works with multiple words', () => { expect(palindromes('Animal loots foliated detail of stool lamina.')).toBe(true); }); - test.skip('doesn\'t just always return true', () => { + + test('doesn\'t just always return true', () => { expect(palindromes('ZZZZ car, a man, a maracaz.')).toBe(false); }); - test.skip('works with numbers in a string', () => { + test('works with numbers in a string', () => { expect(palindromes('rac3e3car')).toBe(true); }); - test.skip('works with unevenly spaced numbers in a string', () => { + test('works with unevenly spaced numbers in a string', () => { expect(palindromes('r3ace3car')).toBe(false); }); });