From 6b44cb6a8aae8203656d286759c0e5466429216d Mon Sep 17 00:00:00 2001 From: Evan Philakhong Date: Mon, 17 Mar 2025 19:24:46 +0000 Subject: [PATCH 1/6] feat: added helper function --- lesson_06/expression/.env.test | 2 +- lesson_06/expression/src/expression_calculator.ts | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lesson_06/expression/.env.test b/lesson_06/expression/.env.test index 56cf4a06f..1eeddbff6 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=B \ No newline at end of file diff --git a/lesson_06/expression/src/expression_calculator.ts b/lesson_06/expression/src/expression_calculator.ts index 76b215c42..b3b1a3377 100644 --- a/lesson_06/expression/src/expression_calculator.ts +++ b/lesson_06/expression/src/expression_calculator.ts @@ -8,4 +8,16 @@ export class ExpressionCalculator { pow(base: number, exponent: number): number { return Math.pow(base, exponent); } + + add(a: number, b: number): number { + return a + b; + } + + mutiply(a: number, b: number): number { + return a * b; + } + + divide(a: number, b: number): number { + return a / b; + } } From b9b476f84528295e03bfd1101c8a66c8d3e4824b Mon Sep 17 00:00:00 2001 From: Evan Philakhong Date: Mon, 17 Mar 2025 19:45:14 +0000 Subject: [PATCH 2/6] feat: added calcuate function --- lesson_06/expression/src/expression_calculator.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lesson_06/expression/src/expression_calculator.ts b/lesson_06/expression/src/expression_calculator.ts index b3b1a3377..624ad5ebc 100644 --- a/lesson_06/expression/src/expression_calculator.ts +++ b/lesson_06/expression/src/expression_calculator.ts @@ -2,7 +2,10 @@ 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; + const base: number = this.add(a, b); + const expo: number = c; + + return this.divide(this.pow(base, expo), this.mutiply(d, e)); } pow(base: number, exponent: number): number { From 2703e31612b1f610f0b645ca55e7af4a2a8d0f20 Mon Sep 17 00:00:00 2001 From: Evan Philakhong Date: Mon, 17 Mar 2025 19:50:00 +0000 Subject: [PATCH 3/6] feat: added calucation func --- lesson_06/expression/.env.test | 2 +- lesson_06/expression/src/expression_calculator.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lesson_06/expression/.env.test b/lesson_06/expression/.env.test index 1eeddbff6..56cf4a06f 100644 --- a/lesson_06/expression/.env.test +++ b/lesson_06/expression/.env.test @@ -1 +1 @@ -HW_VERSION=B \ No newline at end of file +HW_VERSION=your assigned version here \ No newline at end of file diff --git a/lesson_06/expression/src/expression_calculator.ts b/lesson_06/expression/src/expression_calculator.ts index 624ad5ebc..9b75d42a9 100644 --- a/lesson_06/expression/src/expression_calculator.ts +++ b/lesson_06/expression/src/expression_calculator.ts @@ -5,7 +5,7 @@ export class ExpressionCalculator { const base: number = this.add(a, b); const expo: number = c; - return this.divide(this.pow(base, expo), this.mutiply(d, e)); + return this.divide(this.pow(base, expo), this.multiply(d, e)); } pow(base: number, exponent: number): number { @@ -16,7 +16,7 @@ export class ExpressionCalculator { return a + b; } - mutiply(a: number, b: number): number { + multiply(a: number, b: number): number { return a * b; } From d9381dd7252c38660bc3002312d237327a96d963 Mon Sep 17 00:00:00 2001 From: Evan Philakhong Date: Mon, 17 Mar 2025 19:55:08 +0000 Subject: [PATCH 4/6] fix: added HW Ver. --- lesson_06/expression/.env.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lesson_06/expression/.env.test b/lesson_06/expression/.env.test index 56cf4a06f..1eeddbff6 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=B \ No newline at end of file From 894994790011b7147cf89410b6fca76350ce4b27 Mon Sep 17 00:00:00 2001 From: Evan Philakhong Date: Mon, 17 Mar 2025 21:20:10 +0000 Subject: [PATCH 5/6] feat: one line --- lesson_06/expression/src/expression_calculator.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lesson_06/expression/src/expression_calculator.ts b/lesson_06/expression/src/expression_calculator.ts index 9b75d42a9..d75a4d06d 100644 --- a/lesson_06/expression/src/expression_calculator.ts +++ b/lesson_06/expression/src/expression_calculator.ts @@ -2,10 +2,7 @@ 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. - const base: number = this.add(a, b); - const expo: number = c; - - return this.divide(this.pow(base, expo), this.multiply(d, e)); + return this.divide(this.pow(this.add(a, b), c), this.multiply(d, e)); } pow(base: number, exponent: number): number { From 249a1e49e9bcccf1d39d31781091fd6298311562 Mon Sep 17 00:00:00 2001 From: Evan Philakhong Date: Wed, 19 Mar 2025 13:21:41 +0000 Subject: [PATCH 6/6] refactor: added stored results in variables --- lesson_06/expression/src/expression_calculator.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lesson_06/expression/src/expression_calculator.ts b/lesson_06/expression/src/expression_calculator.ts index d75a4d06d..9dbedddde 100644 --- a/lesson_06/expression/src/expression_calculator.ts +++ b/lesson_06/expression/src/expression_calculator.ts @@ -2,7 +2,11 @@ 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 this.divide(this.pow(this.add(a, b), c), this.multiply(d, e)); + const base: number = this.add(a, b); + const num1: number = this.pow(base, c); + const num2: number = this.multiply(d, e); + const result: number = this.divide(num1, num2); + return result; } pow(base: number, exponent: number): number {