From 1a54cba207b495ac7f393f02baf9ac802e694e94 Mon Sep 17 00:00:00 2001 From: ALEXEY Date: Fri, 20 Nov 2020 11:29:10 +0400 Subject: [PATCH 1/8] compare --- .../com/epam/izh/rd/online/service/SimpleMathService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java b/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java index 2921576..5dd1ece 100644 --- a/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java +++ b/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java @@ -13,7 +13,9 @@ public class SimpleMathService implements MathService { */ @Override public int compare(int value1, int value2) { - return -2; + if(value1!=value2){ + return (value1 Date: Fri, 20 Nov 2020 11:42:51 +0400 Subject: [PATCH 2/8] maxFormint --- .../com/epam/izh/rd/online/service/SimpleMathService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java b/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java index 5dd1ece..f47f6bc 100644 --- a/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java +++ b/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java @@ -13,9 +13,9 @@ public class SimpleMathService implements MathService { */ @Override public int compare(int value1, int value2) { - if(value1!=value2){ - return (value1 Date: Fri, 20 Nov 2020 12:51:15 +0400 Subject: [PATCH 3/8] commit --- .../com/epam/izh/rd/online/service/SimpleMathService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java b/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java index f47f6bc..292b390 100644 --- a/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java +++ b/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java @@ -15,7 +15,7 @@ public class SimpleMathService implements MathService { public int compare(int value1, int value2) { if(value1!=value2) { return (value1 < value2 ? -1 : 1); - }return 0; + }return 0; // "else" не обязательно потому что "return"? } /** @@ -24,7 +24,8 @@ public int compare(int value1, int value2) { */ @Override public int maxFrom(int value1, int value2) { - return (value1 < value2 ? value2 : value1); + return (value1 < value2 ? value2 : value1);// если бы числа были равны и нодо было бы вернуть переменную, а не ее значение + //то при return Math.max(value1, value2) вернуло бы value1 ? } /** From fc3b81a1d07339e45036c6b0c4a7140652d2015f Mon Sep 17 00:00:00 2001 From: ALEXEY Date: Fri, 20 Nov 2020 13:07:44 +0400 Subject: [PATCH 4/8] com1 --- .../java/com/epam/izh/rd/online/service/SimpleMathService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java b/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java index 292b390..a552a76 100644 --- a/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java +++ b/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java @@ -25,7 +25,7 @@ public int compare(int value1, int value2) { @Override public int maxFrom(int value1, int value2) { return (value1 < value2 ? value2 : value1);// если бы числа были равны и нодо было бы вернуть переменную, а не ее значение - //то при return Math.max(value1, value2) вернуло бы value1 ? + //то при return Math.max(value2, value1) вернуло бы value2 ? } /** From 35c3aba84cac3de45ef5a64a99e49a893899cbf5 Mon Sep 17 00:00:00 2001 From: ALEXEY Date: Fri, 20 Nov 2020 14:32:41 +0400 Subject: [PATCH 5/8] sumInt --- .../epam/izh/rd/online/service/SimpleMathService.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java b/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java index a552a76..f7a520c 100644 --- a/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java +++ b/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java @@ -34,7 +34,10 @@ public int maxFrom(int value1, int value2) { */ @Override public int maxFrom(int[] values) { - return -1; + int max = 0; //Integer.MIN_VALUE + for (int a : values) + max = Math.max(max, a); + return max ; } /** @@ -43,7 +46,10 @@ public int maxFrom(int[] values) { */ @Override public int sum(int[] values) { - return -1; + int sum = 0; + for (int a : values) + sum += a; + return sum ; } /** From 15afc0b68af430359250fcb9504b7a8ac318fb5b Mon Sep 17 00:00:00 2001 From: ALEXEY Date: Fri, 20 Nov 2020 16:01:05 +0400 Subject: [PATCH 6/8] comm1 --- .../com/epam/izh/rd/online/service/SimpleMathService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java b/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java index f7a520c..d9c412c 100644 --- a/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java +++ b/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java @@ -39,14 +39,14 @@ public int maxFrom(int[] values) { max = Math.max(max, a); return max ; } - +// а можно так : if (a.length >0){ return (Arrays.stream(a).max().getAsInt()) ; }return 0 ; +import java.util.Arrays;? /** * Метод возвращает сумму чисел массива. * Например для списка {-1, -3, 4, 8, 5, 22, -5} метод должен вернуть 30 */ @Override public int sum(int[] values) { - int sum = 0; + int sum = 0; for (int a : values) sum += a; return sum ; From 477d8166a46abc3fa25bc47dd4705eff72fc43c6 Mon Sep 17 00:00:00 2001 From: ALEXEY Date: Mon, 23 Nov 2020 16:15:08 +0400 Subject: [PATCH 7/8] kom2311 --- .../rd/online/service/SimpleMathService.java | 58 ++++++++++++++----- 1 file changed, 44 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java b/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java index d9c412c..e2f021a 100644 --- a/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java +++ b/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java @@ -1,5 +1,8 @@ package com.epam.izh.rd.online.service; +import java.util.Arrays; +import java.util.Collections; + public class SimpleMathService implements MathService { /** @@ -13,9 +16,9 @@ public class SimpleMathService implements MathService { */ @Override public int compare(int value1, int value2) { - if(value1!=value2) { + if(value1!=value2) return (value1 < value2 ? -1 : 1); - }return 0; // "else" не обязательно потому что "return"? + return 0; } /** @@ -24,8 +27,7 @@ public int compare(int value1, int value2) { */ @Override public int maxFrom(int value1, int value2) { - return (value1 < value2 ? value2 : value1);// если бы числа были равны и нодо было бы вернуть переменную, а не ее значение - //то при return Math.max(value2, value1) вернуло бы value2 ? + return (Math.max(value1, value2)); } /** @@ -34,12 +36,9 @@ public int maxFrom(int value1, int value2) { */ @Override public int maxFrom(int[] values) { - int max = 0; //Integer.MIN_VALUE - for (int a : values) - max = Math.max(max, a); - return max ; + + return (Arrays.stream(values).max().getAsInt()); // разве не должна выходить ошибка на нулевом массиве? } -// а можно так : if (a.length >0){ return (Arrays.stream(a).max().getAsInt()) ; }return 0 ; +import java.util.Arrays;? /** * Метод возвращает сумму чисел массива. * Например для списка {-1, -3, 4, 8, 5, 22, -5} метод должен вернуть 30 @@ -58,7 +57,17 @@ public int sum(int[] values) { */ @Override public int[] getEvenDigits(int[] values) { - return new int[]{}; + int[] arr = new int[values.length] ; + int num = 0 ; + for (int b : values) + if (b%2 == 0) { + arr[num] = b; + num++; + } + int[] newArr = new int[num]; + System.arraycopy(arr, 0, newArr, 0, num); + + return newArr ; } /** @@ -68,7 +77,13 @@ public int[] getEvenDigits(int[] values) { */ @Override public long calcFactorial(int initialVal) { - return -1L; + long factorial = 1 ; + if (initialVal > 1) { + for ( int i = 2 ; i <= initialVal ; i++) { + factorial *= i ; + } + } + return factorial; } /** @@ -83,7 +98,10 @@ public long calcFactorial(int initialVal) { */ @Override public long calcFibonacci(int number) { - return -1L; + long fibonacci = 0 ; + + + return fibonacci; } /** @@ -92,7 +110,9 @@ public long calcFibonacci(int number) { */ @Override public int[] sort(int[] values) { - return new int[]{}; + Arrays.sort(values); + return values ; + } /** @@ -113,6 +133,16 @@ public boolean isPrimary(int number) { */ @Override public int[] reverseArray(int[] values) { - return new int[]{}; + int start = 0; + int end = values.length - 1; + while (start < end) { + int temp = values[start]; + values[start] = values[end]; + values[end] = temp; + start++; + end--; + } + + return values ; } } From c4566763031ceab97e982549dd3b63094888ba7a Mon Sep 17 00:00:00 2001 From: ALEXEY Date: Wed, 25 Nov 2020 12:34:06 +0400 Subject: [PATCH 8/8] end --- java-basics-template.iml | 22 +++++++++++++++ .../rd/online/service/SimpleMathService.java | 27 ++++++++++--------- 2 files changed, 37 insertions(+), 12 deletions(-) create mode 100644 java-basics-template.iml diff --git a/java-basics-template.iml b/java-basics-template.iml new file mode 100644 index 0000000..038395d --- /dev/null +++ b/java-basics-template.iml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java b/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java index e2f021a..3e23aae 100644 --- a/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java +++ b/src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java @@ -1,7 +1,7 @@ package com.epam.izh.rd.online.service; import java.util.Arrays; -import java.util.Collections; + public class SimpleMathService implements MathService { @@ -16,9 +16,7 @@ public class SimpleMathService implements MathService { */ @Override public int compare(int value1, int value2) { - if(value1!=value2) - return (value1 < value2 ? -1 : 1); - return 0; + return Integer.compare(value1, value2); } /** @@ -27,7 +25,7 @@ public int compare(int value1, int value2) { */ @Override public int maxFrom(int value1, int value2) { - return (Math.max(value1, value2)); + return Math.max(value1, value2); } /** @@ -37,7 +35,7 @@ public int maxFrom(int value1, int value2) { @Override public int maxFrom(int[] values) { - return (Arrays.stream(values).max().getAsInt()); // разве не должна выходить ошибка на нулевом массиве? + return Arrays.stream(values).max().getAsInt(); // разве не должна выходить ошибка на нулевом массиве? } /** * Метод возвращает сумму чисел массива. @@ -66,7 +64,6 @@ public int[] getEvenDigits(int[] values) { } int[] newArr = new int[num]; System.arraycopy(arr, 0, newArr, 0, num); - return newArr ; } @@ -98,10 +95,13 @@ public long calcFactorial(int initialVal) { */ @Override public long calcFibonacci(int number) { - long fibonacci = 0 ; - - - return fibonacci; + long [] arr = new long[number + 2] ; + arr[0] = 0 ; + arr[1] = 1 ; + for (int i = 2; i <= number ; i++) { + arr[i] = arr[i-2] + arr[i-1] ; + } + return arr[number] ; } /** @@ -123,7 +123,10 @@ public int[] sort(int[] values) { */ @Override public boolean isPrimary(int number) { - return false; + for (int i = 2; i < number ; i++) { + if (number%i == 0) return false ; + } + return true; } /**