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..9eedb5c23 100644 --- a/lesson_06/expression/src/expression_calculator.ts +++ b/lesson_06/expression/src/expression_calculator.ts @@ -1,11 +1,25 @@ 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 exponential = this.pow(a, b); + const addition = this.add(exponential, c); + const multiply = this.multiply(addition, d); + const divide = this.divide(multiply, e); + // const divide = this.divide(multiply, e); + return divide; + } pow(base: number, exponent: number): number { return Math.pow(base, exponent); } + add(number1: number, number2: number): number { + return number1 + number2; + } + multiply(number1: number, number2: number): number { + return number1 * number2; + } + divide(number1: number, number2: number): number { + return number1 / number2; + } }