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..a07a2a6f2 100644 --- a/lesson_06/expression/src/expression_calculator.ts +++ b/lesson_06/expression/src/expression_calculator.ts @@ -2,10 +2,28 @@ 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.pow(this.add(a, b), c), this.multiply(d, e)); + } + +add(a: number, b: number): number { + return a + b; } - pow(base: number, exponent: number): number { +multiply(d: number, e: number): number { + return d * e; + } + +pow(base: number, exponent: number): number { return Math.pow(base, exponent); } + +divide(a: number, b: number): number { + if (b === 0) { + throw new Error("Division by zero is not allowed."); + } + + return a / b; + } + }