big refactor on new KataQuestions for Course 1 and 2 and 3

Author: lynnlangit

src/main/java/org/teachingextensions/approvals/lite/util/NumberUtils.java

@@ -5,58 +5,64 @@
 /**
  * A static class of convenience functions for Manipulating numbers
  */
-public class NumberUtils {
-    public static Random RANDOM = new Random();
-
-    /**
-     * Loads an int from a String.
-     *
-     * @param i            a string with an integer in it
-     * @param defaultValue value to use when no integer can be found in the string
-     * @return the integer found in the string
-     */
-    public static int load(String i, int defaultValue) {
-        return load(i, defaultValue, true);
+public class NumberUtils
+{
+  public static Random RANDOM = new Random();
+  /**
+   * Loads an int from a String.
+   *
+   * @param i            a string with an integer in it
+   * @param defaultValue value to use when no integer can be found in the string
+   * @return the integer found in the string
+   */
+  public static int load(String i, int defaultValue)
+  {
+    return load(i, defaultValue, true);
+  }
+  /**
+   * Loads an int from a String.
+   *
+   * @param i               a string with an integer in it
+   * @param defaultValue    value to use when no integer can be found in the string
+   * @param stripNonNumeric true if non-numeric characters should be removed from the string
+   * @return the integer found in the string
+   */
+  public static int load(String i, int defaultValue, boolean stripNonNumeric)
+  {
+    try
+    {
+      i = stripNonNumeric ? StringUtils.stripNonNumeric(i, true, true) : i;
+      defaultValue = Integer.parseInt(i);
     }
-
-    /**
-     * Loads an int from a String.
-     *
-     * @param i               a string with an integer in it
-     * @param defaultValue    value to use when no integer can be found in the string
-     * @param stripNonNumeric true if non-numeric characters should be removed from the string
-     * @return the integer found in the string
-     */
-    public static int load(String i, int defaultValue, boolean stripNonNumeric) {
-        try {
-            i = stripNonNumeric ? StringUtils.stripNonNumeric(i, true, true)
-                    : i;
-            defaultValue = Integer.parseInt(i);
-        } catch (Exception ignored) {
-        }
-        return defaultValue;
+    catch (Exception ignored)
+    {
     }
-
-    public static boolean equals(double one, double two, double delta) {
-        double actualDelta = one - two;
-        return (-delta < actualDelta) && (actualDelta < delta);
+    return defaultValue;
+  }
+  public static boolean equals(double one, double two, double delta)
+  {
+    double actualDelta = one - two;
+    return (-delta < actualDelta) && (actualDelta < delta);
+  }
+  /**
+   * randomly chooses a number between the minimum and maximum
+   * <div><b>Example:</b>
+   * {@code int grade =  NumberUtils.getRandomInt(1,100);} </div>
+   *
+   * @param minimum The lowest possible value (inclusive)
+   * @param maximum The highest possible value (inclusive)
+   * @return the random number
+   */
+  public static int getRandomInt(int minimum, int maximum)
+  {
+    int diff = maximum - minimum;
+    if (diff == 0)
+    {
+      return maximum;
     }
-
-    /**
-     * randomly chooses a number between the minimum and maximum
-     * <div><b>Example:</b>
-     * {@code int grade =  NumberUtils.getRandomInt(1,100);} </div>
-     *
-     * @param minimum The lowest possible value (inclusive)
-     * @param maximum The highest possible value (inclusive)
-     * @return the random number
-     */
-    public static int getRandomInt(int minimum, int maximum) {
-        int diff = maximum - minimum;
-        if (diff == 0) {
-            return maximum;
-        } else {
-            return RANDOM.nextInt(diff) + minimum;
-        }
+    else
+    {
+      return RANDOM.nextInt(diff) + minimum;
     }
+  }
 }

src/main/java/org/teachingkidsprogramming/recipes/completed/section01forloops/KataQuestions/SquareToIncreasingThickHexagonMultiColor_05.java

@@ -7,7 +7,7 @@
 // How would you make a hexagon... 
 //     with 20px thick sides...
 //     and with randomly colored lines
-//     and with side lengths of 25 that increase by 2x?
+//     and with side lengths of 25 that increase by 2x each time?
 //
 //  Write out the steps in English 
 //  Then translate the steps into code

src/main/java/org/teachingkidsprogramming/recipes/completed/section01forloops/KataQuestions/SquareToIncreasingThickHexagonMultiColor_ANSWER_06.java

@@ -0,0 +1,27 @@
+package org.teachingkidsprogramming.recipes.completed.section01forloops.KataQuestions;
+
+import org.teachingextensions.logo.Tortoise;
+import org.teachingextensions.logo.utils.ColorUtils.PenColors;
+
+//------------Kata Question---------------//
+// How would you make a hexagon... 
+//     with 20px thick sides...
+//     and with randomly colored lines
+//     and with side lengths of 25 that increase by 2x each time?
+//
+public class SquareToIncreasingThickHexagonMultiColor_ANSWER_06
+{
+  public static void main(String[] args) throws Exception
+  {
+    Tortoise.show();
+    Tortoise.setSpeed(10);
+    Tortoise.setPenWidth(20);
+    int sides = 7;
+    for (int i = 0; i < sides; i++)
+    {
+      Tortoise.setPenColor(PenColors.getRandomColor());
+      Tortoise.move(25 * i);
+      Tortoise.turn(360 / sides);
+    }
+  }
+}

src/main/java/org/teachingkidsprogramming/recipes/completed/section02methods/KataQuestions/HousesToAColorfulPointyAndASlantedRoof_ANSWER_05.java

@@ -0,0 +1,59 @@
+package org.teachingkidsprogramming.recipes.completed.section02methods.KataQuestions;
+
+import org.teachingextensions.logo.Tortoise;
+import org.teachingextensions.logo.utils.ColorUtils.PenColors;
+
+//------------Kata Question---------------//
+//  How would you make a pointy roof
+//      and how would make a slanted roof
+//      and change the color of the houses?
+//
+public class HousesToAColorfulPointyAndASlantedRoof_ANSWER_05
+{
+  public static void main(String[] args)
+  {
+    Tortoise.show();
+    Tortoise.setSpeed(10);
+    Tortoise.setX(200);
+    int height = 40;
+    drawSlantedRoofHouse(height);
+    drawPointyRoofHouse(120);
+    drawSlantedRoofHouse(90);
+    drawPointyRoofHouse(20);
+  }
+  public static void drawSlantedRoofHouse(int height)
+  {
+    Tortoise.setPenColor(PenColors.Grays.Black);
+    Tortoise.move(height);
+    drawSlantedRoof();
+    Tortoise.move(height);
+    Tortoise.turn(-90);
+    Tortoise.move(20);
+    Tortoise.turn(-90);
+  }
+  private static void drawSlantedRoof()
+  {
+    Tortoise.turn(45);
+    Tortoise.move(60);
+    Tortoise.turn(135);
+    Tortoise.move(45);
+  }
+  public static void drawPointyRoofHouse(int height)
+  {
+    Tortoise.setPenColor(PenColors.Grays.LightGray);
+    Tortoise.move(height);
+    drawPointyRoof();
+    Tortoise.move(height);
+    Tortoise.turn(-90);
+    Tortoise.move(20);
+    Tortoise.turn(-90);
+  }
+  private static void drawPointyRoof()
+  {
+    Tortoise.turn(45);
+    Tortoise.move(30);
+    Tortoise.turn(90);
+    Tortoise.move(30);
+    Tortoise.turn(45);
+  }
+}

src/main/java/org/teachingkidsprogramming/recipes/completed/section02methods/KataQuestions/PyramidsOfGizaRemoveEvenMoreDuplication_03.java

@@ -4,11 +4,11 @@
 import org.teachingextensions.logo.utils.ColorUtils.PenColors;
 
 //------------Kata Question---------------//
-//Where do you see duplicate lines of code?
-//  and how can you refactor to make this code more readable?
-//Write out the steps in English 
-//Then translate the steps into code
-//Make sure to run after each line
+//  Where do you see duplicate lines of code?
+//      and how can you re-factor to make this code more readable?
+//  Write out the steps in English 
+//  Then translate the steps into code
+//  Make sure to run after each line
 //
 public class PyramidsOfGizaRemoveEvenMoreDuplication_03
 {

src/main/java/org/teachingkidsprogramming/recipes/completed/section02methods/KataQuestions/PyramidsOfGizaRemoveEvenMoreDuplication_ANSWER_04.java

@@ -0,0 +1,43 @@
+package org.teachingkidsprogramming.recipes.completed.section02methods.KataQuestions;
+
+import org.teachingextensions.logo.Tortoise;
+import org.teachingextensions.logo.utils.ColorUtils.PenColors;
+
+//------------Kata Question---------------//
+//  Where do you see duplicate lines of code?
+//      and how can you re-factor to make this code more readable?
+//
+//  Note: This answer is more advanced than the student's knowledge at this point
+//  The answer is for teacher preparation (for future lessons)
+//  It is also somewhat academic to illustrate 'too much re-factoring'
+//  Which results in reduced human readability
+//
+public class PyramidsOfGizaRemoveEvenMoreDuplication_ANSWER_04
+{
+  public static void main(String[] args) throws Exception
+  {
+    setUpPyramidLand();
+    int[][] degreesAndLength = {{-90, 220},
+                                {135, 100},
+                                {90, 100},
+                                {-90, 100},
+                                {90, 100},
+                                {-90, 100},
+                                {90, 100},
+                                {135, 210}};
+    for (int[] i : degreesAndLength)
+    {
+      Tortoise.turn(i[0]);
+      Tortoise.move(i[1]);
+    }
+  }
+  private static void setUpPyramidLand()
+  {
+    Tortoise.show();
+    Tortoise.setSpeed(10);
+    Tortoise.getBackgroundWindow().setBackground(PenColors.Blues.AliceBlue);
+    Tortoise.setPenColor(PenColors.Yellows.DarkGoldenrod);
+    Tortoise.setPenWidth(2);
+    Tortoise.hide();
+  }
+}

…ToNoZeroNoNegativeAndKeepPlaying_02.java …ns/HiLoNoZeroNoNegativeAndPlayOn_02.javasrc/main/java/org/teachingkidsprogramming/recipes/completed/section03ifs/KataQuestions/HiLowToNoZeroNoNegativeAndKeepPlaying_02.java renamed to src/main/java/org/teachingkidsprogramming/recipes/completed/section03ifs/KataQuestions/HiLoNoZeroNoNegativeAndPlayOn_02.java src/main/java/org/teachingkidsprogramming/recipes/completed/section03ifs/KataQuestions/HiLowToNoZeroNoNegativeAndKeepPlaying_02.java renamed to src/main/java/org/teachingkidsprogramming/recipes/completed/section03ifs/KataQuestions/HiLoNoZeroNoNegativeAndPlayOn_02.java

@@ -13,7 +13,7 @@
 //  Then translate the steps into code
 //  Make sure to run after each line
 //
-public class HiLowToNoZeroNoNegativeAndKeepPlaying_02
+public class HiLoNoZeroNoNegativeAndPlayOn_02
 {
   public static void main(String[] args)
   {

…NoNegativePlayOnAndAddUpperBound_03.java …/HiLoNoZeroOr101AndNoMinusPlayOn_03.javasrc/main/java/org/teachingkidsprogramming/recipes/completed/section03ifs/KataQuestions/HiLowToNoZeroNoNegativePlayOnAndAddUpperBound_03.java renamed to src/main/java/org/teachingkidsprogramming/recipes/completed/section03ifs/KataQuestions/HiLoNoZeroOr101AndNoMinusPlayOn_03.java src/main/java/org/teachingkidsprogramming/recipes/completed/section03ifs/KataQuestions/HiLowToNoZeroNoNegativePlayOnAndAddUpperBound_03.java renamed to src/main/java/org/teachingkidsprogramming/recipes/completed/section03ifs/KataQuestions/HiLoNoZeroOr101AndNoMinusPlayOn_03.java

@@ -15,7 +15,7 @@
 //  Then translate the steps into code
 //  Make sure to run after each line
 //
-public class HiLowToNoZeroNoNegativePlayOnAndAddUpperBound_03
+public class HiLoNoZeroOr101AndNoMinusPlayOn_03
 {
   public static void main(String[] args)
   {

…n03ifs/KataQuestions/HiLowNoZero_01.java …on03ifs/KataQuestions/HiLoNoZero_01.javasrc/main/java/org/teachingkidsprogramming/recipes/completed/section03ifs/KataQuestions/HiLowNoZero_01.java renamed to src/main/java/org/teachingkidsprogramming/recipes/completed/section03ifs/KataQuestions/HiLoNoZero_01.java src/main/java/org/teachingkidsprogramming/recipes/completed/section03ifs/KataQuestions/HiLowNoZero_01.java renamed to src/main/java/org/teachingkidsprogramming/recipes/completed/section03ifs/KataQuestions/HiLoNoZero_01.java

@@ -11,7 +11,7 @@
 //  Then translate the steps into code
 //  Make sure to run after each line
 //
-public class HiLowNoZero_01
+public class HiLoNoZero_01
 {
   public static void main(String[] args)
   {

…n03ifs/KataQuestions/HiLowFixBug_04.java …ifs/KataQuestions/HiLoSeeBugInfo_04.javasrc/main/java/org/teachingkidsprogramming/recipes/completed/section03ifs/KataQuestions/HiLowFixBug_04.java renamed to src/main/java/org/teachingkidsprogramming/recipes/completed/section03ifs/KataQuestions/HiLoSeeBugInfo_04.java src/main/java/org/teachingkidsprogramming/recipes/completed/section03ifs/KataQuestions/HiLowFixBug_04.java renamed to src/main/java/org/teachingkidsprogramming/recipes/completed/section03ifs/KataQuestions/HiLoSeeBugInfo_04.java

@@ -5,14 +5,13 @@
 import org.teachingextensions.logo.utils.EventUtils.MessageBox;
 
 //------------Kata Question---------------//
-//  What happens when you enter a decimal and why?
-//  What should happen? 
-//  Can you fix the bug?
+//  What happens when you enter letters (i.e. 'abc') as your guess?
+//      How can you see what your guess is exactly? 
 //  Write out the steps in English 
 //  Then translate the steps into code
 //  Make sure to run after each line
 //
-public class HiLowFixBug_04
+public class HiLoSeeBugInfo_04
 {
   public static void main(String[] args)
   {
@@ -21,6 +20,7 @@ public static void main(String[] args)
     for (int i = 0; i < 8; i++)
     {
       int guess = MessageBox.askForNumericalInput("Can you guess the random number between 1 and 100?");
+      
       if (guess == 0)
       {
         MessageBox.showMessage("No Zero allowed, you lose!");