Skip to content

finished work #35

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.

Sign up for GitHub

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
svetlovnaa wants to merge 1 commit into
base: master
Choose a base branch
from
Open

finished work #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<properties>
<java.version>1.8</java.version>
<junit.jupiter.version>5.5.2</junit.jupiter.version>
<junit.jupiter.version>5.8.1</junit.jupiter.version>
</properties>

<dependencies>
Expand Down
59 changes: 52 additions & 7 deletions src/main/java/com/epam/izh/rd/online/service/SimpleTextStatisticsAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,14 @@ public class SimpleTextStatisticsAnalyzer implements TextStatisticsAnalyzer {
*/
@Override
public int countSumLengthOfWords(String text) {
return 0;

List<String> listOfWords = getWords(text);
int count = 0;
for (int i = 0; i < listOfWords.size(); i++) {

count += listOfWords.get(i).length();
}
return count;
}

/**
Expand All @@ -34,7 +41,8 @@ public int countSumLengthOfWords(String text) {
*/
@Override
public int countNumberOfWords(String text) {
return 0;

return getWords(text).size();
}

/**
Expand All @@ -44,7 +52,8 @@ public int countNumberOfWords(String text) {
*/
@Override
public int countNumberOfUniqueWords(String text) {
return 0;

return getUniqueWords(text).size();
}

/**
Expand All @@ -57,7 +66,13 @@ public int countNumberOfUniqueWords(String text) {
*/
@Override
public List<String> getWords(String text) {
return emptyList();

List<String> completedList = new ArrayList<>();
String[] wordsOfString = text.split("[\\s\",.?!-]+");
for (int i = 0; i < wordsOfString.length; i++) {
completedList.add(wordsOfString[i]);
}
return completedList;
}

/**
Expand All @@ -70,7 +85,15 @@ public List<String> getWords(String text) {
*/
@Override
public Set<String> getUniqueWords(String text) {
return emptySet();

List<String> listOfWords = getWords(text);
Set<String> listOfUniqueWords = new HashSet<>();
for (String a: listOfWords) {
if (!listOfUniqueWords.add(a)) {
listOfUniqueWords.add(a);
}
}
return listOfUniqueWords;
}

/**
Expand All @@ -82,7 +105,16 @@ public Set<String> getUniqueWords(String text) {
*/
@Override
public Map<String, Integer> countNumberOfWordsRepetitions(String text) {
return emptyMap();

Map<String, Integer> countMap = new HashMap<>();
for (String word : getWords(text)) {
if (countMap.containsKey(word)) {
countMap.put(word, countMap.get(word) + 1);
} else {
countMap.put(word, 1);
}
}
return countMap;
}

/**
Expand All @@ -95,6 +127,19 @@ public Map<String, Integer> countNumberOfWordsRepetitions(String text) {
*/
@Override
public List<String> sortWordsByLength(String text, Direction direction) {
return emptyList();

List<String> sortedList = getWords(text);

switch(direction) {
case ASC:
Collections.sort(sortedList, Comparator.comparing(String::length));
break;
case DESC:
Collections.sort(sortedList, Comparator.comparing(String::length));
Collections.reverse(sortedList);
break;
}
return sortedList;
}

}
49 changes: 39 additions & 10 deletions src/main/java/com/epam/izh/rd/online/service/StreamApiTextStatisticsAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import com.epam.izh.rd.online.helper.Direction;

import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import static java.util.Collections.*;

Expand All @@ -16,36 +16,65 @@
public class StreamApiTextStatisticsAnalyzer implements TextStatisticsAnalyzer {
@Override
public int countSumLengthOfWords(String text) {
return 0;

String[] wordsOfString = text.split("[\\s\",.?!-]+");
int countSum = Arrays.stream(wordsOfString).mapToInt(String::length).sum();
return countSum;
}

@Override
public int countNumberOfWords(String text) {
return 0;

return getWords(text).size();
}

@Override
public int countNumberOfUniqueWords(String text) {
return 0;

return getUniqueWords(text).size();
}

@Override
public List<String> getWords(String text) {
return emptyList();

String[] wordsOfString = text.split("[\\s\",.?!-]+");
List<String> completedList = Stream.of(wordsOfString).collect(Collectors.toList());
return completedList;
}

@Override
public Set<String> getUniqueWords(String text) {
return emptySet();

String[] wordsOfString = text.split("[\\s\",.?!-]+");
Set<String> listOfUniqueWords = Stream.of(wordsOfString).collect(Collectors.toSet());
return listOfUniqueWords;
}

@Override
public Map<String, Integer> countNumberOfWordsRepetitions(String text) {
return emptyMap();

String[] wordsOfString = text.split("[\\s\",.?!-]+");
Map<String, Integer> countMap = new HashMap<>();
Arrays.stream(wordsOfString).forEach(e->countMap.put(e, countMap.getOrDefault(e, 0) + 1));
return countMap;
}

@Override
public List<String> sortWordsByLength(String text, Direction direction) {

String[] wordsOfString = text.split("[\\s\",.?!-]+");
List<String> sortedListASC = Stream.of(wordsOfString).collect(Collectors.toList());
List<String> sortedListDESC = Stream.of(wordsOfString).collect(Collectors.toList());

switch(direction) {
case ASC:
sortedListASC.sort(Comparator.comparing(String::length));
return sortedListASC;
case DESC:
sortedListDESC.sort(Comparator.comparing(String::length));
Collections.reverse(sortedListDESC);
return sortedListDESC;
}
return emptyList();
}
}