Skip to content

Доработал тесты. Изменил методы вывода параметров. #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<source>9</source>
<target>9</target>
</configuration>
</plugin>
</plugins>
Expand Down
52 changes: 42 additions & 10 deletions src/main/java/com/epam/izh/rd/online/service/SimpleMathService.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package com.epam.izh.rd.online.service;

import java.util.Arrays;
import java.util.stream.IntStream;

public class SimpleMathService implements MathService {

/**
Expand All @@ -13,7 +16,9 @@ public class SimpleMathService implements MathService {
*/
@Override
public int compare(int value1, int value2) {
return -2;
if (value1 < value2){ return -1;}
else if (value1 > value2) {return 1;}
else return 0;
}

/**
Expand All @@ -22,7 +27,7 @@ public int compare(int value1, int value2) {
*/
@Override
public int maxFrom(int value1, int value2) {
return -1;
return Math.max(value1, value2);
}

/**
Expand All @@ -31,7 +36,13 @@ public int maxFrom(int value1, int value2) {
*/
@Override
public int maxFrom(int[] values) {
return -1;
int s = 0;
for (int i = 0; i < values.length; i++) {
if (s < values[i]) {
s = values[i];
}
}
return s;
}

/**
Expand All @@ -40,7 +51,10 @@ public int maxFrom(int[] values) {
*/
@Override
public int sum(int[] values) {
return -1;
int sum = 0;
for (int i = 0; i < values.length; i++) {
sum = sum + values[i];
} return sum;
}

/**
Expand All @@ -49,7 +63,17 @@ public int sum(int[] values) {
*/
@Override
public int[] getEvenDigits(int[] values) {
return new int[]{};
int count = 0, index = 0;
for (int elem : values) {
if (elem % 2 == 0) count++;
}
int[] result = new int[count];
for (int elem : values) {
if (elem % 2 == 0) {
result[index++] = elem;
}
}
return result;
}

/**
Expand All @@ -59,7 +83,11 @@ public int[] getEvenDigits(int[] values) {
*/
@Override
public long calcFactorial(int initialVal) {
return -1L;
int result = 1;
for (int i = 1; i <= initialVal; i++) {
result = result * i;
}
return result;
}

/**
Expand All @@ -74,16 +102,19 @@ public long calcFactorial(int initialVal) {
*/
@Override
public long calcFibonacci(int number) {
return -1L;
return number == 0 || number == 1
? number
: calcFibonacci(number - 1) + calcFibonacci(number - 2);
}


/**
* Метод возвращает отсортированный по возрастанию массив.
* Например для массива {-1, -3, 4, 8, 5, 22, -5} метод должен вернуть {-5, -3, -1, 4, 5, 8, 22}
*/
@Override
public int[] sort(int[] values) {
return new int[]{};
return Arrays.stream(values).sorted().toArray();
}

/**
Expand All @@ -94,7 +125,8 @@ public int[] sort(int[] values) {
*/
@Override
public boolean isPrimary(int number) {
return false;
return number % 2 != 0 && IntStream.iterate(3, x -> x * x <= number, x -> x + 2).allMatch(x -> number % x != 0) || number == 2;

}

/**
Expand All @@ -104,6 +136,6 @@ public boolean isPrimary(int number) {
*/
@Override
public int[] reverseArray(int[] values) {
return new int[]{};
return IntStream.range(0, values.length).map(x -> values[values.length - x - 1]).toArray();
}
}