From fbdf8cdfa755ccc052e6a61a75b6e0285a17c892 Mon Sep 17 00:00:00 2001 From: Achintya Rajan <39139575+ARajan1084@users.noreply.github.com> Date: Sun, 5 Jul 2020 17:04:06 -0700 Subject: [PATCH 1/8] Updated gitignore includes .idea folder --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aa7fd81 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.idea +c4t-java.iml \ No newline at end of file From 442fae1cd9fa14ef6374de010aab8e9f44f77ad0 Mon Sep 17 00:00:00 2001 From: Achintya Rajan <39139575+ARajan1084@users.noreply.github.com> Date: Sun, 5 Jul 2020 17:06:00 -0700 Subject: [PATCH 2/8] updated gitignore --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index aa7fd81..befd812 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ .idea -c4t-java.iml \ No newline at end of file +.idea/misc.xml +c4t-java.iml +.idea/misc.xml From 3037dae0d5235a88f4eac978eb8a7f2f90c5bdc5 Mon Sep 17 00:00:00 2001 From: Achintya Rajan <39139575+ARajan1084@users.noreply.github.com> Date: Sun, 5 Jul 2020 17:06:16 -0700 Subject: [PATCH 3/8] updated gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index befd812..7001a9a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ .idea/misc.xml c4t-java.iml .idea/misc.xml +*.xml From c4b10a82442ce39491b303f8898d3bade091d8a3 Mon Sep 17 00:00:00 2001 From: Achintya Rajan <39139575+ARajan1084@users.noreply.github.com> Date: Sun, 5 Jul 2020 17:06:48 -0700 Subject: [PATCH 4/8] Created appropriate packages for Chapter 11 and added a practice problem --- .../intermediate/chapter11/practice/Methods.java | 4 ++++ .../intermediate/chapter11/solutions/Methods.java | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 src/com/codefortomorrow/intermediate/chapter11/practice/Methods.java create mode 100644 src/com/codefortomorrow/intermediate/chapter11/solutions/Methods.java diff --git a/src/com/codefortomorrow/intermediate/chapter11/practice/Methods.java b/src/com/codefortomorrow/intermediate/chapter11/practice/Methods.java new file mode 100644 index 0000000..29ffb9c --- /dev/null +++ b/src/com/codefortomorrow/intermediate/chapter11/practice/Methods.java @@ -0,0 +1,4 @@ +package com.codefortomorrow.intermediate.chapter11.practice; + +public class Methods { +} diff --git a/src/com/codefortomorrow/intermediate/chapter11/solutions/Methods.java b/src/com/codefortomorrow/intermediate/chapter11/solutions/Methods.java new file mode 100644 index 0000000..25781f7 --- /dev/null +++ b/src/com/codefortomorrow/intermediate/chapter11/solutions/Methods.java @@ -0,0 +1,4 @@ +package com.codefortomorrow.intermediate.chapter11.solutions; + +public class Methods { +} From 61ebacd4d94bd5ca8850e6e7584bdac1f071ae87 Mon Sep 17 00:00:00 2001 From: Achintya Rajan <39139575+ARajan1084@users.noreply.github.com> Date: Sun, 5 Jul 2020 17:15:05 -0700 Subject: [PATCH 5/8] Added a practice problem --- .../chapter11/practice/Methods.java | 10 ++++++++++ .../chapter11/solutions/Methods.java | 18 ++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/src/com/codefortomorrow/intermediate/chapter11/practice/Methods.java b/src/com/codefortomorrow/intermediate/chapter11/practice/Methods.java index 29ffb9c..64575d6 100644 --- a/src/com/codefortomorrow/intermediate/chapter11/practice/Methods.java +++ b/src/com/codefortomorrow/intermediate/chapter11/practice/Methods.java @@ -1,4 +1,14 @@ package com.codefortomorrow.intermediate.chapter11.practice; public class Methods { + + /** + * Difficulty: 1 + * + * Print the first n even integers + * @param n number of even integers to print + */ + public static void printEvens(int n) { + + } } diff --git a/src/com/codefortomorrow/intermediate/chapter11/solutions/Methods.java b/src/com/codefortomorrow/intermediate/chapter11/solutions/Methods.java index 25781f7..0105dde 100644 --- a/src/com/codefortomorrow/intermediate/chapter11/solutions/Methods.java +++ b/src/com/codefortomorrow/intermediate/chapter11/solutions/Methods.java @@ -1,4 +1,22 @@ package com.codefortomorrow.intermediate.chapter11.solutions; public class Methods { + + /** + * Difficulty: 2 + * + * Print the first n even integers + * @param n number of even integers to print + */ + public static void printEvens(int n) { + int evens = 0; + int i = 0; + while (evens < n) { + if (i % 2 == 0) { + System.out.print(i + " "); + n++; + } + i++; + } + } } From 653187615bfae3af58c217ee4e9c4df3a3c6bd0e Mon Sep 17 00:00:00 2001 From: Achintya Rajan <39139575+ARajan1084@users.noreply.github.com> Date: Sun, 5 Jul 2020 17:20:41 -0700 Subject: [PATCH 6/8] added a lower difficulty problem --- .../intermediate/chapter11/practice/Methods.java | 12 ++++++++++++ .../intermediate/chapter11/solutions/Methods.java | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/src/com/codefortomorrow/intermediate/chapter11/practice/Methods.java b/src/com/codefortomorrow/intermediate/chapter11/practice/Methods.java index 64575d6..ec7e2fc 100644 --- a/src/com/codefortomorrow/intermediate/chapter11/practice/Methods.java +++ b/src/com/codefortomorrow/intermediate/chapter11/practice/Methods.java @@ -2,6 +2,18 @@ public class Methods { + /** + * Difficulty: 1 + * + * Returns the average of two doubles + * @param a the first double + * @param b the second double + * @return average + */ + public static double average(double a, double b) { + return 0.0; //TODO: Fix! + } + /** * Difficulty: 1 * diff --git a/src/com/codefortomorrow/intermediate/chapter11/solutions/Methods.java b/src/com/codefortomorrow/intermediate/chapter11/solutions/Methods.java index 0105dde..0ac9471 100644 --- a/src/com/codefortomorrow/intermediate/chapter11/solutions/Methods.java +++ b/src/com/codefortomorrow/intermediate/chapter11/solutions/Methods.java @@ -2,6 +2,18 @@ public class Methods { + /** + * Difficulty: 1 + * + * Returns the average of two doubles + * @param a the first double + * @param b the second double + * @return average + */ + public static double average(double a, double b) { + return (a + b)/2; + } + /** * Difficulty: 2 * From c7133a314adcf0f84ec3912f71847e2d1fbfa790 Mon Sep 17 00:00:00 2001 From: Achintya Rajan <39139575+ARajan1084@users.noreply.github.com> Date: Sun, 5 Jul 2020 17:50:14 -0700 Subject: [PATCH 7/8] updated changes to meet contributing guidlines --- .../practice/{Methods.java => Average.java} | 12 +----------- .../chapter11/practice/PrintEvens.java | 13 +++++++++++++ .../chapter11/solutions/Average.java | 18 ++++++++++++++++++ .../{Methods.java => PrintEvens.java} | 15 +-------------- 4 files changed, 33 insertions(+), 25 deletions(-) rename src/com/codefortomorrow/intermediate/chapter11/practice/{Methods.java => Average.java} (61%) create mode 100644 src/com/codefortomorrow/intermediate/chapter11/practice/PrintEvens.java create mode 100644 src/com/codefortomorrow/intermediate/chapter11/solutions/Average.java rename src/com/codefortomorrow/intermediate/chapter11/solutions/{Methods.java => PrintEvens.java} (60%) diff --git a/src/com/codefortomorrow/intermediate/chapter11/practice/Methods.java b/src/com/codefortomorrow/intermediate/chapter11/practice/Average.java similarity index 61% rename from src/com/codefortomorrow/intermediate/chapter11/practice/Methods.java rename to src/com/codefortomorrow/intermediate/chapter11/practice/Average.java index ec7e2fc..fe7e8c3 100644 --- a/src/com/codefortomorrow/intermediate/chapter11/practice/Methods.java +++ b/src/com/codefortomorrow/intermediate/chapter11/practice/Average.java @@ -1,6 +1,6 @@ package com.codefortomorrow.intermediate.chapter11.practice; -public class Methods { +public class Average { /** * Difficulty: 1 @@ -13,14 +13,4 @@ public class Methods { public static double average(double a, double b) { return 0.0; //TODO: Fix! } - - /** - * Difficulty: 1 - * - * Print the first n even integers - * @param n number of even integers to print - */ - public static void printEvens(int n) { - - } } diff --git a/src/com/codefortomorrow/intermediate/chapter11/practice/PrintEvens.java b/src/com/codefortomorrow/intermediate/chapter11/practice/PrintEvens.java new file mode 100644 index 0000000..3b7514c --- /dev/null +++ b/src/com/codefortomorrow/intermediate/chapter11/practice/PrintEvens.java @@ -0,0 +1,13 @@ +package com.codefortomorrow.intermediate.chapter11.practice; + +public class PrintEvens { + /** + * Difficulty: 1 + * + * Print the first n even integers + * @param n number of even integers to print + */ + public static void printEvens(int n) { + + } +} diff --git a/src/com/codefortomorrow/intermediate/chapter11/solutions/Average.java b/src/com/codefortomorrow/intermediate/chapter11/solutions/Average.java new file mode 100644 index 0000000..8005c6d --- /dev/null +++ b/src/com/codefortomorrow/intermediate/chapter11/solutions/Average.java @@ -0,0 +1,18 @@ +package com.codefortomorrow.intermediate.chapter11.solutions; + +public class Average { + + /** + * Difficulty: 1 + * + * Returns the average of two doubles + * @param a the first double + * @param b the second double + * @return average + */ + public static double average(double a, double b) { + return (a + b)/2; + } + + +} diff --git a/src/com/codefortomorrow/intermediate/chapter11/solutions/Methods.java b/src/com/codefortomorrow/intermediate/chapter11/solutions/PrintEvens.java similarity index 60% rename from src/com/codefortomorrow/intermediate/chapter11/solutions/Methods.java rename to src/com/codefortomorrow/intermediate/chapter11/solutions/PrintEvens.java index 0ac9471..0e34ead 100644 --- a/src/com/codefortomorrow/intermediate/chapter11/solutions/Methods.java +++ b/src/com/codefortomorrow/intermediate/chapter11/solutions/PrintEvens.java @@ -1,19 +1,6 @@ package com.codefortomorrow.intermediate.chapter11.solutions; -public class Methods { - - /** - * Difficulty: 1 - * - * Returns the average of two doubles - * @param a the first double - * @param b the second double - * @return average - */ - public static double average(double a, double b) { - return (a + b)/2; - } - +public class PrintEvens { /** * Difficulty: 2 * From 72cb95790be98b9d4cc84dd75f76ab620a7d8fc9 Mon Sep 17 00:00:00 2001 From: Rebecca Dang Date: Sun, 5 Jul 2020 18:03:52 -0700 Subject: [PATCH 8/8] Fix style and bug in printEvens --- .../intermediate/chapter11/practice/Average.java | 3 +-- .../intermediate/chapter11/practice/PrintEvens.java | 3 ++- .../intermediate/chapter11/solutions/Average.java | 5 +---- .../intermediate/chapter11/solutions/PrintEvens.java | 3 ++- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/com/codefortomorrow/intermediate/chapter11/practice/Average.java b/src/com/codefortomorrow/intermediate/chapter11/practice/Average.java index fe7e8c3..cd2a09e 100644 --- a/src/com/codefortomorrow/intermediate/chapter11/practice/Average.java +++ b/src/com/codefortomorrow/intermediate/chapter11/practice/Average.java @@ -1,7 +1,6 @@ package com.codefortomorrow.intermediate.chapter11.practice; public class Average { - /** * Difficulty: 1 * @@ -11,6 +10,6 @@ public class Average { * @return average */ public static double average(double a, double b) { - return 0.0; //TODO: Fix! + return 0.0; // TODO: Fix! } } diff --git a/src/com/codefortomorrow/intermediate/chapter11/practice/PrintEvens.java b/src/com/codefortomorrow/intermediate/chapter11/practice/PrintEvens.java index 3b7514c..727d689 100644 --- a/src/com/codefortomorrow/intermediate/chapter11/practice/PrintEvens.java +++ b/src/com/codefortomorrow/intermediate/chapter11/practice/PrintEvens.java @@ -5,9 +5,10 @@ public class PrintEvens { * Difficulty: 1 * * Print the first n even integers + * (consider 0 an even number) * @param n number of even integers to print */ public static void printEvens(int n) { - + // write code here } } diff --git a/src/com/codefortomorrow/intermediate/chapter11/solutions/Average.java b/src/com/codefortomorrow/intermediate/chapter11/solutions/Average.java index 8005c6d..aea6957 100644 --- a/src/com/codefortomorrow/intermediate/chapter11/solutions/Average.java +++ b/src/com/codefortomorrow/intermediate/chapter11/solutions/Average.java @@ -1,7 +1,6 @@ package com.codefortomorrow.intermediate.chapter11.solutions; public class Average { - /** * Difficulty: 1 * @@ -11,8 +10,6 @@ public class Average { * @return average */ public static double average(double a, double b) { - return (a + b)/2; + return (a + b) / 2; } - - } diff --git a/src/com/codefortomorrow/intermediate/chapter11/solutions/PrintEvens.java b/src/com/codefortomorrow/intermediate/chapter11/solutions/PrintEvens.java index 0e34ead..84f988d 100644 --- a/src/com/codefortomorrow/intermediate/chapter11/solutions/PrintEvens.java +++ b/src/com/codefortomorrow/intermediate/chapter11/solutions/PrintEvens.java @@ -5,6 +5,7 @@ public class PrintEvens { * Difficulty: 2 * * Print the first n even integers + * (consider 0 an even number) * @param n number of even integers to print */ public static void printEvens(int n) { @@ -13,7 +14,7 @@ public static void printEvens(int n) { while (evens < n) { if (i % 2 == 0) { System.out.print(i + " "); - n++; + evens++; } i++; }