14562991048

Committed 20 Apr 2025 08:19PM UTC coverage: 55.116% (+1.7%) from 53.367%

Build # 14562991048

Build Type

push

github

Committed by

ljacqu

Commit Message

Merge remote-tracking branch 'origin/master' into dependencies

Run Details

269 of 568 branches covered (47.36%)

212 of 313 new or added lines in 36 files covered. (67.73%)

6 existing lines in 5 files now uncovered.

738 of 1339 relevant lines covered (55.12%)

3.27 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

46.67

/src/main/java/ch/jalu/wordeval/evaluators/impl/ConsecutiveVowelCount.java

package ch.jalu.wordeval.evaluators.impl;

import ch.jalu.wordeval.dictionary.Word;
import ch.jalu.wordeval.evaluators.WordEvaluator;
import ch.jalu.wordeval.evaluators.export.EvaluatorExportUtil;
import ch.jalu.wordeval.evaluators.result.WordWithScore;
import ch.jalu.wordeval.language.Language;
import ch.jalu.wordeval.language.LetterType;
import com.google.common.collect.ListMultimap;
import lombok.Getter;
import lombok.ToString;

import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

/**
 * Searches words for clusters of vowels or consonants, e.g. "ngstschw" in
 * German "Angstschweiss". The same word can appear multiple times in the
 * results, e.g. "poignée" will count twice ("oi", "ée").
 */
@ToString(of = "letterType")
public class ConsecutiveVowelCount implements WordEvaluator {

  private final Set<String> lettersToConsider;
  @Getter
  private final LetterType letterType;
  @Getter
  private final List<WordWithScore> results = new ArrayList<>();

  /**
   * Creates a new VowelCount evaluator instance.
   *
   * @param letterType the letter type to consider
   * @param language the language of the words to evaluate
   */
  public ConsecutiveVowelCount(LetterType letterType, Language language) {
    this.lettersToConsider = new HashSet<>(letterType.getLetters(language));
    this.letterType = letterType;
  }

  @Override
  public void evaluate(Word wordObject) {
    String word = wordObject.getWithoutAccents();
    int count = 0;
    for (int i = 0; i <= word.length(); ++i) {
      if (i == word.length() || !lettersToConsider.contains(word.substring(i, i + 1))) {
        if (count > 1) {
          results.add(new WordWithScore(wordObject, count));
        }
        count = 0;
      } else {
        ++count;
      }
    }
  }

  @Override
  public ListMultimap<Object, Object> getTopResults(int topScores, int maxLimit) {
    List<WordWithScore> sortedResult = results.stream()
        .sorted(Comparator.comparing(WordWithScore::score).reversed())
        .toList();

    Set<Double> uniqueValues = new HashSet<>();
    ListMultimap<Object, Object> filteredResults = EvaluatorExportUtil.newListMultimap();
    for (WordWithScore wordWithScore : sortedResult) {
      if (uniqueValues.add(wordWithScore.score()) && uniqueValues.size() > topScores) {
        break;
      }
      filteredResults.put((int) wordWithScore.score(), wordWithScore.word().getRaw());
      if (filteredResults.size() >= maxLimit) {
        break;
      }
    }

    return filteredResults;
  }

  @Override
  public String getId() {
    return switch (letterType) {
      case VOWELS -> "vowels.consecutiveCount";
      case CONSONANTS -> "consonants.consecutiveCount";
    };
  }
}

1	package ch.jalu.wordeval.evaluators.impl;
2
3	import ch.jalu.wordeval.dictionary.Word;
4	import ch.jalu.wordeval.evaluators.WordEvaluator;
5	import ch.jalu.wordeval.evaluators.export.EvaluatorExportUtil;
6	import ch.jalu.wordeval.evaluators.result.WordWithScore;
7	import ch.jalu.wordeval.language.Language;
8	import ch.jalu.wordeval.language.LetterType;
9	import com.google.common.collect.ListMultimap;
10	import lombok.Getter;
11	import lombok.ToString;
12
13	import java.util.ArrayList;
14	import java.util.Comparator;
15	import java.util.HashSet;
16	import java.util.List;
17	import java.util.Set;
18
19	/**
20	* Searches words for clusters of vowels or consonants, e.g. "ngstschw" in
21	* German "Angstschweiss". The same word can appear multiple times in the
22	* results, e.g. "poignée" will count twice ("oi", "ée").
23	*/
24	@ToString(of = "letterType")
25	public class ConsecutiveVowelCount implements WordEvaluator {
26
27	private final Set<String> lettersToConsider;
28	@Getter
29	private final LetterType letterType;
30	@Getter	5✔
31	private final List<WordWithScore> results = new ArrayList<>();
32
33	/**
34	* Creates a new VowelCount evaluator instance.
35	*
36	* @param letterType the letter type to consider
37	* @param language the language of the words to evaluate
38	*/
39	public ConsecutiveVowelCount(LetterType letterType, Language language) {	2✔
40	this.lettersToConsider = new HashSet<>(letterType.getLetters(language));	8✔
41	this.letterType = letterType;	3✔
42	}	1✔
43
44	@Override
45	public void evaluate(Word wordObject) {
46	String word = wordObject.getWithoutAccents();	3✔
47	int count = 0;	2✔
48	for (int i = 0; i <= word.length(); ++i) {	8✔
49	if (i == word.length() \|\| !lettersToConsider.contains(word.substring(i, i + 1))) {	14✔
50	if (count > 1) {	3✔
51	results.add(new WordWithScore(wordObject, count));	10✔
52	}
53	count = 0;	3✔
54	} else {
55	++count;	1✔
56	}
57	}
58	}	1✔
59
60	@Override
61	public ListMultimap<Object, Object> getTopResults(int topScores, int maxLimit) {
62	List<WordWithScore> sortedResult = results.stream()	×
NEW 63	.sorted(Comparator.comparing(WordWithScore::score).reversed())	×
64	.toList();	×
65
66	Set<Double> uniqueValues = new HashSet<>();	×
67	ListMultimap<Object, Object> filteredResults = EvaluatorExportUtil.newListMultimap();	×
68	for (WordWithScore wordWithScore : sortedResult) {	×
NEW 69	if (uniqueValues.add(wordWithScore.score()) && uniqueValues.size() > topScores) {	×
70	break;	×
71	}
NEW 72	filteredResults.put((int) wordWithScore.score(), wordWithScore.word().getRaw());	×
73	if (filteredResults.size() >= maxLimit) {	×
74	break;	×
75	}
76	}	×
77
78	return filteredResults;	×
79	}
80
81	@Override
82	public String getId() {
83	return switch (letterType) {	×
84	case VOWELS -> "vowels.consecutiveCount";	×
85	case CONSONANTS -> "consonants.consecutiveCount";	×
86	};
87	}
88	}

ljacqu / wordeval / 14562991048

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous