From 2941dc4cb5761f67ebd9b86f016b14639955ed96 Mon Sep 17 00:00:00 2001 From: Alethea Toh Date: Tue, 27 Feb 2018 15:37:24 +0800 Subject: [PATCH 1/3] completed hw --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- js/filterLongWords.js | 10 +++++++++ js/fizzbuzz.js | 12 +++++++++++ js/grade.js | 28 +++++++++++++++++++++++++ js/phonebook.js | 36 ++++++++++++++++++++++++++++++++ js/reverse.js | 17 +++++++++++++++ 6 files changed, 104 insertions(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 661b9e4..1dbae13 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,7 +2,7 @@ Please describe your comfort and completeness levels before submitting. -Comfort Level (1-5): +Comfort Level (1-5): Completeness Level (1-5): diff --git a/js/filterLongWords.js b/js/filterLongWords.js index e69de29..fe64561 100644 --- a/js/filterLongWords.js +++ b/js/filterLongWords.js @@ -0,0 +1,10 @@ +function filterLongWords(array) { + var maxLength = 4; + var new_array = []; + for (var word in array) { + if (word.length < maxLength) new_array.push(word); + } + console.log(maxLength); +} + +filterLongWords(['hello','my','name','alethea']); diff --git a/js/fizzbuzz.js b/js/fizzbuzz.js index e69de29..6ead69f 100644 --- a/js/fizzbuzz.js +++ b/js/fizzbuzz.js @@ -0,0 +1,12 @@ +function fizzbuzz() { + var i=1; + while (i <= 100) { + if (i%3 == 0 && i%5 == 0) console.log("fizzbuzz"); + else if (i%3 == 0) console.log("fizz"); + else if (i%5 == 0) console.log("buzz"); + else console.log(i); + i++; + } +} + +fizzbuzz(); diff --git a/js/grade.js b/js/grade.js index e69de29..628662b 100644 --- a/js/grade.js +++ b/js/grade.js @@ -0,0 +1,28 @@ + +function grade(score) { + // Display either "A", "B", "C", "D", or "F", for an score that is an integer between 0 and 100. + var grade; + switch(true) { + case score > 100: + grade = "Invalid input!"; + break; + case score >= 90: + grade = "A"; + break; + case score >= 80: + grade = "B"; + break; + case score >= 70: + grade = "C"; + break; + case score >= 60: + grade = "D"; + break; + default: + grade = "F"; + } + console.log(grade); +} + +grade(80); +grade(166); diff --git a/js/phonebook.js b/js/phonebook.js index e69de29..bf1038c 100644 --- a/js/phonebook.js +++ b/js/phonebook.js @@ -0,0 +1,36 @@ +function phoneBook(pb) { + for (var thing in pb) { + if (pb[thing] === "333-333-3333") console.log(thing); + } +} + +var pb = { + "Abe": "111-111-1111", + "Bob": "222-222-2222", + "Cam": "333-333-3333", + "Dan": "444-444-4444", + "Ern": "555-555-5555", + "Fry": "111-111-1111", + "Gil": "222-222-2222", + "Hal": "333-333-3333", + "Ike": "444-444-4444", + "Jim": "555-555-5555", + "Kip": "111-111-1111", + "Liv": "222-222-2222", + "Mia": "333-333-3333", + "Nik": "444-444-4444", + "Oli": "555-555-5555", + "Pam": "111-111-1111", + "Qiq": "222-222-2222", + "Rob": "333-333-3333", + "Stu": "444-444-4444", + "Tad": "555-555-5555", + "Uwe": "111-111-1111", + "Val": "222-222-2222", + "Wil": "333-333-3333", + "Xiu": "444-444-4444", + "Yam": "555-555-5555", + "Zed": "111-111-1111" +}; + +phoneBook(pb); diff --git a/js/reverse.js b/js/reverse.js index e69de29..74bc317 100644 --- a/js/reverse.js +++ b/js/reverse.js @@ -0,0 +1,17 @@ +function reverseString(str) { + var arr = str.split(""); + + var ptr1 = 0; + var ptr2 = arr.length-1; + + while (ptr1 < ptr2) { + var temp = arr[ptr1]; + arr[ptr1] = arr[ptr2]; + arr[ptr2] = temp; + ptr1++; + ptr2--; + } + + return arr.join(""); +} +console.log(reverseString("hello")); From ae3ce531c7762813a88daf7651910f210397523e Mon Sep 17 00:00:00 2001 From: Alethea Toh Date: Tue, 27 Feb 2018 15:46:08 +0800 Subject: [PATCH 2/3] latest changes --- js/filterLongWords.js | 2 +- js/grade.js | 2 +- js/phonebook.js | 4 ++-- js/reverse.js | 6 ++++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/js/filterLongWords.js b/js/filterLongWords.js index fe64561..43a6e97 100644 --- a/js/filterLongWords.js +++ b/js/filterLongWords.js @@ -7,4 +7,4 @@ function filterLongWords(array) { console.log(maxLength); } -filterLongWords(['hello','my','name','alethea']); +filterLongWords(['hello','my','name','is','alethea']); diff --git a/js/grade.js b/js/grade.js index 628662b..b654ce5 100644 --- a/js/grade.js +++ b/js/grade.js @@ -4,7 +4,7 @@ function grade(score) { var grade; switch(true) { case score > 100: - grade = "Invalid input!"; + grade = "There's no way your score could be that high!"; break; case score >= 90: grade = "A"; diff --git a/js/phonebook.js b/js/phonebook.js index bf1038c..fb3da3a 100644 --- a/js/phonebook.js +++ b/js/phonebook.js @@ -1,6 +1,6 @@ function phoneBook(pb) { - for (var thing in pb) { - if (pb[thing] === "333-333-3333") console.log(thing); + for (var entry in pb) { + if (pb[entry] === "333-333-3333") console.log(entry); } } diff --git a/js/reverse.js b/js/reverse.js index 74bc317..200b284 100644 --- a/js/reverse.js +++ b/js/reverse.js @@ -1,6 +1,6 @@ function reverseString(str) { var arr = str.split(""); - + var ptr1 = 0; var ptr2 = arr.length-1; @@ -14,4 +14,6 @@ function reverseString(str) { return arr.join(""); } -console.log(reverseString("hello")); + +var inputString = 'building'; +console.log(reverseString(inputString)); From 97b391d19f90bbc30bf38302002cc2621aa0cc72 Mon Sep 17 00:00:00 2001 From: Alethea Toh Date: Tue, 27 Feb 2018 16:33:06 +0800 Subject: [PATCH 3/3] latest changes --- .github/PULL_REQUEST_TEMPLATE.md | 6 +++--- js/filterLongWords.js | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 1dbae13..32ad9bb 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,8 +2,8 @@ Please describe your comfort and completeness levels before submitting. -Comfort Level (1-5): +Comfort Level (1-5): 5 -Completeness Level (1-5): +Completeness Level (1-5): 5 -What did you think of this deliverable?: +What did you think of this deliverable?: As I have some background in programming, I found the assignments relatively easy. diff --git a/js/filterLongWords.js b/js/filterLongWords.js index 43a6e97..d47e5d7 100644 --- a/js/filterLongWords.js +++ b/js/filterLongWords.js @@ -1,9 +1,12 @@ function filterLongWords(array) { var maxLength = 4; var new_array = []; - for (var word in array) { + + array.forEach(function(word) { if (word.length < maxLength) new_array.push(word); - } + }); + + console.log(new_array); console.log(maxLength); }