From 5fc29537bc58cc190a86397e16dc3e554f384e25 Mon Sep 17 00:00:00 2001
From: Kalyn Smith <kalyn@Kalyns-MacBook-Air.local>
Date: Wed, 18 Nov 2020 20:59:06 -0500
Subject: [PATCH] Completed JS Basics

---
 js/formulas.js | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/js/formulas.js b/js/formulas.js
index 2435d53..3aafe51 100644
--- a/js/formulas.js
+++ b/js/formulas.js
@@ -1,80 +1,83 @@
 // Basic math formulaas
 function addition(num1, num2){
-  return -1;
+  let sum = num1 + num2
+  return sum;
 }
 
 function subtraction(num1, num2){
-  return -1;
+  let difference = num1 - num2
+  return difference;
 }
 
 function multiplication(num1, num2){
-  return -1;
+  return num1 * num2;
 }
 
 function division(num1, num2){
-  return -1;
+  let quotient = num1 / num2
+  return quotient;
 }
 
 // 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 (1/2) * (base * height);
 }
 
 function Circle(radius){
-  return -1;
+  return (3.14) * (radius * radius);
 }
 
 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)+ (2 * 3.14 * (radius * radius)));
 }
 
 // Perimeter formulas
 function perimeterSquare(side){
-  return -1;
+  return 4 * side;
 }
 
 function perimeterRectangle(length, height){
-  return -1;
+  return 2 * (length + height);
 }
 
 function perimeterTriangle(side1, side2, side3){
-  return -1;
+  return side1 + side2 + side3;
 }
 
 function perimeterCircle(diameter){
-  return -1;
+  return (2) * (3.14) * (diameter / 2); 
 }
 
 // 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);
 }