From a9a4ce0ff748dece4fe8fd84150705655f5189ea Mon Sep 17 00:00:00 2001 From: Dylan Date: Mon, 17 Mar 2025 19:51:25 +0000 Subject: [PATCH 1/2] Chore: adds hw style --- lesson_06/expression/.env.test | 2 +- package-lock.json | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 package-lock.json diff --git a/lesson_06/expression/.env.test b/lesson_06/expression/.env.test index 56cf4a06f..6f05a4e86 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=F diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 000000000..7ffd06b2c --- /dev/null +++ b/package-lock.json @@ -0,0 +1,6 @@ +{ + "name": "code-differently-25-q1-fork", + "lockfileVersion": 3, + "requires": true, + "packages": {} +} From c5bad976107761f447cc903481778a68c676ed53 Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 21 Mar 2025 14:30:39 +0000 Subject: [PATCH 2/2] FIX: I created a new branch and added calc --- .../expression/src/expression_calculator.ts | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/lesson_06/expression/src/expression_calculator.ts b/lesson_06/expression/src/expression_calculator.ts index 76b215c42..bdb7d14f8 100644 --- a/lesson_06/expression/src/expression_calculator.ts +++ b/lesson_06/expression/src/expression_calculator.ts @@ -1,11 +1,24 @@ 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(base: number, exponent: number): number { return Math.pow(base, exponent); } -} + + calculate(a: number, b: number, c: number, d: number, e: number): number { + return this.multiply(a, this.divide(this.pow(this.add(b, c), d), e)); + } +} \ No newline at end of file