From b1b475c3ca80d506cee4dfefe71fdbfc0b746e09 Mon Sep 17 00:00:00 2001 From: AntsmithCode Date: Sat, 19 Dec 2020 19:23:05 -0500 Subject: [PATCH] Completed the functions to return the proper values. --- index.html | 31 ++++++++++--------- js/formulas.js | 80 +++++++++++++++++++++++++------------------------- 2 files changed, 57 insertions(+), 54 deletions(-) diff --git a/index.html b/index.html index d66c928..445f396 100644 --- a/index.html +++ b/index.html @@ -1,16 +1,19 @@ - - - Basic Formulas - - - -

Basic Formulas

-
    -
  1. Open Developer Tools
    2. -
  2. Select the Console Tab
    3. -
  3. Begin typing JS functions to test output
    4. -
- - + + + + Basic Formulas + + + + +

Basic Formulas

+
    +
  1. Open Developer Tools
    2. +
  2. Select the Console Tab
    3. +
  3. Begin typing JS functions to test output
    4. +
+ + + \ No newline at end of file diff --git a/js/formulas.js b/js/formulas.js index 2435d53..7ceb191 100644 --- a/js/formulas.js +++ b/js/formulas.js @@ -1,80 +1,80 @@ -// Basic math formulaas -function addition(num1, num2){ - return -1; +// Basic math formulas +function addition(num1, num2) { + return num1 + num2; } -function subtraction(num1, num2){ - return -1; +function subtraction(num1, num2) { + return num1 - num2; } -function multiplication(num1, num2){ - return -1; +function multiplication(num1, num2) { + return num1 * num2; } -function division(num1, num2){ - return -1; +function division(num1, num2) { + return num1 / num2; } -// Area formulaas -function areaSquare(side){ - return -1; +// Area formulas +function areaSquare(side) { + return Math.pow(side, 2); } -function areaRectangle(length, width){ - return -1; +function areaRectangle(length, width) { + return length * width; } -function areaParallelogram(base, height){ - return -1; +function areaParallelogram(base, height) { + return base * height; } -function areaTriangle(base, height){ - return -1; +function areaTriangle(base, height) { + return (base * height) / 2; } -function Circle(radius){ - return -1; +function Circle(radius) { + return Math.pow(radius, 2) * Math.PI; // Math.PI uses the number PI & Math.Pow(X,Y) X to the power of Y } -function Sphere(radius){ - return -1; +function Sphere(radius) { + return 4 * Math.PI * Math.pow(radius, 2); } // Surface Area formulas -function surfaceAreaCube(side){ - return -1; +function surfaceAreaCube(side) { + return 6 * Math.pow(side, 2); } -function surfaceAreaCylinder(radius, height){ - return -1; +function surfaceAreaCylinder(radius, height) { + return 2 * Math.PI * radius * height; } // Perimeter formulas -function perimeterSquare(side){ - return -1; +function perimeterSquare(side) { + return 4 * side; } -function perimeterRectangle(length, height){ - return -1; +function perimeterRectangle(length, height) { + return 2 * length + 2 * height; } -function perimeterTriangle(side1, side2, side3){ - return -1; +function perimeterTriangle(side1, side2, side3) { + return side1 + side2 + side3; } -function perimeterCircle(diameter){ - return -1; +function perimeterCircle(diameter) { + return Math.PI * diameter; } // Volume formulas -function volumeCube(side){ - return -1; +function volumeCube(side) { + return Math.pow(side, 3); } -function volumeRectangular(length, width, height){ - return -1; +function volumeRectangular(length, width, height) { + return length * width * height; } -function volumeCylinder(radius, height){ - return -1; +function volumeCylinder(radius, height) { + return Math.PI * Math.pow(radius, 2) * height; }