From 205a685637375ce43ed07a1b04a6212b90df9980 Mon Sep 17 00:00:00 2001
From: Robert Woodruff <robertwoodruff@Roberts-MBP.fios-router.home>
Date: Sat, 19 Dec 2020 18:02:27 -0500
Subject: [PATCH] pushing lab 6 final version

---
 .DS_Store      | Bin 6148 -> 6148 bytes
 js/formulas.js |  95 +++++++++++++++++++++++++++++--------------------
 2 files changed, 57 insertions(+), 38 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index cd0c326c3aa555d987177b0b5ba76bbe28db37ae..7d5382c74915f76acb68802214b9e8a22f5ea562 100644
GIT binary patch
delta 154
zcmZoMXfc=|#>B)qu~2NHo}wrR0|Nsi1A_nqLj{8#Lk2?$LoP$k=8KHW8BIY_Tnw2E
zc?>BGsmRivIr+&+Ir&LId7wT<aUiYn9}E~6Ci5`%3o<ceF%*{t7v<&T=cR)z*gS(#
hopm!i2R{eUW}xZcnJ4p$SaJX@1|kNA%>g1?m;qzQBbfjI

delta 86
zcmZoMXfc=|#>B`mu~2NHo}wrl0|Nsi1A_oVQcivnkSzejD<>8%XJnh~z|_C_F_Q}G
k#s&|@&Fmcf96(*01)0AyPv#e~<N&GzX=K_QAhLxS051>{QUCw|

diff --git a/js/formulas.js b/js/formulas.js
index 2435d53..35f2da6 100644
--- a/js/formulas.js
+++ b/js/formulas.js
@@ -1,80 +1,99 @@
 // Basic math formulaas
-function addition(num1, num2){
-  return -1;
+function addition(num1, num2) {
+  let sum = num1 + num2;
+  return sum;
 }
 
-function subtraction(num1, num2){
-  return -1;
+function subtraction(num1, num2) {
+  let difference = num1 - num2;
+  return difference;
 }
 
-function multiplication(num1, num2){
-  return -1;
+function multiplication(num1, num2) {
+  let repeat = num1 * num2
+  return repeat;
 }
 
-function division(num1, num2){
-  return -1;
+function division(num1, num2) {
+  let repeatUndo = num1 / num2;
+  return repeatUndo;
 }
 
 // Area formulaas
-function areaSquare(side){
-  return -1;
+function areaSquare(side) {
+  let areaSq = side * side;
+  return areaSq;
 }
 
-function areaRectangle(length, width){
-  return -1;
+function areaRectangle(length, width) {
+  let areaRec = length * width;
+  return areaRec;
 }
 
-function areaParallelogram(base, height){
-  return -1;
+function areaParallelogram(base, height) {
+  let areaPara = base * height;
+  return areaPara;
 }
 
-function areaTriangle(base, height){
-  return -1;
+function areaTriangle(base, height) {
+  let areaTri = (base * height) / 2;
+  return areaTri;
 }
 
-function Circle(radius){
-  return -1;
+function Circle(radius) {
+  let areaCir = 3.14 * (radius * radius);
+  return areaCir;
 }
 
-function Sphere(radius){
-  return -1;
+function Sphere(radius) {
+  let areaSpr = 4 * 3.14 * (radius * radius);
+  return areaSpr;
 }
 
 // Surface Area formulas
-function surfaceAreaCube(side){
-  return -1;
+function surfaceAreaCube(side) {
+  let cubeSurfArea = 6 * (side * side);
+  return cubeSurfArea;
 }
 
-function surfaceAreaCylinder(radius, height){
-  return -1;
+function surfaceAreaCylinder(radius, height) { 
+  let cynSurfArea = 2 * 3.14 * radius * height;
+  return cynSurfArea;
 }
 
 // Perimeter formulas
-function perimeterSquare(side){
-  return -1;
+function perimeterSquare(side) {
+  let sqrPerimeter = 4 * side;
+  return sqrPerimeter;
 }
 
-function perimeterRectangle(length, height){
-  return -1;
+function perimeterRectangle(length, width) {
+  let recPerimeter = 2 * (length + width );
+  return recPerimeter;
 }
 
-function perimeterTriangle(side1, side2, side3){
-  return -1;
+function perimeterTriangle(side1, side2, side3) {
+  let triPerimeter = side1 + side2 + side3;
+  return triPerimeter;
 }
 
-function perimeterCircle(diameter){
-  return -1;
+function perimeterCircle(diameter) {
+  let circumference = 3.14 * diameter;
+  return circumference;
 }
 
 // Volume formulas
-function volumeCube(side){
-  return -1;
+function volumeCube(side) {
+  let cubeVol = side * side * side;
+  return cubeVol;
 }
 
-function volumeRectangular(length, width, height){
-  return -1;
+function volumeRectangular(length, width, height) {
+  let recVol = length * width * height;
+  return recVol;
 }
 
-function volumeCylinder(radius, height){
-  return -1;
+function volumeCylinder(radius, height) {
+  let cynVol = 3.14 * (radius * radius) * height;
+  return cynVol;
 }