From 73e50fad210509cd837a412bdddcbd19f9ae0509 Mon Sep 17 00:00:00 2001 From: Ananatawa Date: Wed, 19 Mar 2025 15:38:10 +0000 Subject: [PATCH 1/2] Added lesson06 expression calculator and env --- lesson_06/expression/.env.test | 2 +- .../expression/src/expression_calculator.ts | 21 ++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/lesson_06/expression/.env.test b/lesson_06/expression/.env.test index 56cf4a06f..075364dbe 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=C \ 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..c520cdc69 100644 --- a/lesson_06/expression/src/expression_calculator.ts +++ b/lesson_06/expression/src/expression_calculator.ts @@ -2,10 +2,29 @@ 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 exponent = this.pow(d, e); + const division = this.divide(a, b); + const multiplication = this.multiply(c, exponent); + const result = this.add(division, multiplication); + return result; } + // Function to implement: a / b + c * Math.pow(d,e) pow(base: number, exponent: number): number { return Math.pow(base, exponent); } + + add(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 6de74e253266f8bc3156587cf48bb605af31e6cf Mon Sep 17 00:00:00 2001 From: Ananatawa Date: Wed, 19 Mar 2025 16:31:38 +0000 Subject: [PATCH 2/2] Updated indentation on const --- lesson_06/expression/src/expression_calculator.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lesson_06/expression/src/expression_calculator.ts b/lesson_06/expression/src/expression_calculator.ts index c520cdc69..5cc88ce86 100644 --- a/lesson_06/expression/src/expression_calculator.ts +++ b/lesson_06/expression/src/expression_calculator.ts @@ -2,7 +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 exponent = this.pow(d, e); + const exponent = this.pow(d, e); const division = this.divide(a, b); const multiplication = this.multiply(c, exponent); const result = this.add(division, multiplication);