From fe834ed586c9acdba3c37db851d8089fc3c26766 Mon Sep 17 00:00:00 2001 From: Rasheed Date: Wed, 19 Mar 2025 11:45:21 +0000 Subject: [PATCH 1/2] lesson_06_hw --- lesson_06/expression/.env.test | 2 +- .../expression/src/expression_calculator.ts | 27 ++++++++++++++----- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/lesson_06/expression/.env.test b/lesson_06/expression/.env.test index 56cf4a06f..9fd9f468b 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=E \ 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..b08e91551 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; } - pow(base: number, exponent: number): number { return Math.pow(base, exponent); } -} + divide(a: number, b: number): number { + /*if (denominator === 0) { + throw new Error("Cannot divide by zero"); + } + */return a / b; + } + + multiply(a: number, b: number): number { + return a * b; + } + calculate(a: number, b: number, c: number, d: number, e: number): number { + const sumResult = this.add(a, b); + const divisionResult = this.divide(sumResult, c); + const powerResult = this.pow(c, d); + const multiplication = this.multiply(divisionResult, e); + console.log({ sumResult, powerResult, divisionResult, }); + return multiplication + } + } From e84beccd8323d5e5eba363619af5dfd2ee73f954 Mon Sep 17 00:00:00 2001 From: Rasheed Date: Wed, 19 Mar 2025 17:02:58 +0000 Subject: [PATCH 2/2] debug comments removed --- lesson_06/expression/src/expression_calculator.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lesson_06/expression/src/expression_calculator.ts b/lesson_06/expression/src/expression_calculator.ts index b08e91551..b5029728f 100644 --- a/lesson_06/expression/src/expression_calculator.ts +++ b/lesson_06/expression/src/expression_calculator.ts @@ -6,10 +6,7 @@ export class ExpressionCalculator { return Math.pow(base, exponent); } divide(a: number, b: number): number { - /*if (denominator === 0) { - throw new Error("Cannot divide by zero"); - } - */return a / b; + return a / b; } multiply(a: number, b: number): number { @@ -20,7 +17,7 @@ export class ExpressionCalculator { const divisionResult = this.divide(sumResult, c); const powerResult = this.pow(c, d); const multiplication = this.multiply(divisionResult, e); - console.log({ sumResult, powerResult, divisionResult, }); - return multiplication + void powerResult; + return multiplication } }