Skip to content

Доработал тесты. #91

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
22 changes: 22 additions & 0 deletions java-basics-template.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.5.2" level="project" />
</component>
</module>
86 changes: 73 additions & 13 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,7 @@
package com.epam.izh.rd.online.service;

import java.util.Arrays;

public class SimpleMathService implements MathService {

/**
Expand All @@ -12,8 +14,19 @@ public class SimpleMathService implements MathService {
* Например для (3, 1) метод должен вернуть 1;
*/
@Override
public int compare(int value1, int value2) {
return -2;
public int compare(int value1, int value2)
{
int isMax=0;
if(value1 < value2){
isMax=-1;
}
if(value1 > value2){
isMax=1;
}
if(value1 == value2){
isMax=0;
}
return isMax;
}

/**
Expand All @@ -22,7 +35,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 +44,9 @@ public int maxFrom(int value1, int value2) {
*/
@Override
public int maxFrom(int[] values) {
return -1;
Arrays.sort(values);
int maxValue= values[values.length-1];
return maxValue;
}

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

/**
* Метод фильтрует массив, оставляя только четные числа.
* Например для списка {-1, -3, 4, 8, 5, 22, 17} метод должен вернуть {4, 8, 22}
*/
@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;
}

/**
* Метод считает факториал из заданного числа.
* Например для числа 5 метод должен вернуть 120.
* Факториал 0 должен быть равен 1.
*/
@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,7 +106,15 @@ public long calcFactorial(int initialVal) {
*/
@Override
public long calcFibonacci(int number) {
return -1L;
long first = 0;
long second = 1;
long result = number;
for (int i = 1; i < number; i++) {
result = first + second;
first = second;
second = result;
}
return result;
}

/**
Expand All @@ -83,7 +123,8 @@ public long calcFibonacci(int number) {
*/
@Override
public int[] sort(int[] values) {
return new int[]{};
Arrays.sort(values);
return values;
}

/**
Expand All @@ -94,7 +135,14 @@ 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;
}

/**
Expand All @@ -104,6 +152,18 @@ public boolean isPrimary(int number) {
*/
@Override
public int[] reverseArray(int[] values) {
return new int[]{};
for (int i = 0; i < values.length / 2; i++) ;
{
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;
}
}
}