Skip to content

fix: CountWords.secondaryWordCount #4210

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

Merged
merged 7 commits into from
Jun 2, 2023
Merged

fix: CountWords.secondaryWordCount #4210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5929123
fix: accept whitespaces in secondaryWordCount
vil02 Jun 2, 2023
070dc96
refactor: add removeSpecialCharacters
vil02 Jun 2, 2023
f2140e2
style: simplify logic
vil02 Jun 2, 2023
ca4a1f9
style: use isLetterOrDigit
vil02 Jun 2, 2023
b1c3570
style: remove main and update docs
vil02 Jun 2, 2023
60d4807
style: make CountWords a proper utility class
vil02 Jun 2, 2023
9a3d0d0
Merge branch 'master' into fix_count_words
siriak Jun 2, 2023
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
47 changes: 21 additions & 26 deletions src/main/java/com/thealgorithms/others/CountWords.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,34 @@
import java.util.Scanner;

/**
* You enter a string into this program, and it will return how many words were
* in that particular string
*
* @author Marcus
*/
public class CountWords {

public static void main(String[] args) {
Scanner input = new Scanner(System.in);
System.out.println("Enter your text: ");
String str = input.nextLine();

System.out.println("Your text has " + wordCount(str) + " word(s)");
System.out.println(
"Your text has " + secondaryWordCount(str) + " word(s)"
);
input.close();
final public class CountWords {
private CountWords() {
}

private static int wordCount(String s) {
/**
* @brief counts the number of words in the input string
* @param s the input string
* @return the number of words in the input string
*/
public static int wordCount(String s) {
if (s == null || s.isEmpty()) {
return 0;
}
return s.trim().split("[\\s]+").length;
}

private static String removeSpecialCharacters(String s) {
StringBuilder sb = new StringBuilder();
for (char c : s.toCharArray()) {
if (Character.isLetterOrDigit(c) || Character.isWhitespace(c)) {
sb.append(c);
}
}
return sb.toString();
}

/**
* counts the number of words in a sentence but ignores all potential
* non-alphanumeric characters that do not represent a word. runs in O(n)
Expand All @@ -37,17 +39,10 @@ private static int wordCount(String s) {
* @param s String: sentence with word(s)
* @return int: number of words
*/
private static int secondaryWordCount(String s) {
if (s == null || s.isEmpty()) {
public static int secondaryWordCount(String s) {
if (s == null) {
return 0;
}
StringBuilder sb = new StringBuilder();
for (char c : s.toCharArray()) {
if (Character.isLetter(c) || Character.isDigit(c)) {
sb.append(c);
}
}
s = sb.toString();
return s.trim().split("[\\s]+").length;
return wordCount(removeSpecialCharacters(s));
}
}
38 changes: 38 additions & 0 deletions src/test/java/com/thealgorithms/others/CountWordsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package com.thealgorithms.others;

import static org.junit.jupiter.api.Assertions.assertEquals;

import java.util.HashMap;
import org.junit.jupiter.api.Test;


class CountWordsTest {
@Test
public void testWordCount() {
HashMap<String, Integer> testCases = new HashMap<>();
testCases.put("", 0);
testCases.put(null, 0);
testCases.put("aaaa bbb cccc", 3);
testCases.put("note extra spaces here", 4);
testCases.put(" a b c d e ", 5);

for (final var tc : testCases.entrySet()) {
assertEquals(CountWords.wordCount(tc.getKey()), tc.getValue());
}
}

@Test
public void testSecondaryWordCount() {
HashMap<String, Integer> testCases = new HashMap<>();
testCases.put("", 0);
testCases.put(null, 0);
testCases.put("aaaa bbb cccc", 3);
testCases.put("this-is-one-word!", 1);
testCases.put("What, about, this? Hmmm----strange", 4);
testCases.put("word1 word-2 word-3- w?o,r.d.@!@#$&*()<>4", 4);

for (final var tc : testCases.entrySet()) {
assertEquals(CountWords.secondaryWordCount(tc.getKey()), tc.getValue());
}
}
}