-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Version 1.1.0 - Adding logarithmic calculations
- Loading branch information
1 parent
d75ee62
commit 685cb53
Showing
5 changed files
with
68 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,35 @@ | ||
|
||
let trianglePerimeter = (a, b, c, unit = "") => a + b + c + unit; //I can require units | ||
let traingleArea = (b, h, unit = "") => 12 * b * h + unit; | ||
|
||
let circlePerimeter = (r, unit = "") => (2 * Math.PI * r) + unit | ||
let circleArea = (r, unit = "") => (Math.PI * r * r) + unit | ||
let circlePerimeter = (r, unit = "") => 2 * Math.PI * r + unit; | ||
let circleArea = (r, unit = "") => Math.PI * r * r + unit; | ||
|
||
let squarePerimeter = (a, unit = "") => (4 * a) + unit | ||
let squareArea = (a, unit = "") => (a * a) + unit | ||
let squarePerimeter = (a, unit = "") => 4 * a + unit; | ||
let squareArea = (a, unit = "") => a * a + unit; | ||
|
||
let rectanglePerimeter = (a, b, unit = "") => 2 * (a + b) + unit | ||
let rectangleArea = (a, b, unit = "") => (a * b) + unit | ||
let rectanglePerimeter = (a, b, unit = "") => 2 * (a + b) + unit; | ||
let rectangleArea = (a, b, unit = "") => a * b + unit; | ||
|
||
let parallelogramPerimeter = function (a, b, unit = "") { | ||
return 2 * (a + b) + unit; | ||
} | ||
|
||
let parallelogramArea = (b, h, unit = "") => (b * h) + unit | ||
|
||
let trapezoidPerimeter = (a, b1, b2, unit = "") => (2 * a) + b1 + b2 + unit | ||
let trapezoidArea = (h, b1, b2, unit = "") => (0.5) * (b1 + b2) * h | ||
|
||
module.exports = { trianglePerimeter, traingleArea, circlePerimeter, circleArea, squarePerimeter, squareArea, rectanglePerimeter, rectangleArea, parallelogramPerimeter, parallelogramArea, trapezoidPerimeter, trapezoidArea } | ||
return 2 * (a + b) + unit; | ||
}; | ||
|
||
let parallelogramArea = (b, h, unit = "") => b * h + unit; | ||
|
||
let trapezoidPerimeter = (a, b1, b2, unit = "") => 2 * a + b1 + b2 + unit; | ||
let trapezoidArea = (h, b1, b2, unit = "") => 0.5 * (b1 + b2) * h; | ||
|
||
module.exports = { | ||
trianglePerimeter, | ||
traingleArea, | ||
circlePerimeter, | ||
circleArea, | ||
squarePerimeter, | ||
squareArea, | ||
rectanglePerimeter, | ||
rectangleArea, | ||
parallelogramPerimeter, | ||
parallelogramArea, | ||
trapezoidPerimeter, | ||
trapezoidArea, | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
let log = (a, b) => Math.log(b) / Math.log(a); | ||
|
||
let logB = (a, x) => a ** x; | ||
|
||
let logProduct = (a, u, v) => (Math.log(u) / Math.log(a)) + (Math.log(v) / Math.log(a)); | ||
|
||
let logQuotient = (a, u, v) => (Math.log(u) / Math.log(a)) - (Math.log(v) / Math.log(a)); | ||
|
||
let logExponential = (a, u, v) => v * (Math.log(u) / Math.log(a)); | ||
|
||
module.exports = { | ||
log, | ||
logB, | ||
logProduct, | ||
logQuotient, | ||
logExponential, | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters