diff --git a/lesson_06/expression/src/expression_calculator.ts b/lesson_06/expression/src/expression_calculator.ts index 13cb2ca05..f959d36a0 100644 --- a/lesson_06/expression/src/expression_calculator.ts +++ b/lesson_06/expression/src/expression_calculator.ts @@ -1,11 +1,27 @@ 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 adding = this.add(a,b); + const multiply = this.multiply(adding,c); + const power = this.pow(d,e); + const div = this.divide(multiply, power); + return div; } - pow(base: number, exponent: number): number { - return Math.pow(base, exponent); + const power = Math.pow(base, exponent); + return power; + } + add(num1: number, num2: number): number { + const adding = num1 + num2; + return adding; + } + multiply(numA: number, numB: number): number { + const mult = numA * numB; + return mult; + } + divide(intA: number, intB: number): number { + const div = intA/intB; + return div; } } +//divide(multiply(add(a, b), c), pow(d, e))