Skip to content
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

[W5][T11-2]WU PEI HSUAN #45

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[W5][T11-2]WU PEI HSUAN #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34feaf7
Enhancement: find - case insensitive
WuPeiHsuan Feb 11, 2019
a1c0c7e
Update test files for enhancement
WuPeiHsuan Feb 11, 2019
b5e2142
Update User Guide
WuPeiHsuan Feb 11, 2019
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 docs/UserGuide.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Format: `find KEYWORD [MORE_KEYWORDS]`

[NOTE]
====
The search is case sensitive, the order of the keywords does not matter, only the name is searched,
The search is case insensitive, the order of the keywords does not matter, only the name is searched,
and persons matching at least one keyword will be returned (i.e. `OR` search).
====

Expand Down
16 changes: 11 additions & 5 deletions src/seedu/addressbook/commands/FindCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
package seedu.addressbook.commands;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.lang.*;

import seedu.addressbook.data.person.ReadOnlyPerson;

/**
* Finds and lists all persons in address book whose name contains any of the argument keywords.
* Keyword matching is case sensitive.
* Keyword matching is case insensitive.
*/
public class FindCommand extends Command {

public static final String COMMAND_WORD = "find";

public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds all persons whose names contain any of "
+ "the specified keywords (case-sensitive) and displays them as a list with index numbers.\n"
+ "the specified keywords (case-insensitive) and displays them as a list with index numbers.\n"
+ "Parameters: KEYWORD [MORE_KEYWORDS]...\n"
+ "Example: " + COMMAND_WORD + " alice bob charlie";

Expand All @@ -42,6 +42,7 @@ public CommandResult execute() {

/**
* Retrieves all persons in the address book whose names contain some of the specified keywords.
* Will check for equality with case ignored
*
* @param keywords for searching
* @return list of persons found
Expand All @@ -50,10 +51,15 @@ private List<ReadOnlyPerson> getPersonsWithNameContainingAnyKeyword(Set<String>
final List<ReadOnlyPerson> matchedPersons = new ArrayList<>();
for (ReadOnlyPerson person : addressBook.getAllPersons()) {
final Set<String> wordsInName = new HashSet<>(person.getName().getWordsInName());
if (!Collections.disjoint(wordsInName, keywords)) {
matchedPersons.add(person);
for (String words : wordsInName) {
for (String key : keywords ){
if (words.equalsIgnoreCase(key)){
matchedPersons.add(person);
}
}
}
}

return matchedPersons;
}

Expand Down
7 changes: 4 additions & 3 deletions test/expected.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
|| Example: delete 1
|| Clears address book permanently.
|| Example: clear
|| find: Finds all persons whose names contain any of the specified keywords (case-sensitive) and displays them as a list with index numbers.
|| find: Finds all persons whose names contain any of the specified keywords (case-insensitive) and displays them as a list with index numbers.
|| Parameters: KEYWORD [MORE_KEYWORDS]...
|| Example: find alice bob charlie
|| list: Displays all persons in the address book as a list with index numbers.
Expand Down Expand Up @@ -200,7 +200,7 @@
|| ===================================================
|| Enter command: || [Command entered: find]
|| Invalid command format!
|| find: Finds all persons whose names contain any of the specified keywords (case-sensitive) and displays them as a list with index numbers.
|| find: Finds all persons whose names contain any of the specified keywords (case-insensitive) and displays them as a list with index numbers.
|| Parameters: KEYWORD [MORE_KEYWORDS]...
|| Example: find alice bob charlie
|| ===================================================
Expand All @@ -213,8 +213,9 @@
|| 0 persons listed!
|| ===================================================
|| Enter command: || [Command entered: find betsy]
|| 1. Betsy Choo Tags: [secretive]
||
|| 0 persons listed!
|| 1 persons listed!
|| ===================================================
|| Enter command: || [Command entered: find Betsy]
|| 1. Betsy Choo Tags: [secretive]
Expand Down