From fb35118e199f20c1c893d7d81f187aa69a679dd5 Mon Sep 17 00:00:00 2001 From: Chase Turner Date: Tue, 15 Aug 2017 13:06:23 -0500 Subject: [PATCH 1/2] Space Travel to Mars App completed --- 02week/pigLatin.js | 17 +++++++++++++---- 04week/algorithms.js | 8 ++++++++ 05week/checkers.js | 1 + 05week/spaceTravelToMars.js | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+), 4 deletions(-) diff --git a/02week/pigLatin.js b/02week/pigLatin.js index 046434c94..8ce7254be 100644 --- a/02week/pigLatin.js +++ b/02week/pigLatin.js @@ -9,15 +9,24 @@ const rl = readline.createInterface({ function pigLatin(word) { - - // Your code here - +let inputArray = word.split(''); +let vowelArray = ['a','e','i','o','u']; +for(let i =0; i { - console.log( pigLatin(answer) ); + pigLatin(answer) getPrompt(); }); } diff --git a/04week/algorithms.js b/04week/algorithms.js index 5759b960e..29128dcae 100644 --- a/04week/algorithms.js +++ b/04week/algorithms.js @@ -16,7 +16,15 @@ for (let i = 0; i < 1000; i++) { function bubbleSort(arr) { // Your code here + for (let i =0; i < arr.length; i++){ + if (arr[i] > arr[i+1]){ + let temp = arr[i] + arr[i] = arr[i+1]; + arr[i+1] = temp; + } + } } +console.log(bubbleSort(arr)); function mergeSort(arr) { // Your code here diff --git a/05week/checkers.js b/05week/checkers.js index 8f33a089c..dc736644c 100644 --- a/05week/checkers.js +++ b/05week/checkers.js @@ -10,6 +10,7 @@ const rl = readline.createInterface({ function Checker() { // Your code here + } function Board() { diff --git a/05week/spaceTravelToMars.js b/05week/spaceTravelToMars.js index ce258a382..6f9dd664a 100644 --- a/05week/spaceTravelToMars.js +++ b/05week/spaceTravelToMars.js @@ -10,7 +10,40 @@ let jobTypes = { }; // Your code here +class CrewMember{ + constructor(name, job, specialSkill){ + this.name = name; + this.job = job; + this.specialSkill = specialSkill; + this.ship = null; + } + enterShip(ship1){ + this.ship = ship1; + this.ship.crew.push(this); + } +} +class Ship{ + constructor(name, type, ability){ + this.name = name; + this.type = type; + this.ability = ability; + this.crew = []; + } + missionStatement(){ + if (this.crew.length >0){ + return this.ability; + }else{ + return 'Can\'t perform a mission yet.' + } + } +} +/*const crewMember1 = new CrewMember('Chase','commander','being radical',''); +const crewMember2 = new CrewMember('Julian','pilot','stylist',''); +const crewMember3 = new CrewMember('Rick','mechanic','sharpshooter',''); +const crewMember4 = new CrewMember('Cora','programmer','talking shit',''); +const mav = new Ship('Mars Ascent Vehicle','MAV','Ascend into low orbit'); +const hermes = new Ship('Hermes','Main Ship','Interplanetary Space Travel');*/ //tests if (typeof describe === 'function'){ describe('CrewMember', function(){ From d4dc86548310c132de48b640e4ccb2dafc56139a Mon Sep 17 00:00:00 2001 From: Chase Turner Date: Tue, 15 Aug 2017 13:46:19 -0500 Subject: [PATCH 2/2] Changed Pig Latin in the wrong branch fixing now --- 02week/pigLatin.js | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/02week/pigLatin.js b/02week/pigLatin.js index 8ce7254be..5eb810faa 100644 --- a/02week/pigLatin.js +++ b/02week/pigLatin.js @@ -9,20 +9,23 @@ const rl = readline.createInterface({ function pigLatin(word) { -let inputArray = word.split(''); -let vowelArray = ['a','e','i','o','u']; -for(let i =0; i {