Skip to content

task: Lesson 06 updated added equation to calculator #291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 34 commits into from
Closed
Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
6d8dda2
Create README.md
JEKLUND251 Mar 4, 2025
ec0b53d
Update README.md
JEKLUND251 Mar 4, 2025
08494d8
Update README.md
JEKLUND251 Mar 4, 2025
4d289e1
Create Images subfolder
JEKLUND251 Mar 4, 2025
5ff6a5e
Add files via upload
JEKLUND251 Mar 4, 2025
76d6adf
Delete lesson_00/JustinEKlund.md/Images subfolder
JEKLUND251 Mar 4, 2025
094cf02
Rename IMG_2810.jpg to Images subfolder
JEKLUND251 Mar 4, 2025
f8174e6
Rename Images subfolder to Images
JEKLUND251 Mar 4, 2025
7a9fa54
Rename lesson_00/JustinEKlund.md/Images to lesson_00/JustinEKlund.md/…
JEKLUND251 Mar 4, 2025
1be4541
Add files via upload
JEKLUND251 Mar 4, 2025
01d896e
Rename IMG_2810 (1).jpg to readme pic 1
JEKLUND251 Mar 4, 2025
15e3d77
Update README.md
JEKLUND251 Mar 5, 2025
706c4c2
Delete lesson_00/JustinEKlund.md/Images files directory
JEKLUND251 Mar 5, 2025
3d2cd35
Add files via upload
JEKLUND251 Mar 5, 2025
c89c4d2
Delete lesson_00/JustinEKlund.md/Images file directory
JEKLUND251 Mar 5, 2025
1eb5166
Create txt
JEKLUND251 Mar 5, 2025
f9b0b73
Add files via upload
JEKLUND251 Mar 5, 2025
edfaa94
Delete lesson_00/JustinEKlund.md/Images/txt
JEKLUND251 Mar 5, 2025
aa23cde
Update README.md
JEKLUND251 Mar 5, 2025
f2c7cf9
Fix: Punctuation and grammar
VicenteVigueras Mar 7, 2025
c91781d
Merge branch 'code-differently:main' into main
JEKLUND251 Mar 10, 2025
f770163
Merge branch 'code-differently:main' into main
JEKLUND251 Mar 10, 2025
fec1b98
Merge branch 'code-differently:main' into main
JEKLUND251 Mar 10, 2025
58a4a65
Merge branch 'code-differently:main' into main
JEKLUND251 Mar 10, 2025
a1bbed5
Merge branch 'code-differently:main' into main
JEKLUND251 Mar 11, 2025
90c2cc4
Merge branch 'code-differently:main' into main
JEKLUND251 Mar 11, 2025
52ba282
Merge branch 'code-differently:main' into main
JEKLUND251 Mar 11, 2025
cabde79
Merge branch 'code-differently:main' into main
JEKLUND251 Mar 12, 2025
bb55696
Merge branch 'code-differently:main' into main
JEKLUND251 Mar 12, 2025
4e5cc9c
Merge branch 'code-differently:main' into main
JEKLUND251 Mar 12, 2025
933c415
Merge branch 'code-differently:main' into main
JEKLUND251 Mar 14, 2025
ca27460
Merge branch 'code-differently:main' into main
JEKLUND251 Mar 18, 2025
b43401f
feat. added working equation into calculator
JEKLUND251 Mar 18, 2025
38a8dbe
chore: took out excess text requested by anthony in the expressions c…
JEKLUND251 Mar 19, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lesson_06/expression/.env.test
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HW_VERSION=your assigned version here
HW_VERSION=G
18 changes: 17 additions & 1 deletion lesson_06/expression/src/expression_calculator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,26 @@ 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;
//(Math.pow(a, b) + c) * d / e
const exponential = this.pow(a, b);
const addition = this.add(exponential, c);
const multiply = this.multiply(addition, d);
const divide = this.divide(multiply, e);
// const divide = this.divide(multiply, e);
return divide;

}

pow(base: number, exponent: number): number {
return Math.pow(base, exponent);
}
add(number1: number, number2: number): number {
return number1 + number2;
}
multiply(number1: number, number2: number): number {
return number1 * number2;
}
divide(number1: number, number2: number): number {
return number1 / number2;
}
}