From b041d6d1f6ad34050ad51feb459a678c75603159 Mon Sep 17 00:00:00 2001 From: bscott519 Date: Mon, 18 Aug 2025 20:07:41 +0000 Subject: [PATCH 1/5] created math functions and assigned expression for A --- .../expression/src/expression_calculator.ts | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/lesson_06/expression/src/expression_calculator.ts b/lesson_06/expression/src/expression_calculator.ts index 76b215c42..7241f8104 100644 --- a/lesson_06/expression/src/expression_calculator.ts +++ b/lesson_06/expression/src/expression_calculator.ts @@ -2,10 +2,26 @@ export class ExpressionCalculator { /** Returns a calculation involving a, b, c, d, and e */ calculate(a: number, b: number, c: number, d: number, e: number): number { // Implement your code here to return the correct value. - return 0; + return this.divide(this.multiply(this.add(a, b), c), this.pow(d, e)); } pow(base: number, exponent: number): number { return Math.pow(base, exponent); } + + add(a: number, b: number): number { + return a + b; + } + + subtract(a: number, b: number): number { + return a - b; + } + + multiply(a: number, b: number): number { + return a * b; + } + + divide(a: number, b: number): number { + return a / b; + } } From c247e8cdef6ea5909d6f4fe16322cc99cb7c8538 Mon Sep 17 00:00:00 2001 From: bscott519 Date: Mon, 18 Aug 2025 20:20:51 +0000 Subject: [PATCH 2/5] added README for stretch --- lesson_06/expression/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 lesson_06/expression/README.md diff --git a/lesson_06/expression/README.md b/lesson_06/expression/README.md new file mode 100644 index 000000000..2785ed3ba --- /dev/null +++ b/lesson_06/expression/README.md @@ -0,0 +1 @@ +# Stretch Assignment From 5f54bcf73e39f7d4c9d720d556b44c38eaedf250 Mon Sep 17 00:00:00 2001 From: bscott519 Date: Tue, 19 Aug 2025 14:30:17 +0000 Subject: [PATCH 3/5] created function for stretch assignment --- lesson_06/benjaminscott/README.md | 33 +++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 lesson_06/benjaminscott/README.md diff --git a/lesson_06/benjaminscott/README.md b/lesson_06/benjaminscott/README.md new file mode 100644 index 000000000..4719e972d --- /dev/null +++ b/lesson_06/benjaminscott/README.md @@ -0,0 +1,33 @@ +# Stretch Assignment + +``` +function isValidAlphaAbbreviation(word: string, abbr: string): boolean { + var letterToNum = { "a": 1, "b": 2, "c": 3, "d": 4, "e": 5, "f": 6, "g": 7, "h": 8, "i": 9, "j": 10, "k": 11, "l": 12, "m": 13, "n": 14, "o": 15, "p": 16, "q": 17, "r": 18, "s": 19, "t": 20, "u": 21, "v": 22, "w": 23, "x": 24, "y": 25, "z": 26 }; + let wordIndex = 0; + let abbrIndex = 0; + + while (abbrIndex < abbr.length && wordIndex < word.length) { + if (abbr[abbrIndex] === word[wordIndex]) { + wordIndex++; + + } else { + const currentAbbrChar = abbr[abbrIndex]; + + if (currentAbbrChar < 'a' || currentAbbrChar > 'z') { + return false; + } + + const targetNumber = letterToNum[currentAbbrChar]; + + wordIndex += targetNumber; + } + + abbrIndex++; + } + + if (abbrIndex === abbr.length && wordIndex === word.length) { + return true; + } + return false; +} +``` From 5dd4db8eab36de7d1276726d42056983a32d751a Mon Sep 17 00:00:00 2001 From: bscott519 Date: Tue, 19 Aug 2025 19:15:50 +0000 Subject: [PATCH 4/5] added edited .env.test file --- lesson_06/expression/.env.test | 2 +- lesson_06/expression/README.md | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 lesson_06/expression/README.md diff --git a/lesson_06/expression/.env.test b/lesson_06/expression/.env.test index 56cf4a06f..8532774b0 100644 --- a/lesson_06/expression/.env.test +++ b/lesson_06/expression/.env.test @@ -1 +1 @@ -HW_VERSION=your assigned version here \ No newline at end of file +HW_VERSION=A \ No newline at end of file diff --git a/lesson_06/expression/README.md b/lesson_06/expression/README.md deleted file mode 100644 index 2785ed3ba..000000000 --- a/lesson_06/expression/README.md +++ /dev/null @@ -1 +0,0 @@ -# Stretch Assignment From c828c0b83d9f8b0c348b30c9eb96c7bd7be138a7 Mon Sep 17 00:00:00 2001 From: bscott519 Date: Wed, 20 Aug 2025 13:24:39 +0000 Subject: [PATCH 5/5] adjusted stretch code --- lesson_06/benjaminscott/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lesson_06/benjaminscott/README.md b/lesson_06/benjaminscott/README.md index 4719e972d..c12b4f1ce 100644 --- a/lesson_06/benjaminscott/README.md +++ b/lesson_06/benjaminscott/README.md @@ -2,7 +2,7 @@ ``` function isValidAlphaAbbreviation(word: string, abbr: string): boolean { - var letterToNum = { "a": 1, "b": 2, "c": 3, "d": 4, "e": 5, "f": 6, "g": 7, "h": 8, "i": 9, "j": 10, "k": 11, "l": 12, "m": 13, "n": 14, "o": 15, "p": 16, "q": 17, "r": 18, "s": 19, "t": 20, "u": 21, "v": 22, "w": 23, "x": 24, "y": 25, "z": 26 }; + const letterToNum = { "a": 1, "b": 2, "c": 3, "d": 4, "e": 5, "f": 6, "g": 7, "h": 8, "i": 9, "j": 10, "k": 11, "l": 12, "m": 13, "n": 14, "o": 15, "p": 16, "q": 17, "r": 18, "s": 19, "t": 20, "u": 21, "v": 22, "w": 23, "x": 24, "y": 25, "z": 26 }; let wordIndex = 0; let abbrIndex = 0;