Skip to content
Open
Changes from all commits
Commits
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
38 changes: 19 additions & 19 deletions js/formulas.js
Original file line number Diff line number Diff line change
@@ -1,80 +1,80 @@
// Basic math formulaas
function addition(num1, num2){
return -1;
return num1 + num2;
}

function subtraction(num1, num2){
return -1;
return num1 - num2;
}

function multiplication(num1, num2){
return -1;
return num1 * num2;
}

function division(num1, num2){
return -1;
return num1 / num2;
}

// Area formulaas
function areaSquare(side){
return -1;
return side * side;
}

function areaRectangle(length, width){
return -1;
return length * width;
}

function areaParallelogram(base, height){
return -1;
return base * height;
}

function areaTriangle(base, height){
return -1;
return .5 * (base * height);
}

function Circle(radius){
return -1;
return 3.14 * (radius * radius);
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should use Math.PI (-5)

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's better practice to use Math.pow(radius, 2)

}

function Sphere(radius){
return -1;
return 4 * 3.14 * (radius * radius);
}

// Surface Area formulas
function surfaceAreaCube(side){
return -1;
return 6 * (side * side);
}

function surfaceAreaCylinder(radius, height){
return -1;
return 2 * 3.14 * radius * height;
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wrong equation (-1)
A=2πrh+2πr2

}

// Perimeter formulas
function perimeterSquare(side){
return -1;
return 4 * side;
}

function perimeterRectangle(length, height){
return -1;
return (2 * length) + (2 * height);
}

function perimeterTriangle(side1, side2, side3){
return -1;
return side1 + side2 + side3;
}

function perimeterCircle(diameter){
return -1;
return 3.14 * diameter;
}

// Volume formulas
function volumeCube(side){
return -1;
return side * side * side;
}

function volumeRectangular(length, width, height){
return -1;
return length * width * height;
}

function volumeCylinder(radius, height){
return -1;
return 3.14 * (radius * radius) * height;
Copy link
Copy Markdown

@kburd kburd Nov 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

94% Great job!

}