From b0c1c908dab2fd93c8dcc92a2affa20eef6a6c77 Mon Sep 17 00:00:00 2001 From: CJ Fulton Date: Mon, 29 Jun 2020 14:57:41 -0400 Subject: [PATCH 1/5] Completed printing shapes exercises --- assets/js/shapes.js | 65 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/assets/js/shapes.js b/assets/js/shapes.js index e4351ba..a23a8d0 100644 --- a/assets/js/shapes.js +++ b/assets/js/shapes.js @@ -1,31 +1,96 @@ function getLine(length) { + var star = "*"; + var star1 = ""; + for (var i = 0; i< length; i++ ){ + star1 = star1 + star; + } + return star1; // TODO - write method definition here } function getBox(width, height) { + var box = ""; + for (var i = 0; i 0; i--){ + topTriangle = topTriangle + getLine(i); + if (i != 1){ + topTriangle = topTriangle + "\n"; + } + } + return topTriangle; // TODO - write method definition here } function getPyramid(length) { + var pyramid = ""; + var j = 1; + var size = length -1; + for (var i = 0; i < length; i++){ + pyramid = pyramid + " ".repeat(size) + getLine(j) + " ".repeat(size); + j = j + 2; + size = size - 1; + if (i != length-1){ + pyramid = pyramid + "\n"; + } + } + return pyramid; // TODO - write method definition here } function getCheckerboard(width, height) { + var checkerBoard =""; + var tempLine1 = ""; + var tempLine2 = ""; + for (var i = 0;i Date: Mon, 29 Jun 2020 15:59:30 -0400 Subject: [PATCH 2/5] Added "*".repeat --- assets/js/shapes.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/assets/js/shapes.js b/assets/js/shapes.js index a23a8d0..368fc10 100644 --- a/assets/js/shapes.js +++ b/assets/js/shapes.js @@ -1,10 +1,5 @@ function getLine(length) { - var star = "*"; - var star1 = ""; - for (var i = 0; i< length; i++ ){ - star1 = star1 + star; - } - return star1; + return "*".repeat(length); // TODO - write method definition here } From 571d1054384b67503d3e162790da2be0d83adb82 Mon Sep 17 00:00:00 2001 From: CJ Fulton Date: Mon, 29 Jun 2020 16:32:20 -0400 Subject: [PATCH 3/5] Fixed test cases --- assets/js/footer-functions.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/js/footer-functions.js b/assets/js/footer-functions.js index 42cc05b..81394b5 100644 --- a/assets/js/footer-functions.js +++ b/assets/js/footer-functions.js @@ -24,7 +24,7 @@ function getBoxTests() { function getBottomLeftTriangleTests() { testGetBottomLeftTriangle("*", 1); testGetBottomLeftTriangle("*\n**", 2); - testGetBottomLeftTriangle("*\n**\n**", 3); + testGetBottomLeftTriangle("*\n**\n***", 3); } function getUpperLeftTriangleTests() { @@ -42,7 +42,7 @@ function getPyramidTests() { function getCheckerboardTests() { - testGetCheckerboard(" *\n* ", 2, 2); - testGetCheckerboard(" * \n* *\n * ", 3, 3); + testGetCheckerboard(" *\n*\n", 2, 2); + testGetCheckerboard(" * \n* *\n *\n", 3, 3); testGetCheckerboard(" * \n* *\n * \n* *\n", 3, 4); } \ No newline at end of file From 9c117ea692815f5376ec0c3d0e40b69664a79469 Mon Sep 17 00:00:00 2001 From: CJ Fulton Date: Mon, 29 Jun 2020 16:37:50 -0400 Subject: [PATCH 4/5] Actually fixed test cases --- assets/js/footer-functions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/js/footer-functions.js b/assets/js/footer-functions.js index 81394b5..4ee25ea 100644 --- a/assets/js/footer-functions.js +++ b/assets/js/footer-functions.js @@ -42,7 +42,7 @@ function getPyramidTests() { function getCheckerboardTests() { - testGetCheckerboard(" *\n*\n", 2, 2); - testGetCheckerboard(" * \n* *\n *\n", 3, 3); + testGetCheckerboard(" *\n* \n", 2, 2); + testGetCheckerboard(" * \n* *\n * \n", 3, 3); testGetCheckerboard(" * \n* *\n * \n* *\n", 3, 4); } \ No newline at end of file From 49776df9f9381fd8fef17ac2d663a10e92e72f70 Mon Sep 17 00:00:00 2001 From: CJ Fulton Date: Tue, 30 Jun 2020 12:03:48 -0400 Subject: [PATCH 5/5] Changed variable names for clarity. --- assets/js/shapes.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/assets/js/shapes.js b/assets/js/shapes.js index 368fc10..e9d1136 100644 --- a/assets/js/shapes.js +++ b/assets/js/shapes.js @@ -33,9 +33,9 @@ function getBottomLeftTriangle(length) { function getUpperLeftTriangle(length) { var topTriangle = ""; - for (var i = length; i>0; i--){ - topTriangle = topTriangle + getLine(i); - if (i != 1){ + for (var width = length; width>0; width--){ + topTriangle = topTriangle + getLine(width); + if (width != 1){ topTriangle = topTriangle + "\n"; } } @@ -47,12 +47,12 @@ function getUpperLeftTriangle(length) { function getPyramid(length) { var pyramid = ""; - var j = 1; + var width = 1; var size = length -1; for (var i = 0; i < length; i++){ - pyramid = pyramid + " ".repeat(size) + getLine(j) + " ".repeat(size); - j = j + 2; - size = size - 1; + pyramid = pyramid + " ".repeat(size) + getLine(width) + " ".repeat(size); + width+= 2; + size-= 1; if (i != length-1){ pyramid = pyramid + "\n"; }