From 5767e909a2ff33d5b8abe51e0e914b39fda44eac Mon Sep 17 00:00:00 2001 From: DIKUWCode Date: Thu, 16 Dec 2021 18:15:02 -0700 Subject: [PATCH] Initial Commit --- 01_helloWorld/helloWorld.js | 2 +- 02_repeatString/repeatString.js | 24 ++++++++++++++++++++++-- 02_repeatString/repeatString.spec.js | 12 ++++++------ 03_reverseString/reverseString.js | 7 ++++++- 03_reverseString/reverseString.spec.js | 6 +++--- 04_removeFromArray/removeFromArray.js | 11 +++++++++-- 05_sumAll/sumAll.js | 21 ++++++++++++++++++++- 05_sumAll/sumAll.spec.js | 10 +++++----- 06_leapYears/leapYears.js | 24 ++++++++++++++++++++++-- 06_leapYears/leapYears.spec.js | 10 +++++----- 07_tempConversion/tempConversion.js | 21 ++++++++++++++++++--- 07_tempConversion/tempConversion.spec.js | 10 +++++----- package-lock.json | 6 +++--- package.json | 5 +++-- 14 files changed, 128 insertions(+), 41 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..1559aba 100644 --- a/02_repeatString/repeatString.js +++ b/02_repeatString/repeatString.js @@ -1,6 +1,26 @@ -const repeatString = function() { +const repeatString = function(inString,repeat) { + var newString = ""; + // switch (repeat) { + // case repeat=0: return ""; + // case repeat<0: return "ERROR"; + // default: + // for (i=1; i <= repeat; i++) { + // newString += string; + // } + // return newString; + // } -}; + if (repeat > 0) { + for ( i = 1 ; i <= repeat ; i++) { + newString += inString; + } + return newString; + } else if (repeat < 0) { + return "ERROR"; + } else { + return ""; + } +} // Do not edit below this line module.exports = repeatString; diff --git a/02_repeatString/repeatString.spec.js b/02_repeatString/repeatString.spec.js index 1bcee3c..8379136 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 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..f0c5833 100644 --- a/03_reverseString/reverseString.js +++ b/03_reverseString/reverseString.js @@ -1,5 +1,10 @@ const reverseString = function(str) { - + const temp = str.split(''); + var newString = '' + for (i=1; i <= str.length; i++) { + newString += temp[str.length-i] + } + return newString }; // Do not edit below this line 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..deb403f 100644 --- a/04_removeFromArray/removeFromArray.js +++ b/04_removeFromArray/removeFromArray.js @@ -1,5 +1,12 @@ -const removeFromArray = function() { - +const removeFromArray = ( inArray, ...theFilters ) => { + // Create a local mutable copy of input Array + var filterArray = inArray; + //Cycle through elements of theFilters + for (i = 1; i <= theFilters.length ; i++) { + //Filters filterArray by each sub-element of theFilters element + filterArray = filterArray.filter(item => item !== theFilters[i-1]); + } + return filterArray; }; // Do not edit below this line diff --git a/05_sumAll/sumAll.js b/05_sumAll/sumAll.js index 00880c7..f492cd7 100644 --- a/05_sumAll/sumAll.js +++ b/05_sumAll/sumAll.js @@ -1,4 +1,23 @@ -const sumAll = function() { +const sumAll = function(...theArgs) { + /* - make sure you pay attention to the function parameters + Test that the inputs are +ve integers + */ + const result = theArgs.every(e => Number.isInteger(e) && e > 0); + //Intialize summation variable + var finalSum = null; + if(result) { + // const inMin = ; + // const inMax = ; + for (i = Math.min(...theArgs); i <= Math.max(...theArgs); i++) { + // - on each iteration add the number to the sum + finalSum += i; + } + // - return the sum after finishing the loop + return finalSum + } else { + return 'ERROR'; + } + }; 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..c262bf4 100644 --- a/06_leapYears/leapYears.js +++ b/06_leapYears/leapYears.js @@ -1,5 +1,25 @@ -const leapYears = function() { - +const leapYears = function(...theArgs) { + // > Leap years are years divisible by four (like 1984 and 2004). + // However, years divisible by 100 are not leap years (such as 1800 and 1900) + // unless they are divisible by 400 (like 1600 and 2000, which were in fact leap years). + + //Initialize result variable + var result = null + //Test to ensure input is valid year + const valid = theArgs.every(e => Number.isInteger(e) && e > 0); + //Initialize a year variable + const year = Math.floor(theArgs[0]); + // Check year/4 and fail if not eligible + if (valid && (year % 4) == 0) { + result = true + // check if century and not @ 400 interval + if ((year % 100) == 0 && (year % 400) != 0) { + result = false; + } + } else { + result = false + } +return result }; // Do not edit below this line 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 6ef3e85..5220b58 100644 --- a/07_tempConversion/tempConversion.js +++ b/07_tempConversion/tempConversion.js @@ -1,9 +1,24 @@ -const ftoc = function() { +// Write two functions that convert temperatures from Fahrenheit to Celsius, and vice versa: +// ``` +// ftoc(32) // fahrenheit to celsius, should return 0 +// ctof(0) // celsius to fahrenheit, should return 32 +// ``` + +// Because we are human, +// we want the result temperature to be rounded to one decimal place: +// i.e., `ftoc(100)` should return `37.8` and not `37.77777777777778`. + +const ftoc = function(degF) { + var degC = (degF - 32) * (5/9); + degC = Number.degC.toFixed(1); + return degC; }; -const ctof = function() { - +const ctof = function(degC) { + var degF = (degC*9/5) + 32; + degF = Number.degF.toFixed(1); + return degF; }; // Do not edit below this line diff --git a/07_tempConversion/tempConversion.spec.js b/07_tempConversion/tempConversion.spec.js index 93679cc..b1b82f2 100644 --- a/07_tempConversion/tempConversion.spec.js +++ b/07_tempConversion/tempConversion.spec.js @@ -4,22 +4,22 @@ describe('ftoc', () => { test('works', () => { expect(ftoc(32)).toEqual(0); }); - test.skip('rounds to 1 decimal', () => { + test('rounds to 1 decimal', () => { expect(ftoc(100)).toEqual(37.8); }); - test.skip('works with negatives', () => { + test('works with negatives', () => { expect(ftoc(-100)).toEqual(-73.3); }); }); describe('ctof', () => { - test.skip('works', () => { + test('works', () => { expect(ctof(0)).toEqual(32); }); - test.skip('rounds to 1 decimal', () => { + test('rounds to 1 decimal', () => { expect(ctof(73.2)).toEqual(163.8); }); - test.skip('works with negatives', () => { + test('works with negatives', () => { expect(ctof(-10)).toEqual(14); }); }); diff --git a/package-lock.json b/package-lock.json index d9e2bee..5e9aae5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1253,9 +1253,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001223", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001223.tgz", - "integrity": "sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA==", + "version": "1.0.30001286", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001286.tgz", + "integrity": "sha512-zaEMRH6xg8ESMi2eQ3R4eZ5qw/hJiVsO/HlLwniIwErij0JDr9P+8V4dtx1l+kLq6j3yy8l8W4fst1lBnat5wQ==", "dev": true }, "capture-exit": { diff --git a/package.json b/package.json index 3c203fe..31043d4 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "eslintConfig": { "root": true }, - "jest": { + "jest": { "testPathIgnorePatterns": [ "generator-exercise/" ] - } + }, + "dependencies": {} }