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..028ee0e31 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. - + if (distance < 0) { + return -1; + } else if (distance > 0) { + return 1; + } return 0; + } /** @@ -24,7 +27,15 @@ export function compareStrings(a: string, b: string): number { * @return The factorial of n. */ export function computeFactorial(n: number): number { - return 0; + if (n < 0) { + return 0; + } + let ans:number = 1; + for (let i = 1; i <=n; i++) { + ans*=i + } + + return ans; } /** @@ -34,7 +45,24 @@ export function computeFactorial(n: number): number { * @return An array containing the first `n` Fibonacci values. */ export function getFirstNFibonacciNumbers(n: number): number[] { - return []; + const result = [1,1]; + + // intial check to handle edge cases + if (n <= 0) { + return []; + } else if (n === 1) { + return [1]; + } else if (n === 2) { + return result; + } + + // Generate Fibonacci numbers starting from the third number + for (let i = 2; i < n; i++) { + result.push(result[i - 1] + result[i - 2]); + } + + + return result; } /** @@ -56,14 +84,21 @@ export function binarySearch( // The range is not valid so just return -1. return -1; } - const pivotIndex = Math.floor((start + end) / 2); // The index in the middle of the array. // TODO(you): Finish implementing this algorithm - // If values[pivotIndex] is equal to value then return `pivotIndex`. - // 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. + if (values[pivotIndex] === value) { + return pivotIndex; + // Else if values[pivotIndex] is greater than the value, then + } else if (values[pivotIndex] > value) { + // call `binarySearch(values, start, pivotIndex - 1, value)` and return its value; + return binarySearch(values, start, pivotIndex - 1, value); + // Else call `binarySearch(values, pivotIndex + 1, end, value)` and return its value. + } else { + return binarySearch(values, pivotIndex + 1, end, value); + } + + console.log("Value not found in the array."); return -1; } diff --git a/lesson_07/conditionals/src/part_d.ts b/lesson_07/conditionals/src/part_d.ts index c30cbac2f..d8450772b 100644 --- a/lesson_07/conditionals/src/part_d.ts +++ b/lesson_07/conditionals/src/part_d.ts @@ -7,7 +7,7 @@ * @returns */ export function isWithinRange(num: number, min: number, max: number): boolean { - return false; + return num >= min && num <= max; } /** @@ -19,7 +19,7 @@ export function isWithinRange(num: number, min: number, max: number): boolean { * @returns */ export function isValidTriangle(a: number, b: number, c: number): boolean { - return false; + return a**2 + b**2 == c**2; } /** @@ -30,5 +30,15 @@ export function isValidTriangle(a: number, b: number, c: number): boolean { * @returns */ export function getSeason(month: number): string { + + if (month >= 3 && month <= 5) { + return "Spring"; + } else if (month >= 6 && month <= 8) { + return "Summer"; + } else if (month >= 9 && month <= 11) { + return "Fall"; + } else if (month === 12 || month === 1 || month === 2) { + return "Winter"; + } return "Invalid month"; }