From 123e2ae615abb46ddbc9869a34f9aa98a723fe18 Mon Sep 17 00:00:00 2001
From: karensprojects22 <koalabi251@gmail.com>
Date: Wed, 19 Mar 2025 15:37:55 +0000
Subject: [PATCH 1/3] feat: adds Karens lesson_06 calculator expressions

---
 lesson_06/expression/.env.test                |  2 +-
 .../expression/src/expression_calculator.ts   | 23 ++++++++++++++++++-
 package-lock.json                             |  6 +++++
 3 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 package-lock.json

diff --git a/lesson_06/expression/.env.test b/lesson_06/expression/.env.test
index 56cf4a06f..8532774b0 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
\ 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..074d1d9ad 100644
--- a/lesson_06/expression/src/expression_calculator.ts
+++ b/lesson_06/expression/src/expression_calculator.ts
@@ -2,10 +2,31 @@ 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 addition = this.add(a, b);
+    const multiplication = this.multiply(addition, c);
+    const power = this.pow(d, e);
+    const division = this.divide(multiplication, power);
+    return division;
+    //return (this.add(a, b) * c) / this.pow(d, e);
   }
 
+  // Function to be implemented: (a + b) * c / Math.pow(d, e)
+
   pow(base: number, exponent: number): number {
     return Math.pow(base, exponent);
   }
+  add(a: number, b: number): number {
+    return a + b;
+  }
+
+  multiply(a: number, b: number): number {
+    return a * b;
+  }
+
+  divide(a: number, b: number): number {
+    return a / b;
+  }
 }
+
+
+//end of file//
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 000000000..649f8d4bb
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+  "name": "code-differently-25-q1",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}

From 194ac6b62c3f755eaa97627cd3084a5912b1dd18 Mon Sep 17 00:00:00 2001
From: karensprojects22 <koalabi251@gmail.com>
Date: Wed, 19 Mar 2025 20:04:06 +0000
Subject: [PATCH 2/3] chore: deleted commented code on Karens lesson_06
 expressions calculator assignment

---
 lesson_06/expression/src/expression_calculator.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lesson_06/expression/src/expression_calculator.ts b/lesson_06/expression/src/expression_calculator.ts
index 074d1d9ad..f5647e63a 100644
--- a/lesson_06/expression/src/expression_calculator.ts
+++ b/lesson_06/expression/src/expression_calculator.ts
@@ -7,7 +7,6 @@ export class ExpressionCalculator {
     const power = this.pow(d, e);
     const division = this.divide(multiplication, power);
     return division;
-    //return (this.add(a, b) * c) / this.pow(d, e);
   }
 
   // Function to be implemented: (a + b) * c / Math.pow(d, e)
@@ -28,5 +27,4 @@ export class ExpressionCalculator {
   }
 }
 
-
 //end of file//

From 0fa953cea68474f3abfa233fb7b8cb9812337838 Mon Sep 17 00:00:00 2001
From: karensprojects22 <koalabi251@gmail.com>
Date: Wed, 19 Mar 2025 20:09:56 +0000
Subject: [PATCH 3/3] chore: adds deleted json file to Karens lesson_06
 homework

---
 package-lock.json | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 package-lock.json

diff --git a/package-lock.json b/package-lock.json
deleted file mode 100644
index 649f8d4bb..000000000
--- a/package-lock.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "code-differently-25-q1",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {}
-}