From 21988e79175357dffc634d3db07f062da6a24941 Mon Sep 17 00:00:00 2001 From: haldanek Date: Tue, 8 Oct 2024 13:27:01 +0000 Subject: [PATCH 1/7] feat: lesson06 expression_calculator --- .../expression/src/expression_calculator.ts | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/lesson_06/expression/src/expression_calculator.ts b/lesson_06/expression/src/expression_calculator.ts index 13cb2ca05..d8920304d 100644 --- a/lesson_06/expression/src/expression_calculator.ts +++ b/lesson_06/expression/src/expression_calculator.ts @@ -1,11 +1,23 @@ export class ExpressionCalculator { /** Returns the calculation of ((a + b) * c) / d^e */ - calculate(a: number, b: number, c: number, d: number, e: number): number { - // Implement your code here to return the correct value. - return 0; + calculate(a: 1, b: 7, c: 6, d: 4, e: 2): number { + + return (this.mult(this.add(a, b), c) / this.pow(d, e)); } pow(base: number, exponent: number): number { return Math.pow(base, exponent); } + add(num1: number, num2: number): number { + return (num1 + num2); + } + mult(numA: number, numB: number): number { + return (numA * numB); + } + } +//div(mul(add(a,b),c),pow(d,e)) +//calculate.add(arg1, arg2); +//this.calculate(div(mul(add(a,b),c),pow(d,e))) +//div(base: number, exponent: number, num1: number, num2: number, num3: number): number { + //return div((mult(add(num1 + num2) * num3) / Math.pow(base, exponent))); From 3e374b8e5254ed55c65a6b27a86f0fc44f7663f1 Mon Sep 17 00:00:00 2001 From: haldanek Date: Tue, 8 Oct 2024 13:37:03 +0000 Subject: [PATCH 2/7] feat: lesson 06 expression_calculator edit --- lesson_06/expression/src/expression_calculator.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lesson_06/expression/src/expression_calculator.ts b/lesson_06/expression/src/expression_calculator.ts index d8920304d..c04ed0304 100644 --- a/lesson_06/expression/src/expression_calculator.ts +++ b/lesson_06/expression/src/expression_calculator.ts @@ -1,6 +1,6 @@ export class ExpressionCalculator { /** Returns the calculation of ((a + b) * c) / d^e */ - calculate(a: 1, b: 7, c: 6, d: 4, e: 2): number { + calculate(a: number, b: number, c: number, d: number, e: number): number { return (this.mult(this.add(a, b), c) / this.pow(d, e)); } From e7d053ddb1da8a4c6eeab0dbf780d5782fdf2b20 Mon Sep 17 00:00:00 2001 From: haldanek Date: Tue, 8 Oct 2024 13:39:19 +0000 Subject: [PATCH 3/7] feat: lesson_06 expression_calculator edit 2 --- lesson_06/expression/src/expression_calculator.ts | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/lesson_06/expression/src/expression_calculator.ts b/lesson_06/expression/src/expression_calculator.ts index c04ed0304..02ab26cca 100644 --- a/lesson_06/expression/src/expression_calculator.ts +++ b/lesson_06/expression/src/expression_calculator.ts @@ -1,23 +1,16 @@ export class ExpressionCalculator { /** Returns the calculation of ((a + b) * c) / d^e */ calculate(a: number, b: number, c: number, d: number, e: number): number { - - return (this.mult(this.add(a, b), c) / this.pow(d, e)); + return this.mult(this.add(a, b), c) / this.pow(d, e); } pow(base: number, exponent: number): number { return Math.pow(base, exponent); } add(num1: number, num2: number): number { - return (num1 + num2); + return num1 + num2; } mult(numA: number, numB: number): number { - return (numA * numB); + return numA * numB; } - } -//div(mul(add(a,b),c),pow(d,e)) -//calculate.add(arg1, arg2); -//this.calculate(div(mul(add(a,b),c),pow(d,e))) -//div(base: number, exponent: number, num1: number, num2: number, num3: number): number { - //return div((mult(add(num1 + num2) * num3) / Math.pow(base, exponent))); From 3bf45c246c561a8986eb1ad80e552e6e9e08d748 Mon Sep 17 00:00:00 2001 From: haldanek Date: Tue, 8 Oct 2024 14:29:46 +0000 Subject: [PATCH 4/7] feat: lesson_06 expression_calculator edit 3 --- lesson_06/expression/src/expression_calculator.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lesson_06/expression/src/expression_calculator.ts b/lesson_06/expression/src/expression_calculator.ts index 02ab26cca..84dc8621d 100644 --- a/lesson_06/expression/src/expression_calculator.ts +++ b/lesson_06/expression/src/expression_calculator.ts @@ -7,10 +7,10 @@ export class ExpressionCalculator { pow(base: number, exponent: number): number { return Math.pow(base, exponent); } - add(num1: number, num2: number): number { - return num1 + num2; + add(x: number, y: number): number { + return x + y; } - mult(numA: number, numB: number): number { - return numA * numB; + mult(X: number, Y: number): number { + return X * Y; } } From 60242c5e55519fa7164e08d59968a3a3f2a30aa8 Mon Sep 17 00:00:00 2001 From: haldanek Date: Tue, 8 Oct 2024 14:46:37 +0000 Subject: [PATCH 5/7] feat: lesson_06 expression_calculator edit 4 --- lesson_06/expression/src/expression_calculator.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lesson_06/expression/src/expression_calculator.ts b/lesson_06/expression/src/expression_calculator.ts index 84dc8621d..a329fbfca 100644 --- a/lesson_06/expression/src/expression_calculator.ts +++ b/lesson_06/expression/src/expression_calculator.ts @@ -1,16 +1,20 @@ export class ExpressionCalculator { /** Returns the calculation of ((a + b) * c) / d^e */ calculate(a: number, b: number, c: number, d: number, e: number): number { - return this.mult(this.add(a, b), c) / this.pow(d, e); + const expression = this.mult(this.add(a, b), c) / this.pow(d, e); + return expression; } pow(base: number, exponent: number): number { - return Math.pow(base, exponent); + const expo = Math.pow(base, exponent); + return expo; } add(x: number, y: number): number { - return x + y; + const addition = x + y; + return addition; } mult(X: number, Y: number): number { - return X * Y; + const multiply = X * Y; + return multiply; } } From 79ed341691eb82af6420a6ff30426d4b52041575 Mon Sep 17 00:00:00 2001 From: haldanek Date: Tue, 8 Oct 2024 15:40:39 +0000 Subject: [PATCH 6/7] feat: lesson_06 expression_calculator edit 5 --- lesson_06/expression/src/expression_calculator.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/lesson_06/expression/src/expression_calculator.ts b/lesson_06/expression/src/expression_calculator.ts index a329fbfca..c1714cc33 100644 --- a/lesson_06/expression/src/expression_calculator.ts +++ b/lesson_06/expression/src/expression_calculator.ts @@ -1,8 +1,13 @@ export class ExpressionCalculator { /** Returns the calculation of ((a + b) * c) / d^e */ calculate(a: number, b: number, c: number, d: number, e: number): number { - const expression = this.mult(this.add(a, b), c) / this.pow(d, e); - return expression; + const P = this.add(a, b); + const E = this.pow(d, e); + const M = this.mult(P, c); + const D = this.div(M, E); + return D; + //const expression = this.mult(this.add(a, b), c) / this.pow(d, e); + //return expression; } pow(base: number, exponent: number): number { @@ -17,4 +22,8 @@ export class ExpressionCalculator { const multiply = X * Y; return multiply; } + div(x: number, y: number): number { + const divide = x / y; + return divide; + } } From e998f18dd96668bfb9e4ae5714bcc2a1110e8bdf Mon Sep 17 00:00:00 2001 From: haldanek Date: Wed, 9 Oct 2024 13:24:02 +0000 Subject: [PATCH 7/7] feat: lesson_06 expression_calculator edit 6 --- lesson_06/expression/src/expression_calculator.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lesson_06/expression/src/expression_calculator.ts b/lesson_06/expression/src/expression_calculator.ts index c1714cc33..522b07e69 100644 --- a/lesson_06/expression/src/expression_calculator.ts +++ b/lesson_06/expression/src/expression_calculator.ts @@ -3,8 +3,8 @@ export class ExpressionCalculator { calculate(a: number, b: number, c: number, d: number, e: number): number { const P = this.add(a, b); const E = this.pow(d, e); - const M = this.mult(P, c); - const D = this.div(M, E); + const M = this.multiply(P, c); + const D = this.divide(M, E); return D; //const expression = this.mult(this.add(a, b), c) / this.pow(d, e); //return expression; @@ -18,11 +18,11 @@ export class ExpressionCalculator { const addition = x + y; return addition; } - mult(X: number, Y: number): number { + multiply(X: number, Y: number): number { const multiply = X * Y; return multiply; } - div(x: number, y: number): number { + divide(x: number, y: number): number { const divide = x / y; return divide; }