diff --git a/src/project-1.js b/src/project-1.js index dc26cfb..34a96f7 100644 --- a/src/project-1.js +++ b/src/project-1.js @@ -3,115 +3,136 @@ const multiplyByTen = (num) => { // return num after multiplying it by ten // code here + return num * 10; }; const subtractFive = (num) => { // return num after subtracting five // code here + return num - 5; }; const areSameLength = (str1, str2) => { // return true if the two strings have the same length // otherwise return false // code here + return (str1.length === str2.length) === true; }; const areEqual = (x, y) => { // return true if x and y are the same // otherwise return false // code here + return (x === y) === true; }; const lessThanNinety = (num) => { // return true if num is less than ninety // otherwise return false // code here + return (num < 90) === true; }; const greaterThanFifty = (num) => { // return true if num is greater than fifty // otherwise return false // code here + return (num > 50) === true; }; const add = (x, y) => { // add x and y together and return the value // code here + return x + y; }; const subtract = (x, y) => { // subtract y from x and return the value // code here + return x - y; }; const divide = (x, y) => { // divide x by y and return the value // code here + return x / y; }; const multiply = (x, y) => { // multiply x by y and return the value // code here + return x * y; }; const getRemainder = (x, y) => { // return the remainder from dividing x by y // code here + return x % y; }; const isEven = (num) => { // return true if num is even // otherwise return false // code here + return (num % 2 === 0) === true; }; const isOdd = (num) => { // return true if num is odd // otherwise return false // code here + return (num % 2 === 1) === true; }; const square = (num) => { // square num and return the new value // code here + return Math.pow(num, 2); }; const cube = (num) => { // cube num and return the new value // code here + return Math.pow(num, 3); }; const raiseToPower = (num, exponent) => { // raise num to whatever power is passed in as exponent // code here + return Math.pow(num, exponent); }; const roundNumber = (num) => { // round num and return it // code here + return Math.round(num); }; const roundUp = (num) => { // round num up and return it // code here + return Math.ceil(num); }; const addExclamationPoint = (str) => { // add an exclamation point to the end of str and return the new string // 'hello world' -> 'hello world!' // code here + return `${str}!`; }; const combineNames = (firstName, lastName) => { // return firstName and lastName combined as one string and separated by a space. // 'Lambda', 'School' -> 'Lambda School' // code here + return `${firstName} ${lastName}`; }; const getGreeting = (name) => { // Take the name string and concatenate other strings onto it so it takes the following form: // 'Sam' -> 'Hello Sam!' // code here + return `Hello ${name}!`; }; // If you can't remember these area formulas then head over to Google or look at the test code. @@ -119,21 +140,25 @@ const getGreeting = (name) => { const getRectangleArea = (length, width) => { // return the area of the rectangle by using length and width // code here + return length * width; }; const getTriangleArea = (base, height) => { // return the area of the triangle by using base and height // code here + return 0.5 * base * height; }; const getCircleArea = (radius) => { // return the rounded area of the circle given the radius // code here + return Math.round(Math.PI * Math.pow(radius, 2)); }; const getRectangularPrismVolume = (length, width, height) => { // return the volume of the 3D rectangular prism given the length, width, and height // code here + return length * width * height; }; // Do not modify code below this line. diff --git a/src/project-2.js b/src/project-2.js index 5fe0047..2b6bf3c 100644 --- a/src/project-2.js +++ b/src/project-2.js @@ -3,6 +3,7 @@ const getBiggest = (x, y) => { // x and y are integers. Return the larger integer // if they are the same return either one + return (x > y) ? x : y; }; const greeting = (language) => { @@ -11,15 +12,25 @@ const greeting = (language) => { // language: 'Spanish' -> 'Hola!' // language: 'Chinese' -> 'Ni Hao!' // if language is undefined return 'Hello!' + if (language === 'German') { + return 'Guten Tag!'; + } else if (language === 'Spanish') { + return 'Hola!'; + } else if (language === 'Chinese') { + return 'Ni Hao!'; + } + return 'Hello!'; }; const isTenOrFive = (num) => { // return true if num is 10 or 5 // otherwise return false + return ((num === 10) || (num === 5)) === true; }; const isInRange = (num) => { // return true if num is less than 50 and greater than 20 + return ((num < 50) && (num > 20)) === true; }; const isInteger = (num) => { @@ -29,6 +40,7 @@ const isInteger = (num) => { // -10 -> true // otherwise return false // hint: you can solve this using Math.floor + return (Math.floor(num) === num) === true; }; const fizzBuzz = (num) => { @@ -36,6 +48,18 @@ const fizzBuzz = (num) => { // if num is divisible by 5 return 'buzz' // if num is divisible by 3 & 5 return 'fizzbuzz' // otherwise return num + + if ((num % 3 === 0) && (num % 5 === 0)) { + return 'fizzbuzz'; + } + + if (num % 3 === 0) { + return 'fizz'; + } else if (num % 5 === 0) { + return 'buzz'; + } + + return num; }; const isPrime = (num) => { @@ -44,35 +68,48 @@ const isPrime = (num) => { // hint: a prime number is only evenly divisible by itself and 1 // hint2: you can solve this using a for loop // note: 0 and 1 are NOT considered prime numbers + if (num === 0 || num === 1) return false; + for (let i = 2; i < num; i++) { + if (num % i === 0) return false; + } + return true; }; const returnFirst = (arr) => { // return the first item from the array + return arr[0]; }; const returnLast = (arr) => { // return the last item of the array + return arr[arr.length - 1]; }; const getArrayLength = (arr) => { // return the length of the array + return arr.length; }; const incrementByOne = (arr) => { // arr is an array of integers // increase each integer by one // return the array + return arr.map(num => num + 1); }; const addItemToArray = (arr, item) => { // add the item to the end of the array // return the array + arr.push(item); + return arr; }; const addItemToFront = (arr, item) => { // add the item to the front of the array // return the array // hint: use the array method .unshift + arr.unshift(item); + return arr; }; const wordsToSentence = (words) => { @@ -80,26 +117,39 @@ const wordsToSentence = (words) => { // return a string that is all of the words concatenated together // spaces need to be between each word // example: ['Hello', 'world!'] -> 'Hello world!' + return words.join(' '); }; const contains = (arr, item) => { // check to see if item is inside of arr // return true if it is, otherwise return false + return arr.includes(item); }; const addNumbers = (numbers) => { // numbers is an array of integers. // add all of the integers and return the value + let sum = 0; + numbers.forEach(number => sum += number); + return sum; }; const averageTestScore = (testScores) => { // testScores is an array. Iterate over testScores and compute the average. // return the average + return ((addNumbers(testScores) / (testScores.length))); }; const largestNumber = (numbers) => { // numbers is an array of integers // return the largest integer + let largest = numbers[0]; + for (let i = 0; i < numbers.length; i++) { + if (numbers[i] > largest) { + largest = numbers[i]; + } + } + return largest; }; // Do not modify code below this line.