From cc086805b7b3fe3f1987874f3579895bf2e76665 Mon Sep 17 00:00:00 2001 From: BananaBJones Date: Fri, 5 Nov 2021 23:56:07 -0600 Subject: [PATCH] done --- 02_repeatString/repeatString.js | 10 ++++++++-- 02_repeatString/repeatString.spec.js | 6 +++--- 03_reverseString/reverseString.js | 8 ++++++-- 03_reverseString/reverseString.spec.js | 6 +++--- 04_removeFromArray/removeFromArray.js | 9 +++++++++ 04_removeFromArray/removeFromArray.spec.js | 12 ++++++------ 05_sumAll/README.md | 1 + 05_sumAll/sumAll.js | 17 ++++++++++++++++- 05_sumAll/sumAll.spec.js | 10 +++++----- 9 files changed, 57 insertions(+), 22 deletions(-) diff --git a/02_repeatString/repeatString.js b/02_repeatString/repeatString.js index 7e7ae7c..30f615b 100644 --- a/02_repeatString/repeatString.js +++ b/02_repeatString/repeatString.js @@ -1,9 +1,15 @@ const repeatString = function(string, num) { let newString = ''; - for (i = 0; i < num; i++) { - newString += string; + if (num >= 0) { + for (i = 0; i < num; i++) { + newString += string; + } + } + else { + return 'ERROR'; } + return newString; }; diff --git a/02_repeatString/repeatString.spec.js b/02_repeatString/repeatString.spec.js index 231c47b..8379136 100644 --- a/02_repeatString/repeatString.spec.js +++ b/02_repeatString/repeatString.spec.js @@ -13,10 +13,10 @@ describe('repeatString', () => { 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 randomaly 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 b6d0a9a..a9e3d67 100644 --- a/03_reverseString/reverseString.js +++ b/03_reverseString/reverseString.js @@ -1,6 +1,10 @@ const reverseString = function(str) { - + var newString = ''; + for (i = str.length -1; i >=0; i--) { + newString += str[i]; + } + return newString; }; - + // Do not edit below this line 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..86af2b8 100644 --- a/04_removeFromArray/removeFromArray.js +++ b/04_removeFromArray/removeFromArray.js @@ -1,4 +1,13 @@ const removeFromArray = function() { + let array = arguments[0]; + for (i = arguments[0].length - 1; i >= 0; i--) { + for (j = 1; j < arguments.length; j++) { + if (arguments[j] === array[i]) { + array.splice(i, 1); + } + } + } + return array; }; diff --git a/04_removeFromArray/removeFromArray.spec.js b/04_removeFromArray/removeFromArray.spec.js index 21f34cf..c17239a 100644 --- a/04_removeFromArray/removeFromArray.spec.js +++ b/04_removeFromArray/removeFromArray.spec.js @@ -4,22 +4,22 @@ 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]); }); }); diff --git a/05_sumAll/README.md b/05_sumAll/README.md index 8e18b9e..9c5c8e5 100644 --- a/05_sumAll/README.md +++ b/05_sumAll/README.md @@ -7,6 +7,7 @@ sumAll(1, 4) // returns the sum of 1 + 2 + 3 + 4 which is 10 ``` + ## Hints Think about how you would do this on pen and paper and then how you might translate that process into code: diff --git a/05_sumAll/sumAll.js b/05_sumAll/sumAll.js index 00880c7..0c0edee 100644 --- a/05_sumAll/sumAll.js +++ b/05_sumAll/sumAll.js @@ -1,4 +1,19 @@ -const sumAll = function() { +const sumAll = function(num1, num2) { + let sum = 0; + if (Math.sign(num1) === 1 && Math.sign(num2) === 1 && typeof(num1) === 'number' && typeof(num2) === 'number') { + if (num1 < num2) { + for (i = num1; i <= num2; i++) { + sum += i; + } + } else { + for (i = num2; i <= num1; i++) { + sum += i; + } + } + } else { + return 'ERROR'; + } + return sum; }; 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'); }); });