diff --git a/lesson_06/expression/.env.test b/lesson_06/expression/.env.test index 56cf4a06f..b77a3d9ed 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=A diff --git a/lesson_06/expression/src/expression_calculator.ts b/lesson_06/expression/src/expression_calculator.ts index 76b215c42..5543c41d6 100644 --- a/lesson_06/expression/src/expression_calculator.ts +++ b/lesson_06/expression/src/expression_calculator.ts @@ -1,11 +1,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; + add(a: number, b: number): number { + return a + b; + } + + multiply(a: number, b: number): number { + return a * b; + } + + divide(a: number, b: number): number { + if (b === 0) throw new Error("Cannot divide by zero"); + return a / b; + } + + pow(a: number, b: number): number { + return Math.pow(a, b); } - pow(base: number, exponent: number): number { - return Math.pow(base, exponent); + calculate(a: number, b: number, c: number, d: number, e: number): number { + const step1 = this.add(a, b); + const step2 = this.multiply(step1, c); + const step3 = this.pow(d, e); + const result = this.divide(step2, step3); + return result; } }