From 09201320e85bc9830f7ee3a35b6975f31dc5d5ec Mon Sep 17 00:00:00 2001
From: Takisa Tala <takisa.washington@gmail.com>
Date: Wed, 16 Dec 2020 22:03:35 -0500
Subject: [PATCH] Takisa_Tala

---
 js/formulas.js | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/js/formulas.js b/js/formulas.js
index 2435d53..1de93b9 100644
--- a/js/formulas.js
+++ b/js/formulas.js
@@ -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 1/2*base*height;
 }
 
 function Circle(radius){
-  return -1;
+  return 3.14*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;
 }
 
 // Perimeter formulas
 function perimeterSquare(side){
-  return -1;
+  return 4*side;
 }
 
-function perimeterRectangle(length, height){
-  return -1;
+function perimeterRectangle(length, width){
+  return 2*length + 2*width;
 }
 
 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 radius*radius*height;
 }