Fix CheckVowels
This commit is contained in:
parent
1fc897ed4d
commit
dd0ecd2e4f
@ -5,15 +5,8 @@ package com.thealgorithms.strings;
|
|||||||
* on the position of the characters in the conventional ordering of an
|
* on the position of the characters in the conventional ordering of an
|
||||||
* alphabet. Wikipedia: https://en.wikipedia.org/wiki/Alphabetical_order
|
* alphabet. Wikipedia: https://en.wikipedia.org/wiki/Alphabetical_order
|
||||||
*/
|
*/
|
||||||
class CheckVowels {
|
public class CheckVowels {
|
||||||
|
private static final Set<Character> VOWELS = new HashSet<>(Arrays.asList('a', 'e', 'i', 'o', 'u'));
|
||||||
public static void main(String[] args) {
|
|
||||||
assert !hasVowels("This is a strings");
|
|
||||||
assert hasVowels("Hello World");
|
|
||||||
assert hasVowels("Java is fun");
|
|
||||||
assert !hasVowels("123hi");
|
|
||||||
assert hasVowels("Coding vs Programming");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if a string is has vowels or not
|
* Check if a string is has vowels or not
|
||||||
@ -22,10 +15,14 @@ class CheckVowels {
|
|||||||
* @return {@code true} if given string has vowels, otherwise {@code false}
|
* @return {@code true} if given string has vowels, otherwise {@code false}
|
||||||
*/
|
*/
|
||||||
public static boolean hasVowels(String input) {
|
public static boolean hasVowels(String input) {
|
||||||
if (input.matches("[AEIOUaeiou]")) {
|
if (input == null) {
|
||||||
countVowels(input);
|
return false;
|
||||||
|
}
|
||||||
|
for (char c : input.toLowerCase().toCharArray()) {
|
||||||
|
if (VOWELS.contains(c)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -34,20 +31,16 @@ class CheckVowels {
|
|||||||
*
|
*
|
||||||
* @param input a string prints the count of vowels
|
* @param input a string prints the count of vowels
|
||||||
*/
|
*/
|
||||||
public static void countVowels(String input) {
|
public static int countVowels(String input) {
|
||||||
input = input.toLowerCase();
|
if (input == null) {
|
||||||
int count = 0;
|
return 0;
|
||||||
int i = 0;
|
|
||||||
while (i < input.length()) {
|
|
||||||
if (input.charAt(i) == 'a'
|
|
||||||
|| input.charAt(i) == 'e'
|
|
||||||
|| input.charAt(i) == 'i'
|
|
||||||
|| input.charAt(i) == 'o'
|
|
||||||
|| input.charAt(i) == 'u') {
|
|
||||||
count++;
|
|
||||||
}
|
}
|
||||||
i++;
|
int cnt = 0;
|
||||||
|
for (char c : input.toLowerCase().toCharArray()) {
|
||||||
|
if (VOWELS.contains(c)) {
|
||||||
|
++cnt;
|
||||||
}
|
}
|
||||||
System.out.println(count);
|
}
|
||||||
|
return cnt;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user