diff --git a/lesson_06/expression/src/expression_calculator.ts b/lesson_06/expression/src/expression_calculator.ts index 13cb2ca05..522b07e69 100644 --- a/lesson_06/expression/src/expression_calculator.ts +++ b/lesson_06/expression/src/expression_calculator.ts @@ -1,11 +1,29 @@ export class ExpressionCalculator { /** Returns the calculation of ((a + b) * c) / d^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 P = this.add(a, b); + const E = this.pow(d, e); + const M = this.multiply(P, c); + const D = this.divide(M, E); + return D; + //const expression = this.mult(this.add(a, b), c) / this.pow(d, e); + //return expression; } pow(base: number, exponent: number): number { - return Math.pow(base, exponent); + const expo = Math.pow(base, exponent); + return expo; + } + add(x: number, y: number): number { + const addition = x + y; + return addition; + } + multiply(X: number, Y: number): number { + const multiply = X * Y; + return multiply; + } + divide(x: number, y: number): number { + const divide = x / y; + return divide; } }