pj1comp

Alexander Stewart · Alexander Stewart · commit 2d558abae2d7 · 2017-07-10T17:59:11.000-06:00
diff --git a/src/project-1.js b/src/project-1.js
@@ -1,140 +1,172 @@
 // Do not change any of the funcxtion names
 
-const multiplyByTen = (num) => {
+const multiplyByTen = num => num * 10;
   // return num after multiplying it by ten
   // code here
-};
 
-const subtractFive = (num) => {
+const subtractFive = num => num - 5;
   // return num after subtracting five
   // code here
-};
 
 const areSameLength = (str1, str2) => {
+  if (str1.length === str2.length) {
+    return true;
+  }
+  return false;
+};
   // return true if the two strings have the same length
   // otherwise return false
   // code here
-};
+
 
 const areEqual = (x, y) => {
+  if (x === y) {
+    return true;
+  }
+  return false;
+};
+
   // return true if x and y are the same
   // otherwise return false
   // code here
-};
+
 
 const lessThanNinety = (num) => {
+  if (num < 90) {
+    return true;
+  }
+  return false;
+};
   // return true if num is less than ninety
   // otherwise return false
   // code here
-};
+
 
 const greaterThanFifty = (num) => {
+  if (num > 50) {
+    return true;
+  }
+  return false;
+};
   // return true if num is greater than fifty
   // otherwise return false
   // code here
-};
 
-const add = (x, y) => {
+
+const add = (x, y) => x + y;
   // add x and y together and return the value
   // code here
-};
 
-const subtract = (x, y) => {
+
+const subtract = (x, y) => x - y;
   // subtract y from x and return the value
   // code here
-};
 
-const divide = (x, y) => {
+
+const divide = (x, y) => (x / y);
   // divide x by y and return the value
   // code here
-};
 
-const multiply = (x, y) => {
+const multiply = (x, y) => x * y;
   // multiply x by y and return the value
   // code here
-};
 
-const getRemainder = (x, y) => {
+
+const getRemainder = (x, y) => x % y;
   // return the remainder from dividing x by y
   // code here
-};
 
 const isEven = (num) => {
+  if (num % 2 === 0) {
+    return true;
+  }
+  return false;
+};
   // return true if num is even
   // otherwise return false
   // code here
-};
 
 const isOdd = (num) => {
+  if (num % 2 !== 0) {
+    return true;
+  }
+  return false;
   // return true if num is false
   // otherwise return false
   // code here
 };
 
-const square = (num) => {
+const square = num => num * num;
   // square num and return the new value
   // code here
-};
 
-const cube = (num) => {
+
+const cube = num => num * num * num;
   // cube num and return the new value
   // code here
-};
+
 
 const raiseToPower = (num, exponent) => {
+  return num ** exponent;
+};
   // raise num to whatever power is passed in as exponent
   // code here
-};
 
 const roundNumber = (num) => {
+  return Math.round(num);
   // round num and return it
   // code here
 };
 
 const roundUp = (num) => {
+  return Math.ceil(num);
   // round num up and return it
   // code here
 };
 
 const addExclamationPoint = (str) => {
+  const newStr = `${str}!`;
+  return newStr;
   // add an exclamation point to the end of str and return the new string
   // 'hello world' -> 'hello world!'
   // code here
 };
 
 const combineNames = (firstName, lastName) => {
+  const newStr = `${firstName} ${lastName}`;
+  return newStr;
   // return firstName and lastName combined as one string and separated by a space.
   // 'Lambda', 'School' -> 'Lambda School'
   // code here
 };
 
 const getGreeting = (name) => {
+  return `Hello ${name}!`;
   // Take the name string and concatenate other strings onto it so it takes the following form:
   // 'Sam' -> 'Hello Sam!'
   // code here
 };
 
 // If you can't remember these area formulas then head over to Google or look at the test code.
 
-const getRectangleArea = (length, width) => {
+const getRectangleArea = (length, width) => length * width;
   // return the area of the rectangle by using length and width
   // code here
-};
 
-const getTriangleArea = (base, height) => {
+const getTriangleArea = (base, height) => (base * height) / 2;
   // return the area of the triangle by using base and height
   // code here
-};
+
 
 const getCircleArea = (radius) => {
+  return Math.round(Math.PI * radius * radius);
+};
   // return the rounded area of the circle given the radius
   // code here
-};
 
-const getRectangularPrismVolume = (length, width, height) => {
+const getRectangularPrismVolume = (length, width, height) => length * width * height;
   // return the volume of the 3D rectangular prism given the length, width, and height
   // code here
-};
 
 // Do not modify code below this line.
 // --------------------------------
