From 1616e46e661fcbb4489bf4f016340217b61827c2 Mon Sep 17 00:00:00 2001 From: Ruslan Date: Tue, 20 Aug 2019 10:38:30 +0300 Subject: [PATCH 1/6] added new function for solution task 1.3 --- src/main/java/core/basesyntax/CustomMathPow.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/core/basesyntax/CustomMathPow.java b/src/main/java/core/basesyntax/CustomMathPow.java index 924ac6a..da281fe 100644 --- a/src/main/java/core/basesyntax/CustomMathPow.java +++ b/src/main/java/core/basesyntax/CustomMathPow.java @@ -9,6 +9,9 @@ public class CustomMathPow { * exponential - значение степени */ public int pow(int number, int exponential) { - return 0; + for (int i = 1; i < exponential; i++) { + number += number; + } + return number; } } From a4a38951ea7bf6770854be0190620268b9f42562 Mon Sep 17 00:00:00 2001 From: Ruslan Date: Tue, 20 Aug 2019 10:47:47 +0300 Subject: [PATCH 2/6] added new function for solution task 1.3 and edit the function --- src/main/java/core/basesyntax/CustomMathPow.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/core/basesyntax/CustomMathPow.java b/src/main/java/core/basesyntax/CustomMathPow.java index da281fe..304a496 100644 --- a/src/main/java/core/basesyntax/CustomMathPow.java +++ b/src/main/java/core/basesyntax/CustomMathPow.java @@ -9,9 +9,15 @@ public class CustomMathPow { * exponential - значение степени */ public int pow(int number, int exponential) { - for (int i = 1; i < exponential; i++) { - number += number; + if (number == 0 && exponential > 1) { + return 0; + } else if (number == 1 || (number == 0 && exponential == 1)) { + return 1; + } else { + for (int i = 1; i < exponential; i++) { + number += number; + } + return number; } - return number; } } From abe7181e3824ceab05a2fb3c7501908973416820 Mon Sep 17 00:00:00 2001 From: Ruslan Date: Tue, 20 Aug 2019 10:50:58 +0300 Subject: [PATCH 3/6] added new function for solution task 1.3 and edit the function --- src/main/java/core/basesyntax/CustomMathPow.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/core/basesyntax/CustomMathPow.java b/src/main/java/core/basesyntax/CustomMathPow.java index 304a496..0261cb2 100644 --- a/src/main/java/core/basesyntax/CustomMathPow.java +++ b/src/main/java/core/basesyntax/CustomMathPow.java @@ -9,7 +9,7 @@ public class CustomMathPow { * exponential - значение степени */ public int pow(int number, int exponential) { - if (number == 0 && exponential > 1) { + if (number == 0) { return 0; } else if (number == 1 || (number == 0 && exponential == 1)) { return 1; From a7dcc9cbba6d763fbf5aeff93ffc926852a66738 Mon Sep 17 00:00:00 2001 From: Ruslan Date: Tue, 20 Aug 2019 11:03:00 +0300 Subject: [PATCH 4/6] added new function for solution task 1.3 and edit the function --- .../java/core/basesyntax/CustomMathPow.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/core/basesyntax/CustomMathPow.java b/src/main/java/core/basesyntax/CustomMathPow.java index 0261cb2..1366986 100644 --- a/src/main/java/core/basesyntax/CustomMathPow.java +++ b/src/main/java/core/basesyntax/CustomMathPow.java @@ -9,15 +9,16 @@ public class CustomMathPow { * exponential - значение степени */ public int pow(int number, int exponential) { - if (number == 0) { - return 0; - } else if (number == 1 || (number == 0 && exponential == 1)) { - return 1; - } else { - for (int i = 1; i < exponential; i++) { - number += number; + int count = 1; + int result = number; + do { + if (exponential == 0) { + result = 1; + } else if (exponential != 1 && exponential > 0) { + result = result * number; } - return number; - } + count++; + } while (exponential > count); + return result; } } From 4309d6bc92fb760b3cd40c8df7ea380d37d23da1 Mon Sep 17 00:00:00 2001 From: Ruslan Date: Tue, 20 Aug 2019 11:37:21 +0300 Subject: [PATCH 5/6] added new function for solution task 1.3 and edit the function --- src/main/java/core/basesyntax/CustomMathPow.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/core/basesyntax/CustomMathPow.java b/src/main/java/core/basesyntax/CustomMathPow.java index 1366986..fcf7e2f 100644 --- a/src/main/java/core/basesyntax/CustomMathPow.java +++ b/src/main/java/core/basesyntax/CustomMathPow.java @@ -11,14 +11,14 @@ public class CustomMathPow { public int pow(int number, int exponential) { int count = 1; int result = number; - do { + + for (int i = 1; i < exponential; i++) { if (exponential == 0) { result = 1; } else if (exponential != 1 && exponential > 0) { result = result * number; } - count++; - } while (exponential > count); + } return result; } } From 4c621710bc5dbc47b65010189df57f783b0caf56 Mon Sep 17 00:00:00 2001 From: Ruslan Date: Tue, 20 Aug 2019 11:38:40 +0300 Subject: [PATCH 6/6] added new function for solution task 1.3 and edit the function --- src/main/java/core/basesyntax/CustomMathPow.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/core/basesyntax/CustomMathPow.java b/src/main/java/core/basesyntax/CustomMathPow.java index fcf7e2f..774e0cc 100644 --- a/src/main/java/core/basesyntax/CustomMathPow.java +++ b/src/main/java/core/basesyntax/CustomMathPow.java @@ -19,6 +19,7 @@ public int pow(int number, int exponential) { result = result * number; } } + return result; } }