diff --git a/lesson_07/conditionals/.env.test b/lesson_07/conditionals/.env.test index de8c44249..f811b9059 100644 --- a/lesson_07/conditionals/.env.test +++ b/lesson_07/conditionals/.env.test @@ -1 +1 @@ -HW_VERSION=your homework version here \ No newline at end of file +HW_VERSION=D \ No newline at end of file diff --git a/lesson_07/conditionals/src/lesson7.ts b/lesson_07/conditionals/src/lesson7.ts index cc44be44c..12948d106 100644 --- a/lesson_07/conditionals/src/lesson7.ts +++ b/lesson_07/conditionals/src/lesson7.ts @@ -11,10 +11,13 @@ export function compareStrings(a: string, b: string): number { // The distance will be a number less than 0 if string `a` is lexicographically less than `b`, 1 // if it is greater, and 0 if the strings are equal. const distance = computeLexicographicDistance(a, b); - - // TODO(you): Finish this method. - - return 0; + if (distance < 0) { + return -1; + } else if (distance > 0) { + return 1; + } else { + return 0; + } } /** @@ -24,7 +27,22 @@ export function compareStrings(a: string, b: string): number { * @return The factorial of n. */ export function computeFactorial(n: number): number { - return 0; + // worked with Davis to complete this coding problem + // edge cases + if (n === 0) { + return 1; + } + if (n === 1) { + return 1; + } + if (n < 0) { + return 0; + } + let result = 1; + for (let i = 2; i <= n; i++) { + result *= i; + } + return result; } /** @@ -34,7 +52,20 @@ export function computeFactorial(n: number): number { * @return An array containing the first `n` Fibonacci values. */ export function getFirstNFibonacciNumbers(n: number): number[] { - return []; + // edge cases + if (n === 0) { + return []; + } + if (n === 1) { + return [1]; + } + // create array + const number: number[] = [1, 1]; + for (let i = 2; i < n; i++) { + //iterate thorugh items in array + number.push(number[i - 1] + number[i - 2]); + } + return number; } /** @@ -65,5 +96,11 @@ export function binarySearch( // Else if values[pivotIndex] is greater than the value, then // call `binarySearch(values, start, pivotIndex - 1, value)` and return its value; // Else call `binarySearch(values, pivotIndex + 1, end, value)` and return its value. - return -1; + if (values[pivotIndex] === value) { + return pivotIndex; + } else if (values[pivotIndex] > value) { + return binarySearch(values, start, pivotIndex - 1, value); + } else { + return binarySearch(values, pivotIndex + 1, end, value); + } } diff --git a/lesson_07/conditionals/src/part_d.ts b/lesson_07/conditionals/src/part_d.ts index c30cbac2f..df0cb88ed 100644 --- a/lesson_07/conditionals/src/part_d.ts +++ b/lesson_07/conditionals/src/part_d.ts @@ -7,7 +7,11 @@ * @returns */ export function isWithinRange(num: number, min: number, max: number): boolean { - return false; + if (num >= min && num <= max) { + return true; + } else { + return false; + } } /** @@ -19,7 +23,14 @@ export function isWithinRange(num: number, min: number, max: number): boolean { * @returns */ export function isValidTriangle(a: number, b: number, c: number): boolean { - return false; + /* a + b > c + a + c > b + b + c > a*/ + if (a + b > c && a + c > b && b + c > a) { + return true; + } else { + return false; + } } /** @@ -30,5 +41,18 @@ export function isValidTriangle(a: number, b: number, c: number): boolean { * @returns */ export function getSeason(month: number): string { - return "Invalid month"; + if (month === 1 || month === 2 || month === 12) { + return "Winter"; + } + if (month === 3 || month === 4 || month === 5) { + return "Spring"; + } + if (month === 6 || month === 7 || month === 8) { + return "Summer"; + } + if (month === 9 || month === 10 || month === 11) { + return "Fall"; + } else { + return "Invalid month"; + } }