From 9b066457e7cd2650fefc8d5c45a64c9cd3d39366 Mon Sep 17 00:00:00 2001 From: walzer85 Date: Tue, 24 Oct 2017 18:54:01 -0500 Subject: [PATCH 1/8] starting to understand the syntax of forEach --- 04week/gitOlympics.js | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 04week/gitOlympics.js diff --git a/04week/gitOlympics.js b/04week/gitOlympics.js new file mode 100644 index 000000000..9554111a9 --- /dev/null +++ b/04week/gitOlympics.js @@ -0,0 +1,7 @@ +'use strict' + +const names = ['athens', 'berlin', 'atlanta', 'seoul'] + +printListOfOlympics=(arr)=>{ + arr.forEach(i)=>{console.log(i)} +} From 01da0422d27d6637f825cad78c5506bf8012a2f1 Mon Sep 17 00:00:00 2001 From: walzer85 Date: Tue, 24 Oct 2017 18:56:26 -0500 Subject: [PATCH 2/8] added missing const --- 04week/gitOlympics.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/04week/gitOlympics.js b/04week/gitOlympics.js index 9554111a9..fe9b8488c 100644 --- a/04week/gitOlympics.js +++ b/04week/gitOlympics.js @@ -2,6 +2,8 @@ const names = ['athens', 'berlin', 'atlanta', 'seoul'] -printListOfOlympics=(arr)=>{ - arr.forEach(i)=>{console.log(i)} +const printListOfOlympics=(arr)=>{ + arr.forEach(i => console.log(i)) } + +printListOfOlympics(names); From 7d6c86886eae7e51532acba7f969c21f1cc58090 Mon Sep 17 00:00:00 2001 From: walzer85 Date: Tue, 24 Oct 2017 18:57:02 -0500 Subject: [PATCH 3/8] added one more city --- 04week/gitOlympics.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/04week/gitOlympics.js b/04week/gitOlympics.js index fe9b8488c..332de72b7 100644 --- a/04week/gitOlympics.js +++ b/04week/gitOlympics.js @@ -1,6 +1,6 @@ 'use strict' -const names = ['athens', 'berlin', 'atlanta', 'seoul'] +const names = ['athens', 'berlin', 'atlanta', 'seoul', 'los angeles'] const printListOfOlympics=(arr)=>{ arr.forEach(i => console.log(i)) From 26d8d99a53cd2028cf579cd17cf515b09fc2ea2b Mon Sep 17 00:00:00 2001 From: walzer85 Date: Tue, 24 Oct 2017 19:51:37 -0500 Subject: [PATCH 4/8] will review this change in a bit --- 01week/datatypes.js | 81 +++++++++++++++++++++++++++++++++++++++++++++ 02week/pigLatin.js | 51 ---------------------------- 02week/tests.js | 67 +++++++++++++++++++++++++++++++++++++ index.html | 2 +- 4 files changed, 149 insertions(+), 52 deletions(-) delete mode 100644 02week/pigLatin.js diff --git a/01week/datatypes.js b/01week/datatypes.js index e69de29bb..9f82f4110 100644 --- a/01week/datatypes.js +++ b/01week/datatypes.js @@ -0,0 +1,81 @@ +`use strict` + +//returns current date and time +//create a function that inputs the year, month, and day +//make new var to store the today var and toDateString method +//use var today with toDateString method + +function dateDisplay(year, month, date) { + var today = new Date(year, month, date); + return today.toDateString(); +} + +dateDisplay(1985, 10, 1); + +//create a function with one argument. +//the argument should be a number +//return the argument with the toString() method to make the number a string + +function toNumber(number) { + return number.toString() +} + +toNumber(13); + +//create a fucntion that receives one argument +//argument should be a string +//use parseInt() method on argument to pull a number out + +function stringNum(str){ + return parseInt(str); +} + +stringNum('15 years'); + +//create a function with one argument +//use the typeOf method on the argument and return the result + +function dataType(dT){ + return typeof(dT); +} + +dataType(`words words words`); + +//Create a function with two arguments +//Inside the function, add the two var together +//Use parseInt() to take the number out of the string + +function add(numOne, numTwo) { + return parseInt(numOne) + parseInt(numTwo) +} + +add(`13`, `17`); + +//write a function that returns a true if two var are truthy +//if both var are true, show "nope" +//if both var are false, also show "nope" +// if one is false and one is true, show "yep!" + +function truest(thingOne, thingTwo) { + if ((thingOne === true && thingTwo === true) || (thingOne === false && thingTwo === false)){ + return `nope`; + } else { + return 'yep!'; + } +} + +truest(true, false); + +//write a function with two arguments +//if both arguments are false, show a confirmation message +//if either argument is true, return a negative response + +function womp(dumb, dumber) { + if (dumb === false && dumber === false) { + return `yes, they're both false` + } else { + return 'nah, try again' + } +}; + +womp(false, true); diff --git a/02week/pigLatin.js b/02week/pigLatin.js deleted file mode 100644 index 046434c94..000000000 --- a/02week/pigLatin.js +++ /dev/null @@ -1,51 +0,0 @@ -'use strict'; - -const assert = require('assert'); -const readline = require('readline'); -const rl = readline.createInterface({ - input: process.stdin, - output: process.stdout -}); - - -function pigLatin(word) { - - // Your code here - -} - - -function getPrompt() { - rl.question('word ', (answer) => { - console.log( pigLatin(answer) ); - getPrompt(); - }); -} - -// Tests - -if (typeof describe === 'function') { - - describe('#pigLatin()', () => { - it('should translate a simple word', () => { - assert.equal(pigLatin('car'), 'arcay'); - assert.equal(pigLatin('dog'), 'ogday'); - }); - it('should translate a complex word', () => { - assert.equal(pigLatin('create'), 'eatecray'); - assert.equal(pigLatin('valley'), 'alleyvay'); - }); - it('should attach "yay" if word begins with vowel', () => { - assert.equal(pigLatin('egg'), 'eggyay'); - assert.equal(pigLatin('emission'), 'emissionyay'); - }); - it('should lowercase and trim word before translation', () => { - assert.equal(pigLatin('HeLlO '), 'ellohay'); - assert.equal(pigLatin(' RoCkEt'), 'ocketray'); - }); - }); -} else { - - getPrompt(); - -} diff --git a/02week/tests.js b/02week/tests.js index e69de29bb..6991b4d89 100644 --- a/02week/tests.js +++ b/02week/tests.js @@ -0,0 +1,67 @@ +'use strict'; + +const assert = require('assert'); +const readline = require('readline'); +const rl = readline.createInterface({ + input: process.stdin, + output: process.stdout +}); + + +function rockPaperScissors(hand1, hand2) { + // check for a tie, if it is a tie, return tie, if not check for win + // rock beats scissors, scissors beats paper, paper beats rock + //to find who won, compare hand1 to hand2 + const handOne = 'Hand one wins!' + const handTwo = 'Hand two wins!' + + if(hand1 === hand2) { + return "It's a tie!"; + } else if (hand1 === 'rock'){ + return hand2 === 'paper' ? handTwo : handOne; + } else if (hand1 === 'paper') { + return hand2 === 'scissors' ? handTwo : handOne; + } else if (hand1 === 'scissors') { + return hand2 === 'rock' ? handTwo : handOne; + } +}; + +function getPrompt() { + rl.question('hand1: ', (answer1) => { + rl.question('hand2: ', (answer2) => { + console.log( rockPaperScissors(answer1, answer2) ); + getPrompt(); + }); + }); +} + +// Tests + +if (typeof describe === 'function') { + + describe('#rockPaperScissors()', () => { + it('should detect a tie', () => { + assert.equal(rockPaperScissors('rock', 'rock'), "It's a tie!"); + assert.equal(rockPaperScissors('paper', 'paper'), "It's a tie!"); + assert.equal(rockPaperScissors('scissors', 'scissors'), "It's a tie!"); + }); + it('should detect which hand won', () => { + assert.equal(rockPaperScissors('rock', 'paper'), "Hand two wins!"); + assert.equal(rockPaperScissors('paper', 'scissors'), "Hand two wins!"); + assert.equal(rockPaperScissors('scissors', 'rock'), "Hand two wins!"); + assert.equal(rockPaperScissors('scissors', 'paper'), "Hand one wins!"); + assert.equal(rockPaperScissors('rock', 'scissors'), "Hand one wins!"); + assert.equal(rockPaperScissors('paper', 'rock'), "Hand one wins!"); + }); + it('should scrub input to ensure lowercase with "trim"ed whitepace', () => { + assert.equal(rockPaperScissors('rOcK', ' paper '), "Hand two wins!"); + assert.equal(rockPaperScissors('Paper', 'SCISSORS'), "Hand two wins!"); + assert.equal(rockPaperScissors('rock ', 'sCiSsOrs'), "Hand one wins!"); + });w + // it('should detect ') + }); +} else { + + getPrompt(); + +} diff --git a/index.html b/index.html index a8de93e90..ffe101bd4 100644 --- a/index.html +++ b/index.html @@ -5,6 +5,6 @@ -

Hello World!

+

Hello Eric, how are you!

From 9571804d6e8a9ec72632d4cc4478da68b7bbeab3 Mon Sep 17 00:00:00 2001 From: walzer85 Date: Tue, 24 Oct 2017 20:30:17 -0500 Subject: [PATCH 5/8] written three tests --- 03week/towersofhanoi-tests.js | 37 +++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/03week/towersofhanoi-tests.js b/03week/towersofhanoi-tests.js index e69de29bb..0f2bfa48e 100644 --- a/03week/towersofhanoi-tests.js +++ b/03week/towersofhanoi-tests.js @@ -0,0 +1,37 @@ +'use strict' + +//Must have 3 towers, each tower will be a separate object +//each object can have a maximum of four values in an array +//the values must be largest to smallest +//each move must maintain the largest to smallest value in each array + +if (typeof describe === 'function') { + +//TEST 1 +//it should be able to move a block, if I ran towersOfHanoi('a', 'b', 'c'), the stacks would look like + //{a: [4,3], b: [1], c:[2]} + + describe('#towersOfHanoi()', () => { + it('should move a block', () => { + assert.deepEqual(stacks, {a: [4,3], b: [1], c:[2]}); + }); + +//TEST 2 +//it should be able to move a block, if I ran towersOfHanoi('a', 'b', 'c'), the stacks would look like + //{a: [4,3], b: [], c:[2, 1]} + + describe('#towersOfHanoi()', () => { + it('should move a block', () => { + assert.deepEqual(stacks, {a: [4,3], b: [], c:[2, 1]}); + }); + + +//TEST 3 +//it should detect a win, if I ran towersOfHanoi('a', 'b', 'c'), the stacks would look like + //{a: [], b: [], c:[4, 3, 2, 1]} + + describe('#towersOfHanoi()', () => { + it('should detect a win', () => { + stacks = {a: [], b: [], c:[4, 3, 2, 1]}; + } + }); From b5b3d53201ac6714ab9d5a659f7692b984eaf7eb Mon Sep 17 00:00:00 2001 From: walzer85 Date: Tue, 24 Oct 2017 20:43:41 -0500 Subject: [PATCH 6/8] practicing the syntax of tests --- 03week/towersofhanoi-tests.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/03week/towersofhanoi-tests.js b/03week/towersofhanoi-tests.js index 0f2bfa48e..9efef5960 100644 --- a/03week/towersofhanoi-tests.js +++ b/03week/towersofhanoi-tests.js @@ -8,12 +8,13 @@ if (typeof describe === 'function') { //TEST 1 -//it should be able to move a block, if I ran towersOfHanoi('a', 'b', 'c'), the stacks would look like +//it should be able to move a block, if I ran towersOfHanoi('a', 'c'), the stacks would look like //{a: [4,3], b: [1], c:[2]} describe('#towersOfHanoi()', () => { it('should move a block', () => { - assert.deepEqual(stacks, {a: [4,3], b: [1], c:[2]}); + towersOfHanoi('a', 'c'); + assert.deepEqual(stacks, {a: [4,3, 2], b: [0], c:[1]}); }); //TEST 2 @@ -22,6 +23,7 @@ if (typeof describe === 'function') { describe('#towersOfHanoi()', () => { it('should move a block', () => { + towersOfHanoi('a', 'b', 'c'); assert.deepEqual(stacks, {a: [4,3], b: [], c:[2, 1]}); }); From d3c5f93d9c4e2cf448d47d8975830079b37a5e3e Mon Sep 17 00:00:00 2001 From: walzer85 Date: Thu, 26 Oct 2017 06:42:28 -0500 Subject: [PATCH 7/8] addind all of the moves as a reference --- 03week/towersofhanoi-tests.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/03week/towersofhanoi-tests.js b/03week/towersofhanoi-tests.js index 9efef5960..57e8b0f2d 100644 --- a/03week/towersofhanoi-tests.js +++ b/03week/towersofhanoi-tests.js @@ -37,3 +37,19 @@ if (typeof describe === 'function') { stacks = {a: [], b: [], c:[4, 3, 2, 1]}; } }); + +//First Setting - {a: [4,3, 2, 1], b: [], c:[]}, +//Move 1.1 - {a: [4,3, 2], b: [1], c:[]}, +//Move 1.2 - {a: [4,3, 2], b: [], c:[1]}, +//Move 2.1 - {a: [4,3, 2], b: [1], c:[2]}, +//Move 2.2 - {a: [4,3], b: [2], c:[1]}, +//Move 3.1 - {a: [4,3], b: [], c:[2, 1]}, +//Move 3.2 - {a: [4,3], b: [2, 1], c:[]}, +//Move 4.1 - {a: [4], b: [3], c:[2, 1]}, +//Move 4.2 - {a: [4], b: [2, 1], c:[3]}, +//Move 5.1 - {a: [4, 1], b: [3], c:[2]}, +//Move 5.2 - {a: [4, 1], b: [2], c:[3]}, +//Move 6.1 - {a: [4, 1], b: [3, 2], c:[]}, +//Move 6.2 - {a: [4, 1], b: [], c:[3, 2]}, +//Move 7.1 - {a: [4], b: [3, 2, 1], c:[]}, +//Move 7.2 - {a: [4], b: [], c:[3, 2, 1]}, From 7a4641af798d3967bb9a0a12614353994c39f631 Mon Sep 17 00:00:00 2001 From: walzer85 Date: Thu, 26 Oct 2017 07:10:01 -0500 Subject: [PATCH 8/8] added winning moves and incorrect solution in comment --- 03week/towersofhanoi-tests.js | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/03week/towersofhanoi-tests.js b/03week/towersofhanoi-tests.js index 57e8b0f2d..55d829e9c 100644 --- a/03week/towersofhanoi-tests.js +++ b/03week/towersofhanoi-tests.js @@ -39,12 +39,12 @@ if (typeof describe === 'function') { }); //First Setting - {a: [4,3, 2, 1], b: [], c:[]}, -//Move 1.1 - {a: [4,3, 2], b: [1], c:[]}, -//Move 1.2 - {a: [4,3, 2], b: [], c:[1]}, -//Move 2.1 - {a: [4,3, 2], b: [1], c:[2]}, -//Move 2.2 - {a: [4,3], b: [2], c:[1]}, -//Move 3.1 - {a: [4,3], b: [], c:[2, 1]}, -//Move 3.2 - {a: [4,3], b: [2, 1], c:[]}, +//Move 1.1 - {a: [4, 3, 2], b: [1], c:[]}, +//Move 1.2 - {a: [4, 3, 2], b: [], c:[1]}, +//Move 2.1 - {a: [4, 3, 2], b: [1], c:[2]}, +//Move 2.2 - {a: [4, 3], b: [2], c:[1]}, +//Move 3.1 - {a: [4, 3], b: [], c:[2, 1]}, +//Move 3.2 - {a: [4, 3], b: [2, 1], c:[]}, //Move 4.1 - {a: [4], b: [3], c:[2, 1]}, //Move 4.2 - {a: [4], b: [2, 1], c:[3]}, //Move 5.1 - {a: [4, 1], b: [3], c:[2]}, @@ -53,3 +53,19 @@ if (typeof describe === 'function') { //Move 6.2 - {a: [4, 1], b: [], c:[3, 2]}, //Move 7.1 - {a: [4], b: [3, 2, 1], c:[]}, //Move 7.2 - {a: [4], b: [], c:[3, 2, 1]}, +//Move 8.1 - {a: [], b: [3, 2, 1], c:[4]}, +//Move 8.2 - {a: [], b: [4], c:[3, 2, 1]}, +//Move 9.1 - {a: [], b: [3, 2], c:[4, 1]}, +//Move 9.2 - {a: [], b: [4, 1], c:[3, 2]}, +//Move 10.1 - {a: [2], b: [3], c:[4, 1]}, +//Move 10.2 - {a: [2], b: [4, 1], c:[3]}, +//Move 11.1 - {a: [2, 1], b: [3], c:[4]}, +//Move 11.2 - {a: [2, 1], b: [4], c:[3]}, +//Move 12.1 - {a: [2, 1], b: [], c:[4, 3]}, +//Move 12.2 - {a: [2, 1], b: [4, 3], c:[]}, +//Move 13.1 - {a: [2], b: [1], c:[4, 3]}, +//Move 13.2 - {a: [2], b: [4, 3], c:[1]}, +//Move 14.1 - {a: [], b: [1], c:[4, 3, 2]}, +//Move 14.2 - {a: [], b: [4, 3, 2], c:[1]}, +//Move 15.1 - {a: [], b: [1], c:[4, 3, 2, 1]}, - WIN! +//Move 15.2 - {a: [], b: [4, 3, 2, 1], c:[]},