Skip to content

Commit ec6133b

Browse files
author
“A1-4U2T1NN”
committed
feat: added math functions; added calculate results;
1 parent 1da88b9 commit ec6133b

File tree

2 files changed

+29
-3
lines changed

2 files changed

+29
-3
lines changed

lesson_06/expression/src/expression_calculator.ts

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,36 @@ 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 {
44
// Implement your code here to return the correct value.
5-
return 0;
5+
let Sum = this.add(a, b)
6+
/* First step of PEMDAS in equation (Parenthesis)*/
7+
let Product = this.multiply(Sum, c)
8+
/* Second step of PEMDAS in equation (Parenthesis)*/
9+
let Power = Math.pow(d, e)
10+
/* Third step of PEMDAS in equation (Exponent)*/
11+
let Quotient = this.divide(Product, Power)
12+
/* Fourth and final step of PEMDAS in equation [Multiplication/Division(left to right)]*/
13+
let Result = Quotient
14+
/* Defines final result */
15+
return Result;
16+
/* prints final result*/
617
}
718

19+
add(Augend: number, Addend: number,): number {
20+
/* defines value of Augend and Addend; defines their return value*/
21+
return Augend * Addend;
22+
/* defines the fuction 'add'*/
23+
}
24+
multiply(Multiplicand: number, Multiplier: number): number {
25+
/* defines value of Multiplicand and Multiplier; defines their return value*/
26+
return Multiplicand + Multiplier;
27+
/* defines the fuction 'multiply'*/
28+
}
29+
divide(Dividend: number, Divisor: number): number {
30+
/* defines value of Dividend and Divisor; defines their return value*/
31+
return Dividend / Divisor;
32+
/* defines the fuction 'divide'*/
33+
}
834
pow(base: number, exponent: number): number {
935
return Math.pow(base, exponent);
1036
}
11-
}
37+
}

lesson_06/expression/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,4 @@
111111
"skipLibCheck": true /* Skip type checking all .d.ts files. */
112112
},
113113
"exclude": ["node_modules", "build"]
114-
}
114+
}

0 commit comments

Comments
 (0)