Skip to content

chore: added functions for Lesson07.ts and part_d #329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 11 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lesson_07/conditionals/.env.test
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HW_VERSION=your homework version here
HW_VERSION=D
2 changes: 1 addition & 1 deletion lesson_07/conditionals/package-lock.json
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You've deleted the wrong package-lock.json file. You need to restore this one and delete the other.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I trial and error attempted to restore the file, but to no avail. I eventually figured to copy, paste and manually re-add the package-lock.json file to the conditionals folder. Just deleted the correct one! Thanks so much for your patience.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still see this file is modified.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

63 changes: 51 additions & 12 deletions lesson_07/conditionals/src/lesson7.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,23 @@ import { computeLexicographicDistance } from "./util.js";
* @param b The second `string` to compare.
* @return -1 if a is less than b, 1 if a is greater than b, and 0 otherwise.
*/
export function compareStrings(a: string, b: string): number {
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;
}

}

/**
* Computes the factorial of the given value of `n`.
Expand All @@ -24,7 +32,18 @@ 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 1;
}
else if (n === 1) {
return 1;
}
else if (n < 0) {
return 0;
}
else {
return n * computeFactorial(n-1);
}
}

/**
Expand All @@ -34,7 +53,21 @@ export function computeFactorial(n: number): number {
* @return An array containing the first `n` Fibonacci values.
*/
export function getFirstNFibonacciNumbers(n: number): number[] {
return [];

for (let i = 0; i < n; i++) {
if (n === 0)
return [];

else if (n === 2) {
return[1,1];
}
else {
const fib = getFirstNFibonacciNumbers(n -1);
fib.push(fib[fib.length- 1] + fib[fib.length - 2]);
return fib;
}
}
return[];
}

/**
Expand All @@ -52,18 +85,24 @@ export function binarySearch(
end: number,
value: number,
): number {
if (end < start) {
// The range is not valid so just return -1.
return -1;
if (start > end) {
return -1; // base case: not found
}

const pivotIndex = Math.floor((start + end) / 2); // The index in the middle of the array.
const pivotIndex = Math.floor((start + end) / 2);

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);
}
}

// 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.
return -1;
}
// Else call `binarySearch(values, pivotIndex + 1, end, value)` and return its value.
23 changes: 18 additions & 5 deletions lesson_07/conditionals/src/part_d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@
* @returns
*/
export function isWithinRange(num: number, min: number, max: number): boolean {
return false;
}
return num >= min && num <= max;
}

console.log(isWithinRange(7, 5, 10));
console.log(isWithinRange(2, 5, 10));

/**
* Determine if a shape is a triangle based on the given side lengths.
Expand All @@ -19,7 +22,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 + b > c && a + c > b && b + c > a;
}

/**
Expand All @@ -30,5 +33,15 @@ export function isValidTriangle(a: number, b: number, c: number): boolean {
* @returns
*/
export function getSeason(month: number): string {
return "Invalid month";
}
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";
} else {
return "Invalid month";
}
}