Finished working on recursion

adfaris · adfaris · commit 356641e3a5de · 2018-02-26T22:30:06.000-05:00
diff --git a/src/class.js b/src/class.js
@@ -14,16 +14,15 @@ class User {
     this.password = options.password;
   }
 
-  comparePasswords () {
-    if (options.password = this.password)
-    return true;
-  }
+  // comparePasswords() {
+  //   if(options.password = this.password) return true;
+  // }
 
-}
-const checkPasswd = new User({email:'adfaris@gmail.com', password:'123456789'});
-console.log(checkPasswd);
-checkPasswd.comparePasswords('12345600');
 
+// let checkPasswd = new User({ email: 'adfaris@gmail.com', password: '123456789' });
+// return (checkPasswd);
+// checkPasswd.comparePasswords('12345600');
+}
 // Part 2
 // Create a class called `Animal` and a class called `Cat` using ES6 classes.
 // `Cat` should extend the `Animal` class.
@@ -34,7 +33,7 @@ checkPasswd.comparePasswords('12345600');
 // `meow` that should return the string `<name> meowed!` where `<name>` is the `name`
 // property set on the Cat instance.
 
-//code here
+// code here
 
 // class Animal {
 //   constructor(obj){
diff --git a/src/prototype.js b/src/prototype.js
@@ -6,32 +6,32 @@
   GameObject
     createdAt
     dimensions
-    destroy() // prototype method -> returns the string 'Game object was removed from the game.'*/
+    destroy() // prototype method -> returns the string 'Game object was removed from the game.' */
 
-    function GameObject (gameobj) {
-      this.createdAt = gameobj.createdAt;
-      this.dimensions = gameobj.dimensions;
-    }
+function GameObject(gameobj) {
+  this.createdAt = gameobj.createdAt;
+  this.dimensions = gameobj.dimensions;
+}
 
-    GameObject.prototype.distroy = function(){
-      console.log('Game object was removed from the game');
-    }
+GameObject.prototype.distroy = () => {
+  return 'Game object was removed from the game';
+};
 /*
   NPC
     hp
     name
     takeDamage() // prototype method -> returns the string '<object name> took damage.'
     // should inherit destroy() from GameObject's prototype
 */
-    function NPC(npcObj){
-      GameObject.call(this,npcObj);
-      this. hp = npcObj.hp;
-      this.name = npcObj.name;
-    }
+function NPC(npcObj) {
+  GameObject.call(this, npcObj);
+  this.hp = npcObj.hp;
+  this.name = npcObj.name;
+}
 
-    NPC.prototype.takeDamage = function(){
-      console.log(`${this.name} took damage`);
-    }
+NPC.prototype.takeDamage = () => {
+  return `${this.name} took damage`;
+};
 /*
   Humanoid
     faction
@@ -41,44 +41,36 @@
     // should inherit destroy() from GameObject through NPC
     // should inherit takeDamage() from NPC
 */
-    function Humanoid (humanoidObj){
-      GameObject.call(this.humanoidObj);
-      this.faction = humanoidObj.faction;
-      this.weapons = humanoidObj.weapons;
-      this.language = humanoidObj.language
-    }
+function Humanoid(humanoidObj) {
+  GameObject.call(this.humanoidObj);
+  this.faction = humanoidObj.faction;
+  this.weapons = humanoidObj.weapons;
+  this.language = humanoidObj.language;
+}
 
-    Humanoid.prototype.greet = function(){
-      console.log(`${this.name} offers greetings in ${this.language}`);
-    }
+Humanoid.prototype.greet = () => {
+  return `${this.name} offers greetings in ${this.language}`;
+};
 /*
   Inheritance chain: Humanoid -> NPC -> GameObject
   Instances of Humanoid should have all of the same properties as NPC and GameObject.
   Instances of NPC should have all of the same properties as GameObject.
 
   Example:
 */
-  const hamsterHuey = new Humanoid({
-    createdAt: new Date(),
-    dimensions: {
-      length: 2,
-      width: 1,
-      height: 1,
-    },
-    hp: 5,
-    name: 'Hamster Huey',
-    faction: 'Gooey Kablooie',
-    weapons: [
-      'bubblegum',
-    ],
-    language: 'Hamsterish',
-  });
-
-  hamsterHuey.greet(); // returns 'Hamster Huey offers a greeting in Hamsterish'
-  hamsterHuey.takeDamage(); // returns 'Hamster Huey took damage.'
-  hamsterHuey.destroy(); // returns 'Game object was removed from the game.'
-
+const hamsterHuey = new Humanoid({
+  createdAt: new Date(),
+  dimensions: 2,
+  hp: 5,
+  name: 'Hamster Huey',
+  faction: 'Gooey Kablooie',
+  weapons: ['bubblegum'],
+  language: 'Hamsterish',
+});
 
+hamsterHuey.greet(); // returns 'Hamster Huey offers a greeting in Hamsterish'
+hamsterHuey.takeDamage(); // returns 'Hamster Huey took damage.'
+hamsterHuey.destroy(); // returns 'Game object was removed from the game.'
 
 /* eslint-disable no-undef */
 
diff --git a/src/recursion.js b/src/recursion.js
@@ -3,17 +3,40 @@
 const nFibonacci = (n) => {
   // fibonacci sequence: 1 1 2 3 5 8 13 ...
   // return the nth number in the sequence
+  if (n <= 2) return 1;
+  return nFibonacci(n - 1) + nFibonacci(n - 2);
 };
 
 const nFactorial = (n) => {
   // factorial example: !5 = 5 * 4 * 3 * 2 * 1
   // return the factorial of `n`
+  // const nFactorial = n => {
+  let result = 1;
+  if (n === 0) return result;
+  result = n * nFactorial(n - 1);
+  return result;
 };
 
 /* Extra Credit */
 const checkMatchingLeaves = (obj) => {
-  // return true if every property on `obj` is the same
-  // otherwise return false
+  const arr = [];
+  const recurse = (someObj) => {
+    const keys = Object.keys(someObj);
+    keys.forEach((item) => {
+      if (typeof someObj[item] === 'object') {
+        recurse(someObj[item]);
+      } else {
+        arr.push(someObj[item]);
+      }
+    });
+  };
+  recurse(obj);
+  for (let i = 1; i < arr.length; i++) {
+    if (arr[0] !== arr[i]) {
+      return false;
+    }
+  }
+  return true;
 };
 
 /* eslint-enable no-unused-vars */
