Skip to content

Commit 79ed341

Browse files
committed
feat: lesson_06 expression_calculator edit 5
1 parent 60242c5 commit 79ed341

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

lesson_06/expression/src/expression_calculator.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
export class ExpressionCalculator {
22
/** Returns the calculation of ((a + b) * c) / d^e */
33
calculate(a: number, b: number, c: number, d: number, e: number): number {
4-
const expression = this.mult(this.add(a, b), c) / this.pow(d, e);
5-
return expression;
4+
const P = this.add(a, b);
5+
const E = this.pow(d, e);
6+
const M = this.mult(P, c);
7+
const D = this.div(M, E);
8+
return D;
9+
//const expression = this.mult(this.add(a, b), c) / this.pow(d, e);
10+
//return expression;
611
}
712

813
pow(base: number, exponent: number): number {
@@ -17,4 +22,8 @@ export class ExpressionCalculator {
1722
const multiply = X * Y;
1823
return multiply;
1924
}
25+
div(x: number, y: number): number {
26+
const divide = x / y;
27+
return divide;
28+
}
2029
}

0 commit comments

Comments
 (0)