diff --git a/lesson_06/expression/.env.test b/lesson_06/expression/.env.test index 56cf4a06f..13e0eb633 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=C diff --git a/lesson_06/expression/src/expression_calculator.ts b/lesson_06/expression/src/expression_calculator.ts index 76b215c42..f09329998 100644 --- a/lesson_06/expression/src/expression_calculator.ts +++ b/lesson_06/expression/src/expression_calculator.ts @@ -2,10 +2,26 @@ 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; + // a / b + c * Math.pow(d, e), + const division = this.divide(a, b); + const exponentation = this.pow(d, e); + const multiply = this.multiply(c, exponentation); + const result = this.add(division, multiply); + return result; + } + + divide(a: number, b: number): number { + return a / b; } pow(base: number, exponent: number): number { return Math.pow(base, exponent); } + multiply(c: number, f: number): number { + return c * f; + } + + add(num1: number, num2: number): number { + return num1 + num2; + } }