Skip to content

Commit b43401f

Browse files
committed
feat. added working equation into calculator
1 parent ca27460 commit b43401f

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

lesson_06/expression/.env.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
HW_VERSION=your assigned version here
1+
HW_VERSION=G

lesson_06/expression/src/expression_calculator.ts

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,26 @@ export class ExpressionCalculator {
22
/** Returns a calculation involving a, b, c, d, and 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+
//(Math.pow(a, b) + c) * d / e
6+
const exponential = this.pow(a, b);
7+
const addition = this.add(exponential, c);
8+
const multiply = this.multiply(addition, d);
9+
const divide = this.divide(multiply, e);
10+
// const divide = this.divide(multiply, e);
11+
return divide;
12+
613
}
714

815
pow(base: number, exponent: number): number {
916
return Math.pow(base, exponent);
1017
}
18+
add(number1: number, number2: number): number {
19+
return number1 + number2;
20+
}
21+
multiply(number1: number, number2: number): number {
22+
return number1 * number2;
23+
}
24+
divide(number1: number, number2: number): number {
25+
return number1 / number2;
26+
}
1127
}

0 commit comments

Comments
 (0)