From fa057e6a48c9ab9a08e25dd0a9ef9b6c3d810c6f Mon Sep 17 00:00:00 2001 From: Meiko-S22 Date: Tue, 18 Mar 2025 13:24:53 +0000 Subject: [PATCH] feat: adds completed calculator fucntion --- lesson_06/expression/.env.test | 2 +- lesson_06/expression/src/expression_calculator.ts | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/lesson_06/expression/.env.test b/lesson_06/expression/.env.test index 56cf4a06f..7ef456912 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=G \ 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..c7f31fff7 100644 --- a/lesson_06/expression/src/expression_calculator.ts +++ b/lesson_06/expression/src/expression_calculator.ts @@ -2,10 +2,23 @@ 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(a, b); + const addition = this.add(exponent, c); + const multiplication = this.multiply(addition, d); + const division = this.divide(multiplication, e); + return division; } 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; + } }