From 98b24d8e5e45be20cfc4295083c326d8842b959a Mon Sep 17 00:00:00 2001 From: Olga Berezhna Date: Sun, 27 Nov 2016 15:50:26 +0200 Subject: [PATCH 01/23] t1 done --- .../lemon/changerequest/java/introduction/hw1/Task1.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task1.java b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task1.java index 3bed9e0..2c16cee 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task1.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task1.java @@ -3,6 +3,7 @@ public class Task1 { public static double calculateP(double a) { - return 0; + + return 4 * a; } } From e503c11fe1fa4ef011590abc450a54d1b7f8de48 Mon Sep 17 00:00:00 2001 From: Olga Berezhna Date: Sun, 27 Nov 2016 15:55:12 +0200 Subject: [PATCH 02/23] t2 done --- .../lemon/changerequest/java/introduction/hw1/Task2.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task2.java b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task2.java index a4578a5..db2e97d 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task2.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task2.java @@ -3,6 +3,7 @@ public class Task2 { public static int getMeters(int centimeters) { - return 0; + + return centimeters / 100; } } From acc3464c515ae71eae4356ad3214a33dda3b8754 Mon Sep 17 00:00:00 2001 From: Olga Berezhna Date: Sun, 27 Nov 2016 15:56:49 +0200 Subject: [PATCH 03/23] t2 done --- .../school/lemon/changerequest/java/introduction/hw1/Task2.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task2.java b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task2.java index db2e97d..06c4c69 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task2.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task2.java @@ -6,4 +6,4 @@ public static int getMeters(int centimeters) { return centimeters / 100; } -} +} \ No newline at end of file From 8799a43a0c9f59b66bff9ff2325a17a0cbacdf48 Mon Sep 17 00:00:00 2001 From: Olga Berezhna Date: Sun, 27 Nov 2016 15:58:11 +0200 Subject: [PATCH 04/23] t3 done --- .../lemon/changerequest/java/introduction/hw1/Task3.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task3.java b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task3.java index 49f98de..049d6c7 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task3.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task3.java @@ -2,6 +2,11 @@ public class Task3 { public static boolean isBetween(int a, int b, int c) { - return false; + + if ((a <= b && b <= c) || (a >= b && b >= c)) { + return true; + } else { + return false; + } } } From 7f837c1d5828aae551dbada3856c55a88a46dd2f Mon Sep 17 00:00:00 2001 From: Olga Berezhna Date: Sun, 27 Nov 2016 15:59:32 +0200 Subject: [PATCH 05/23] t3 done --- .../school/lemon/changerequest/java/introduction/hw1/Task3.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task3.java b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task3.java index 049d6c7..dd5e1d1 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task3.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task3.java @@ -10,3 +10,4 @@ public static boolean isBetween(int a, int b, int c) { } } } + From 37593efc978c548d09eca093712a7c821ea576a9 Mon Sep 17 00:00:00 2001 From: Olga Berezhna Date: Sun, 27 Nov 2016 16:52:45 +0200 Subject: [PATCH 06/23] t4 done --- .../changerequest/java/introduction/hw1/Task4.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task4.java b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task4.java index 1b2c077..1c51cb4 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task4.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task4.java @@ -4,6 +4,16 @@ public class Task4 { public static double getSumOfGreatest(double a, double b, double c) { - return 0; - } + if (a < b && b < c) { + return c + b; + } + if (a > b && b > c) { + return b + a; + } + else { + return a + c; + } + + + } } From b75ec08c1bab59fb9951b24145a3e0d41653d913 Mon Sep 17 00:00:00 2001 From: Olga Berezhna Date: Sun, 27 Nov 2016 17:11:25 +0200 Subject: [PATCH 07/23] t5 done --- .../lemon/changerequest/java/introduction/hw1/Task5.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task5.java b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task5.java index 25bfde5..88331c8 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task5.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task5.java @@ -3,10 +3,10 @@ public class Task5 { public static double calculateA(double x, double y, double z) { - return 0; + return ((2 * Math.sin(x - Math.PI / 6) * calculateB(z)) / (1 / 2.0 + (Math.pow(Math.sin(y), 2)))); } private static double calculateB(double z) { - return 0; + return 1 + (Math.pow(z, 2)) / (3 + ((Math.pow(z, 2)) / 5)); } } From 8700a086fc10d34a92fd236199dc6c3184d89d93 Mon Sep 17 00:00:00 2001 From: Olga Berezhna Date: Sun, 27 Nov 2016 17:59:48 +0200 Subject: [PATCH 08/23] t6 done --- .../lemon/changerequest/java/introduction/hw1/Task6.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task6.java b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task6.java index 5db16c9..bc1ea5e 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task6.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task6.java @@ -2,10 +2,13 @@ public class Task6 { public static double calculateS(double x) { - return 0d; - } + return (1 + (x * (((Math.pow(x, 2) *x) *x) / (2 * (3*2) * (4*3*2))))); + + } + public static double calculateZ(double x, double y) { - return 0d; + + return Math.sin(Math.pow(x, 3)) + Math.pow(Math.cos(y), 2); } } From 019f61871246316fdf3724eacc66dfcf1cbdf9e8 Mon Sep 17 00:00:00 2001 From: Olga Berezhna Date: Sun, 27 Nov 2016 18:12:17 +0200 Subject: [PATCH 09/23] t7 done --- .../java/introduction/hw1/Task7.java | 38 ++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task7.java b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task7.java index 7d39c57..d7e5878 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task7.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task7.java @@ -3,6 +3,42 @@ public class Task7 { public static String getDayTitle(int dayIndex) { - return ""; + String dayNumber; + switch (dayIndex) + { + case 1: + dayNumber = "Monday"; + break; + + case 2: + dayNumber = "Tuesday"; + break; + + case 3: + dayNumber = "Wednesday"; + break; + + case 4: + dayNumber = "Thursday"; + break; + + case 5: + dayNumber = "Friday"; + break; + + case 6: + dayNumber = "Saturday"; + break; + + case 7: + dayNumber = "Sunday"; + break; + + default: + dayNumber = "Error"; + break; + } + return dayNumber; + } } From 81b9696e99a3030d00c7a5a4193615821fe234d6 Mon Sep 17 00:00:00 2001 From: Olga Berezhna Date: Sun, 27 Nov 2016 19:08:31 +0200 Subject: [PATCH 10/23] t8 done --- .../lemon/changerequest/java/introduction/hw1/Task3.java | 7 ++----- .../lemon/changerequest/java/introduction/hw1/Task8.java | 6 +++++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task3.java b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task3.java index dd5e1d1..10b885e 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task3.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task3.java @@ -3,11 +3,8 @@ public class Task3 { public static boolean isBetween(int a, int b, int c) { - if ((a <= b && b <= c) || (a >= b && b >= c)) { - return true; - } else { - return false; - } + if ((a <= b && b <= c) || (a >= b && b >= c)) return true; + else return false; } } diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task8.java b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task8.java index 927306f..378c4c1 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task8.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task8.java @@ -2,6 +2,10 @@ public class Task8 { public static int calculateSum(int N) { - return 0; + int result = 0; + int i; + for (i = N; 2 * N >= i; i++) + result = (int) (i + Math.pow((2 * N), 2)); + return result; } } From ee4caf7b3cdc8f0cdd5830b8933c3e10184b4017 Mon Sep 17 00:00:00 2001 From: Olga Berezhna Date: Sun, 27 Nov 2016 20:33:41 +0200 Subject: [PATCH 11/23] t9done --- .../changerequest/java/introduction/hw1/Task9.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task9.java b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task9.java index f17d372..5d16fca 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task9.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task9.java @@ -3,6 +3,15 @@ public class Task9 { public static boolean isPowerOfThree(int n) { - return false; - } + + if (n < 1){ + return false; + } + + while (n % 3 == 0) { + boolean b = (n / 3) == 3; + } + return true; + } } + From 3aed8cb801b92fb76ae570e936861fdb23105909 Mon Sep 17 00:00:00 2001 From: Olga Berezhna Date: Sun, 27 Nov 2016 20:43:42 +0200 Subject: [PATCH 12/23] t10done --- .../lemon/changerequest/java/introduction/hw1/Task10.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task10.java b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task10.java index 1f87d43..a5ea9df 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task10.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task10.java @@ -4,6 +4,13 @@ public class Task10 { public static boolean containDigitTwo(int n) { + + while (n > 0) { + if (n % 10 == 2) + if (n / 10 == 10) { + return true; + } + } return false; } } From 2baea2ac284b25051877648b0a0191be1e805e47 Mon Sep 17 00:00:00 2001 From: Olga Berezhna Date: Sun, 27 Nov 2016 22:01:01 +0200 Subject: [PATCH 13/23] t7_corrected --- .../java/introduction/hw1/Task7.java | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task7.java b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task7.java index d7e5878..b82aa00 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task7.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task7.java @@ -3,42 +3,34 @@ public class Task7 { public static String getDayTitle(int dayIndex) { - String dayNumber; + switch (dayIndex) { case 1: - dayNumber = "Monday"; - break; + return "Monday"; case 2: - dayNumber = "Tuesday"; - break; + return "Tuesday"; case 3: - dayNumber = "Wednesday"; - break; + return "Wednesday"; case 4: - dayNumber = "Thursday"; - break; + return "Thursday"; case 5: - dayNumber = "Friday"; - break; + return "Friday"; case 6: - dayNumber = "Saturday"; - break; + return "Saturday"; case 7: - dayNumber = "Sunday"; - break; + return "Sunday"; default: - dayNumber = "Error"; - break; + return "Error"; } - return dayNumber; + } } From 2171f98be77d9a667e78816abd1f5208fbf601f6 Mon Sep 17 00:00:00 2001 From: Olga Berezhna Date: Sun, 27 Nov 2016 22:05:03 +0200 Subject: [PATCH 14/23] t4_corrected --- .../lemon/changerequest/java/introduction/hw1/Task4.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task4.java b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task4.java index 1c51cb4..a9ce944 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task4.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task4.java @@ -13,7 +13,5 @@ public static double getSumOfGreatest(double a, double b, double c) { else { return a + c; } - - } -} +} \ No newline at end of file From 4abd5c1124241887b2d695eeff628694e4f66692 Mon Sep 17 00:00:00 2001 From: Olga Berezhna Date: Mon, 28 Nov 2016 12:13:55 +0200 Subject: [PATCH 15/23] t3_corrected --- .../lemon/changerequest/java/introduction/hw1/Task3.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task3.java b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task3.java index 10b885e..bb97a35 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task3.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task3.java @@ -3,8 +3,8 @@ public class Task3 { public static boolean isBetween(int a, int b, int c) { - if ((a <= b && b <= c) || (a >= b && b >= c)) return true; - else return false; + return ((a <= b && b <= c) || (a >= b && b >= c)); + } } From cb12feba2b3d7b6cf472173a06c635d400ea8d55 Mon Sep 17 00:00:00 2001 From: Olga Berezhna Date: Mon, 28 Nov 2016 12:47:43 +0200 Subject: [PATCH 16/23] t10_corrected --- .../lemon/changerequest/java/introduction/hw1/Task10.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task10.java b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task10.java index a5ea9df..d272add 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task10.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task10.java @@ -6,11 +6,13 @@ public class Task10 { public static boolean containDigitTwo(int n) { while (n > 0) { - if (n % 10 == 2) - if (n / 10 == 10) { + if (n % 10 == 2) { return true; } + n = n / 10; + } + return false; } } From 479aac08a9fc77b59d56531f4dcb8a7c13d1186b Mon Sep 17 00:00:00 2001 From: Olga Berezhna Date: Mon, 28 Nov 2016 12:49:17 +0200 Subject: [PATCH 17/23] t9_corrected --- .../school/lemon/changerequest/java/introduction/hw1/Task9.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task9.java b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task9.java index 5d16fca..2d67fb2 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task9.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task9.java @@ -9,7 +9,7 @@ public static boolean isPowerOfThree(int n) { } while (n % 3 == 0) { - boolean b = (n / 3) == 3; + n = n / 3; } return true; } From d142eb7a182f23f3b09d3683d47bac5896f59330 Mon Sep 17 00:00:00 2001 From: Olga Berezhna Date: Mon, 28 Nov 2016 13:20:50 +0200 Subject: [PATCH 18/23] t6_corrected --- .../lemon/changerequest/java/introduction/hw1/Task6.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task6.java b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task6.java index bc1ea5e..737fef5 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task6.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task6.java @@ -2,10 +2,16 @@ public class Task6 { public static double calculateS(double x) { - return (1 + (x * (((Math.pow(x, 2) *x) *x) / (2 * (3*2) * (4*3*2))))); + return (1 + (x * (((Math.pow(x, 2) *x) *x) / (factorial(2)*factorial(3)*factorial(4))))); } + private static int factorial(int n) { + for (int i = 1; i <= n; i++) { + n = n * i; + } + return n; + } public static double calculateZ(double x, double y) { From 262edc97e5f19992f5d8621fbe4fdecde83a9267 Mon Sep 17 00:00:00 2001 From: Olga Berezhna Date: Mon, 28 Nov 2016 14:07:19 +0200 Subject: [PATCH 19/23] T6_corrected2 --- .../school/lemon/changerequest/java/introduction/hw1/Task6.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task6.java b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task6.java index 737fef5..7ffafd2 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task6.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task6.java @@ -2,7 +2,7 @@ public class Task6 { public static double calculateS(double x) { - return (1 + (x * (((Math.pow(x, 2) *x) *x) / (factorial(2)*factorial(3)*factorial(4))))); + return (1 + x + (Math.pow(x, 2)/factorial(2)) + (Math.pow(x, 3)/factorial(3)) + (Math.pow(x, 4)/factorial(4))); } From 716187b11277aeafe892158637f3e0b54c39f593 Mon Sep 17 00:00:00 2001 From: Olga Berezhna Date: Mon, 28 Nov 2016 15:21:52 +0200 Subject: [PATCH 20/23] T6_corrected --- .../lemon/changerequest/java/introduction/hw1/Task6.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task6.java b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task6.java index 7ffafd2..560a6ed 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task6.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task6.java @@ -7,10 +7,11 @@ public static double calculateS(double x) { } private static int factorial(int n) { - for (int i = 1; i <= n; i++) { - n = n * i; + int result = 1; + for (int i = n; i > 0; i--) { + result = result * i; } - return n; + return result; } public static double calculateZ(double x, double y) { From 6235854854b8bdf067a5c0f8f880ce6a7a329a18 Mon Sep 17 00:00:00 2001 From: Olga Berezhna Date: Thu, 1 Dec 2016 18:31:13 +0200 Subject: [PATCH 21/23] T6_fixed err --- .../school/lemon/changerequest/java/introduction/hw1/Task7.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task7.java b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task7.java index b82aa00..e59e90f 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task7.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task7.java @@ -28,7 +28,7 @@ public static String getDayTitle(int dayIndex) { return "Sunday"; default: - return "Error"; + return "error"; } From b2e70d11bc87a76b477361a3d42d464bfae749d9 Mon Sep 17 00:00:00 2001 From: Olga Berezhna Date: Thu, 1 Dec 2016 18:55:33 +0200 Subject: [PATCH 22/23] T9_fixed --- .../lemon/changerequest/java/introduction/hw1/Task8.java | 6 +++--- .../lemon/changerequest/java/introduction/hw1/Task9.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task8.java b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task8.java index 378c4c1..75ee594 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task8.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task8.java @@ -3,9 +3,9 @@ public class Task8 { public static int calculateSum(int N) { int result = 0; - int i; - for (i = N; 2 * N >= i; i++) - result = (int) (i + Math.pow((2 * N), 2)); + + for (int i = N; 2 * N >= i; i++) + result+= i*i; return result; } } diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task9.java b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task9.java index 2d67fb2..2ed062d 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task9.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task9.java @@ -4,14 +4,14 @@ public class Task9 { public static boolean isPowerOfThree(int n) { - if (n < 1){ + if (n <= 1){ return false; } - while (n % 3 == 0) { + while (n>1 && (n % 3) == 0) { n = n / 3; } - return true; + return n == 1; } } From 178929e7ef514f0c773e74bfa35d52de2090c84c Mon Sep 17 00:00:00 2001 From: Olga Berezhna Date: Thu, 1 Dec 2016 18:56:50 +0200 Subject: [PATCH 23/23] T7_fixed err --- .../school/lemon/changerequest/java/introduction/hw1/Task7.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task7.java b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task7.java index e59e90f..4b68119 100644 --- a/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task7.java +++ b/src/main/java/school/lemon/changerequest/java/introduction/hw1/Task7.java @@ -31,6 +31,5 @@ public static String getDayTitle(int dayIndex) { return "error"; } - } }