From 3cc12738542bd7267606185ded60293d0acd7af6 Mon Sep 17 00:00:00 2001 From: WillemDalton Date: Sun, 5 Oct 2025 19:02:08 -0400 Subject: more work on UI for the course searching --- src/main/java/design/model/course_search/CourseSorter.java | 1 + .../java/design/model/course_search/SortByDifficulty.java | 8 ++++++++ src/main/java/design/model/course_search/SortByHoles.java | 11 ++++++++++- src/main/java/design/model/course_search/SortByLocation.java | 8 ++++++++ src/main/java/design/model/course_search/SortByName.java | 8 ++++++++ src/main/java/design/model/course_search/SortByPar.java | 8 ++++++++ 6 files changed, 43 insertions(+), 1 deletion(-) (limited to 'src/main/java/design/model') diff --git a/src/main/java/design/model/course_search/CourseSorter.java b/src/main/java/design/model/course_search/CourseSorter.java index 7549645..86c48a5 100644 --- a/src/main/java/design/model/course_search/CourseSorter.java +++ b/src/main/java/design/model/course_search/CourseSorter.java @@ -8,4 +8,5 @@ import java.util.List; */ public interface CourseSorter { public void sortCourses(List courses); + public String toString(); } \ No newline at end of file diff --git a/src/main/java/design/model/course_search/SortByDifficulty.java b/src/main/java/design/model/course_search/SortByDifficulty.java index 8c3251c..7b72b84 100644 --- a/src/main/java/design/model/course_search/SortByDifficulty.java +++ b/src/main/java/design/model/course_search/SortByDifficulty.java @@ -8,8 +8,16 @@ import java.util.Comparator; * Willem Dalton */ public class SortByDifficulty implements CourseSorter { + + @Override public void sortCourses(List courses) { courses.sort(Comparator.comparing(ICourse::getDifficultyRating)); } + + @Override + public String toString() + { + return "Difficulty"; + } } \ No newline at end of file diff --git a/src/main/java/design/model/course_search/SortByHoles.java b/src/main/java/design/model/course_search/SortByHoles.java index b1badab..76e2649 100644 --- a/src/main/java/design/model/course_search/SortByHoles.java +++ b/src/main/java/design/model/course_search/SortByHoles.java @@ -8,8 +8,17 @@ import java.util.Comparator; * Willem Dalton */ public class SortByHoles implements CourseSorter { + + @Override public void sortCourses(List courses) { courses.sort(Comparator.comparing(ICourse::getHoleCount)); } -} \ No newline at end of file + + @Override + public String toString() + { + return "Hole Count"; + } + +} diff --git a/src/main/java/design/model/course_search/SortByLocation.java b/src/main/java/design/model/course_search/SortByLocation.java index 0d8a8d2..e5df839 100644 --- a/src/main/java/design/model/course_search/SortByLocation.java +++ b/src/main/java/design/model/course_search/SortByLocation.java @@ -8,8 +8,16 @@ import java.util.Comparator; * Willem Dalton */ public class SortByLocation implements CourseSorter { + + @Override public void sortCourses(List courses) { courses.sort(Comparator.comparing(ICourse::getLocation)); } + + @Override + public String toString() + { + return "Location"; + } } \ No newline at end of file diff --git a/src/main/java/design/model/course_search/SortByName.java b/src/main/java/design/model/course_search/SortByName.java index 2847d3e..cee3bcc 100644 --- a/src/main/java/design/model/course_search/SortByName.java +++ b/src/main/java/design/model/course_search/SortByName.java @@ -8,8 +8,16 @@ import java.util.Comparator; * Willem Dalton */ public class SortByName implements CourseSorter { + + @Override public void sortCourses(List courses) { courses.sort(Comparator.comparing(ICourse::getName)); } + + @Override + public String toString() + { + return "Name"; + } } \ No newline at end of file diff --git a/src/main/java/design/model/course_search/SortByPar.java b/src/main/java/design/model/course_search/SortByPar.java index 9a3eaf9..cc402b8 100644 --- a/src/main/java/design/model/course_search/SortByPar.java +++ b/src/main/java/design/model/course_search/SortByPar.java @@ -8,8 +8,16 @@ import java.util.Comparator; * Willem Dalton */ public class SortByPar implements CourseSorter { + + @Override public void sortCourses(List courses) { courses.sort(Comparator.comparing(ICourse::getTotalPar)); } + + @Override + public String toString() + { + return "Total Par"; + } } \ No newline at end of file -- cgit v1.2.3 From e21be3aea31959219aafc4e28d983bafa95cde0a Mon Sep 17 00:00:00 2001 From: WillemDalton Date: Mon, 6 Oct 2025 10:25:23 -0400 Subject: moved some menu logic over to the search subystem, added a new query class --- .../model/course_search/CurrentSearchQuery.java | 63 ++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 src/main/java/design/model/course_search/CurrentSearchQuery.java (limited to 'src/main/java/design/model') diff --git a/src/main/java/design/model/course_search/CurrentSearchQuery.java b/src/main/java/design/model/course_search/CurrentSearchQuery.java new file mode 100644 index 0000000..45364f4 --- /dev/null +++ b/src/main/java/design/model/course_search/CurrentSearchQuery.java @@ -0,0 +1,63 @@ +package design.model.course_search; + +import java.util.ArrayList; +import java.util.List; + +import design.persistence.MasterDatabase; + +/* + * Represents the state of our current search. + */ +public class CurrentSearchQuery { + public static final CurrentSearchQuery INSTANCE = new CurrentSearchQuery(); + + + private CourseList query; + MasterDatabase db = MasterDatabase.INSTANCE; + private final List filters = new ArrayList(); + + public void initialize() + { + query = db.getCourseList(); + } + + public void addFilter(CourseSorter filter) + { + filters.add(filter); + } + + public void clearFilters() + { + filters.clear(); + } + + public String printFilters() + { + String filterResult = ""; + + if(filters.size() == 0) + { + return "nothing"; + } + + for( CourseSorter f : filters) + { + filterResult += f.toString() + " --> "; + } + + filterResult = filterResult.substring(0, filterResult.length() - 5); + filterResult += "\n"; + + return filterResult; + } + + public List getFilters() + { + return filters; + } + + public CourseList getQueryResult() + { + return query; + } +} -- cgit v1.2.3 From 9843e29a51bb6c21b21567b147c1ad301291ec85 Mon Sep 17 00:00:00 2001 From: WillemDalton Date: Mon, 6 Oct 2025 17:06:42 -0400 Subject: more progress on getting searching to work --- src/main/java/design/model/Course.java | 5 +++++ .../model/course_search/CurrentSearchQuery.java | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+) (limited to 'src/main/java/design/model') diff --git a/src/main/java/design/model/Course.java b/src/main/java/design/model/Course.java index f907622..78ee5bd 100644 --- a/src/main/java/design/model/Course.java +++ b/src/main/java/design/model/Course.java @@ -51,4 +51,9 @@ public class Course implements ICourse { public List getHoles() { return holes; } + + @Override + public String toString() { + return name + ", " + location + ", " + difficultyRating + ", " + holeCount + ", " + totalPar; + } } diff --git a/src/main/java/design/model/course_search/CurrentSearchQuery.java b/src/main/java/design/model/course_search/CurrentSearchQuery.java index 45364f4..1f8c8ba 100644 --- a/src/main/java/design/model/course_search/CurrentSearchQuery.java +++ b/src/main/java/design/model/course_search/CurrentSearchQuery.java @@ -2,6 +2,7 @@ package design.model.course_search; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; import design.persistence.MasterDatabase; @@ -16,21 +17,26 @@ public class CurrentSearchQuery { MasterDatabase db = MasterDatabase.INSTANCE; private final List filters = new ArrayList(); + + // initialize the query to the master DB public void initialize() { query = db.getCourseList(); } + // add a new filter public void addFilter(CourseSorter filter) { filters.add(filter); } + // clear the filters public void clearFilters() { filters.clear(); } + // print out the filters ( this is for the model checking used filters ) public String printFilters() { String filterResult = ""; @@ -51,13 +57,28 @@ public class CurrentSearchQuery { return filterResult; } + // get all the filters public List getFilters() { return filters; } + // get our current query. public CourseList getQueryResult() { return query; } + + public CourseList search(String[] searchQuery) + { + List courses = query.getCourses(); + + courses = courses.stream() + .filter(s -> s.toString().toLowerCase().contains(searchQuery[0].toLowerCase())) + .collect(Collectors.toList()); + + query.setCourses(courses); + + return query; + } } -- cgit v1.2.3 From 09f5536f3e21d910e79daf49a67e9e98e9554751 Mon Sep 17 00:00:00 2001 From: WillemDalton Date: Mon, 6 Oct 2025 18:01:55 -0400 Subject: finished searching just need to order by our sorting strategies. --- .../model/course_search/CurrentSearchQuery.java | 26 +++++++++------------- 1 file changed, 11 insertions(+), 15 deletions(-) (limited to 'src/main/java/design/model') diff --git a/src/main/java/design/model/course_search/CurrentSearchQuery.java b/src/main/java/design/model/course_search/CurrentSearchQuery.java index 1f8c8ba..0a492b3 100644 --- a/src/main/java/design/model/course_search/CurrentSearchQuery.java +++ b/src/main/java/design/model/course_search/CurrentSearchQuery.java @@ -13,17 +13,10 @@ public class CurrentSearchQuery { public static final CurrentSearchQuery INSTANCE = new CurrentSearchQuery(); - private CourseList query; MasterDatabase db = MasterDatabase.INSTANCE; + private CourseList query = db.getCourseList(); private final List filters = new ArrayList(); - - // initialize the query to the master DB - public void initialize() - { - query = db.getCourseList(); - } - // add a new filter public void addFilter(CourseSorter filter) { @@ -41,6 +34,7 @@ public class CurrentSearchQuery { { String filterResult = ""; + // no filters? let the user know. if(filters.size() == 0) { return "nothing"; @@ -51,7 +45,8 @@ public class CurrentSearchQuery { filterResult += f.toString() + " --> "; } - filterResult = filterResult.substring(0, filterResult.length() - 5); + // very silly way of removing the last arrow from our filter list. it's kind of dumb but it works fine. + filterResult = filterResult.substring(0, filterResult.length() - 5); filterResult += "\n"; return filterResult; @@ -69,16 +64,17 @@ public class CurrentSearchQuery { return query; } - public CourseList search(String[] searchQuery) + public void search(String searchQuery) { - List courses = query.getCourses(); + List courses; - courses = courses.stream() - .filter(s -> s.toString().toLowerCase().contains(searchQuery[0].toLowerCase())) + // compare to our search query. + courses = query.getCourses().stream() + .filter(s -> s != null && s.toString().toLowerCase().contains(searchQuery)) .collect(Collectors.toList()); - query.setCourses(courses); + // TO DO: Filter this based on our current filters, then return it! - return query; + query.setCourses(courses); } } -- cgit v1.2.3 From a697cdcd21092119208d59209da2127b2ad02477 Mon Sep 17 00:00:00 2001 From: WillemDalton Date: Mon, 6 Oct 2025 22:50:40 -0400 Subject: working on course filtering --- src/main/java/design/model/Course.java | 30 ++++++++++---- .../design/model/course_search/CourseList.java | 46 ++++++++++++++++++++++ .../design/model/course_search/CourseSorter.java | 1 + .../model/course_search/CurrentSearchQuery.java | 24 ++++++----- .../java/design/model/course_search/ICourse.java | 1 + .../model/course_search/SortByDifficulty.java | 6 +++ .../design/model/course_search/SortByHoles.java | 6 +++ .../design/model/course_search/SortByLocation.java | 6 +++ .../design/model/course_search/SortByName.java | 6 +++ .../java/design/model/course_search/SortByPar.java | 6 +++ 10 files changed, 115 insertions(+), 17 deletions(-) (limited to 'src/main/java/design/model') diff --git a/src/main/java/design/model/Course.java b/src/main/java/design/model/Course.java index 78ee5bd..4994381 100644 --- a/src/main/java/design/model/Course.java +++ b/src/main/java/design/model/Course.java @@ -1,5 +1,6 @@ package design.model; +import design.model.course_search.CourseList; import design.model.course_search.ICourse; import java.util.List; @@ -23,37 +24,50 @@ public class Course implements ICourse { this.totalPar = totalPar; this.holes = holes; } - + public int getId() { return id; } - + + @Override public String getName() { return name; } - + + @Override public float getDifficultyRating() { return difficultyRating; } - + + @Override public String getLocation() { return location; } - + + @Override public int getHoleCount() { return holeCount; } - + + @Override public int getTotalPar() { return totalPar; } - + + @Override public List getHoles() { return holes; } - + @Override public String toString() { return name + ", " + location + ", " + difficultyRating + ", " + holeCount + ", " + totalPar; } + + // dummy method due to composite pattern + @Override + public CourseList groupByCurrentSorter() + { + return null; + } } diff --git a/src/main/java/design/model/course_search/CourseList.java b/src/main/java/design/model/course_search/CourseList.java index 82648c2..ac2f334 100644 --- a/src/main/java/design/model/course_search/CourseList.java +++ b/src/main/java/design/model/course_search/CourseList.java @@ -2,6 +2,7 @@ package design.model.course_search; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; import design.model.*; @@ -66,6 +67,44 @@ public class CourseList implements ICourse { sorter.sortCourses(courses); } + public CourseList groupByCurrentSorter() + { + CourseList groupedList = new CourseList(); + + if (courses.isEmpty() || sorter == null) + { + return this; + } + + // Sort by current sorter + sort(); + + // Group consecutive equal elements + List currentGroup = new ArrayList<>(); + ICourse prev = null; + + for (ICourse c : courses) { + if (prev == null || !sorter.isEqual(prev, c)) { + if (!currentGroup.isEmpty()) { + CourseList sublist = new CourseList(); + sublist.setCourses(new ArrayList<>(currentGroup)); + groupedList.add(sublist); + currentGroup.clear(); + } + } + currentGroup.add(c); + prev = c; + } + + if (!currentGroup.isEmpty()) { + CourseList sublist = new CourseList(); + sublist.setCourses(currentGroup); + groupedList.add(sublist); + } + + return groupedList; + } + /* * All overrides of the ICourse class. This is a drawback of the composite pattern, but it's pretty negligible here. return some dummy values. */ @@ -86,4 +125,11 @@ public class CourseList implements ICourse { @Override public List getHoles() { return null; } + + @Override + public String toString() + { + // to do: implement returning courslist children + return "wip"; + } } diff --git a/src/main/java/design/model/course_search/CourseSorter.java b/src/main/java/design/model/course_search/CourseSorter.java index 86c48a5..8b4d42c 100644 --- a/src/main/java/design/model/course_search/CourseSorter.java +++ b/src/main/java/design/model/course_search/CourseSorter.java @@ -9,4 +9,5 @@ import java.util.List; public interface CourseSorter { public void sortCourses(List courses); public String toString(); + public boolean isEqual(ICourse a, ICourse b); } \ No newline at end of file diff --git a/src/main/java/design/model/course_search/CurrentSearchQuery.java b/src/main/java/design/model/course_search/CurrentSearchQuery.java index 0a492b3..3916f0a 100644 --- a/src/main/java/design/model/course_search/CurrentSearchQuery.java +++ b/src/main/java/design/model/course_search/CurrentSearchQuery.java @@ -64,17 +64,23 @@ public class CurrentSearchQuery { return query; } - public void search(String searchQuery) + public void search(String searchQuery) { - List courses; + List courses = db.getCourseList().getCourses().stream() + .filter(s -> s != null && s.toString().toLowerCase().contains(searchQuery.toLowerCase())) + .collect(Collectors.toList()); - // compare to our search query. - courses = query.getCourses().stream() - .filter(s -> s != null && s.toString().toLowerCase().contains(searchQuery)) - .collect(Collectors.toList()); + // Start with filtered base + CourseList current = new CourseList(); + current.setCourses(courses); - // TO DO: Filter this based on our current filters, then return it! - - query.setCourses(courses); + // Sequentially apply filters + for (CourseSorter filter : filters) + { + current.setSorter(filter); + current = current.groupByCurrentSorter(); // regroup after each + } + + query = current; } } diff --git a/src/main/java/design/model/course_search/ICourse.java b/src/main/java/design/model/course_search/ICourse.java index e50eb1b..061bbfa 100644 --- a/src/main/java/design/model/course_search/ICourse.java +++ b/src/main/java/design/model/course_search/ICourse.java @@ -15,4 +15,5 @@ public interface ICourse { List getHoles(); int getHoleCount(); int getTotalPar(); + CourseList groupByCurrentSorter(); } diff --git a/src/main/java/design/model/course_search/SortByDifficulty.java b/src/main/java/design/model/course_search/SortByDifficulty.java index 7b72b84..7660541 100644 --- a/src/main/java/design/model/course_search/SortByDifficulty.java +++ b/src/main/java/design/model/course_search/SortByDifficulty.java @@ -15,6 +15,12 @@ public class SortByDifficulty implements CourseSorter { courses.sort(Comparator.comparing(ICourse::getDifficultyRating)); } + @Override + public boolean isEqual(ICourse a, ICourse b) + { + return a.getDifficultyRating() == b.getDifficultyRating(); + } + @Override public String toString() { diff --git a/src/main/java/design/model/course_search/SortByHoles.java b/src/main/java/design/model/course_search/SortByHoles.java index 76e2649..80c0d16 100644 --- a/src/main/java/design/model/course_search/SortByHoles.java +++ b/src/main/java/design/model/course_search/SortByHoles.java @@ -15,6 +15,12 @@ public class SortByHoles implements CourseSorter { courses.sort(Comparator.comparing(ICourse::getHoleCount)); } + @Override + public boolean isEqual(ICourse a, ICourse b) + { + return a.getHoleCount() == b.getHoleCount(); + } + @Override public String toString() { diff --git a/src/main/java/design/model/course_search/SortByLocation.java b/src/main/java/design/model/course_search/SortByLocation.java index e5df839..98ca0c6 100644 --- a/src/main/java/design/model/course_search/SortByLocation.java +++ b/src/main/java/design/model/course_search/SortByLocation.java @@ -14,6 +14,12 @@ public class SortByLocation implements CourseSorter { { courses.sort(Comparator.comparing(ICourse::getLocation)); } + + @Override + public boolean isEqual(ICourse a, ICourse b) + { + return a.getLocation().equals(b.getLocation()); + } @Override public String toString() diff --git a/src/main/java/design/model/course_search/SortByName.java b/src/main/java/design/model/course_search/SortByName.java index cee3bcc..17553a8 100644 --- a/src/main/java/design/model/course_search/SortByName.java +++ b/src/main/java/design/model/course_search/SortByName.java @@ -15,6 +15,12 @@ public class SortByName implements CourseSorter { courses.sort(Comparator.comparing(ICourse::getName)); } + @Override + public boolean isEqual(ICourse a, ICourse b) + { + return a.getName().equals(b.getName()); + } + @Override public String toString() { diff --git a/src/main/java/design/model/course_search/SortByPar.java b/src/main/java/design/model/course_search/SortByPar.java index cc402b8..203aeaf 100644 --- a/src/main/java/design/model/course_search/SortByPar.java +++ b/src/main/java/design/model/course_search/SortByPar.java @@ -15,6 +15,12 @@ public class SortByPar implements CourseSorter { courses.sort(Comparator.comparing(ICourse::getTotalPar)); } + @Override + public boolean isEqual(ICourse a, ICourse b) + { + return a.getTotalPar() == b.getTotalPar(); + } + @Override public String toString() { -- cgit v1.2.3 From db1ede10a6547b51ffed71dc86d73f3a6c8af129 Mon Sep 17 00:00:00 2001 From: WillemDalton Date: Tue, 7 Oct 2025 09:10:05 -0400 Subject: added some comments, allows users to add courses to profile, fixed displaying course lists --- src/main/java/design/model/Course.java | 7 ---- .../design/model/course_search/CourseList.java | 42 +--------------------- .../model/course_search/CurrentSearchQuery.java | 30 ++++++++-------- .../java/design/model/course_search/ICourse.java | 1 - 4 files changed, 15 insertions(+), 65 deletions(-) (limited to 'src/main/java/design/model') diff --git a/src/main/java/design/model/Course.java b/src/main/java/design/model/Course.java index 4994381..c199563 100644 --- a/src/main/java/design/model/Course.java +++ b/src/main/java/design/model/Course.java @@ -63,11 +63,4 @@ public class Course implements ICourse { public String toString() { return name + ", " + location + ", " + difficultyRating + ", " + holeCount + ", " + totalPar; } - - // dummy method due to composite pattern - @Override - public CourseList groupByCurrentSorter() - { - return null; - } } diff --git a/src/main/java/design/model/course_search/CourseList.java b/src/main/java/design/model/course_search/CourseList.java index ac2f334..360dc9b 100644 --- a/src/main/java/design/model/course_search/CourseList.java +++ b/src/main/java/design/model/course_search/CourseList.java @@ -2,7 +2,6 @@ package design.model.course_search; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; import design.model.*; @@ -66,44 +65,6 @@ public class CourseList implements ICourse { { sorter.sortCourses(courses); } - - public CourseList groupByCurrentSorter() - { - CourseList groupedList = new CourseList(); - - if (courses.isEmpty() || sorter == null) - { - return this; - } - - // Sort by current sorter - sort(); - - // Group consecutive equal elements - List currentGroup = new ArrayList<>(); - ICourse prev = null; - - for (ICourse c : courses) { - if (prev == null || !sorter.isEqual(prev, c)) { - if (!currentGroup.isEmpty()) { - CourseList sublist = new CourseList(); - sublist.setCourses(new ArrayList<>(currentGroup)); - groupedList.add(sublist); - currentGroup.clear(); - } - } - currentGroup.add(c); - prev = c; - } - - if (!currentGroup.isEmpty()) { - CourseList sublist = new CourseList(); - sublist.setCourses(currentGroup); - groupedList.add(sublist); - } - - return groupedList; - } /* * All overrides of the ICourse class. This is a drawback of the composite pattern, but it's pretty negligible here. return some dummy values. @@ -129,7 +90,6 @@ public class CourseList implements ICourse { @Override public String toString() { - // to do: implement returning courslist children - return "wip"; + return "Course List"; } } diff --git a/src/main/java/design/model/course_search/CurrentSearchQuery.java b/src/main/java/design/model/course_search/CurrentSearchQuery.java index 3916f0a..c00eb86 100644 --- a/src/main/java/design/model/course_search/CurrentSearchQuery.java +++ b/src/main/java/design/model/course_search/CurrentSearchQuery.java @@ -12,11 +12,19 @@ import design.persistence.MasterDatabase; public class CurrentSearchQuery { public static final CurrentSearchQuery INSTANCE = new CurrentSearchQuery(); - + // initialize our search with the master db data MasterDatabase db = MasterDatabase.INSTANCE; private CourseList query = db.getCourseList(); private final List filters = new ArrayList(); + + // reset the query + public void reset() + { + query = db.getCourseList(); + clearFilters(); + } + // add a new filter public void addFilter(CourseSorter filter) { @@ -29,7 +37,7 @@ public class CurrentSearchQuery { filters.clear(); } - // print out the filters ( this is for the model checking used filters ) + // print out the filters we're currently using and the order public String printFilters() { String filterResult = ""; @@ -45,7 +53,7 @@ public class CurrentSearchQuery { filterResult += f.toString() + " --> "; } - // very silly way of removing the last arrow from our filter list. it's kind of dumb but it works fine. + // remove last arrow and add padding filterResult = filterResult.substring(0, filterResult.length() - 5); filterResult += "\n"; @@ -66,21 +74,11 @@ public class CurrentSearchQuery { public void search(String searchQuery) { + // only grab courses which fit our search List courses = db.getCourseList().getCourses().stream() - .filter(s -> s != null && s.toString().toLowerCase().contains(searchQuery.toLowerCase())) + .filter(s -> s.toString().toLowerCase().contains(searchQuery.toLowerCase())) .collect(Collectors.toList()); - // Start with filtered base - CourseList current = new CourseList(); - current.setCourses(courses); - - // Sequentially apply filters - for (CourseSorter filter : filters) - { - current.setSorter(filter); - current = current.groupByCurrentSorter(); // regroup after each - } - - query = current; + query.setCourses(courses); } } diff --git a/src/main/java/design/model/course_search/ICourse.java b/src/main/java/design/model/course_search/ICourse.java index 061bbfa..e50eb1b 100644 --- a/src/main/java/design/model/course_search/ICourse.java +++ b/src/main/java/design/model/course_search/ICourse.java @@ -15,5 +15,4 @@ public interface ICourse { List getHoles(); int getHoleCount(); int getTotalPar(); - CourseList groupByCurrentSorter(); } -- cgit v1.2.3 From 2ef38d86d8b207bc0dad6e3c6b7780abc6f6e82b Mon Sep 17 00:00:00 2001 From: WillemDalton Date: Wed, 8 Oct 2025 21:49:21 -0400 Subject: finished multi filtering --- .../model/course_search/CurrentSearchQuery.java | 77 +++++++++++++++++++++- 1 file changed, 74 insertions(+), 3 deletions(-) (limited to 'src/main/java/design/model') diff --git a/src/main/java/design/model/course_search/CurrentSearchQuery.java b/src/main/java/design/model/course_search/CurrentSearchQuery.java index c00eb86..e1f52ce 100644 --- a/src/main/java/design/model/course_search/CurrentSearchQuery.java +++ b/src/main/java/design/model/course_search/CurrentSearchQuery.java @@ -17,12 +17,10 @@ public class CurrentSearchQuery { private CourseList query = db.getCourseList(); private final List filters = new ArrayList(); - // reset the query public void reset() { query = db.getCourseList(); - clearFilters(); } // add a new filter @@ -79,6 +77,79 @@ public class CurrentSearchQuery { .filter(s -> s.toString().toLowerCase().contains(searchQuery.toLowerCase())) .collect(Collectors.toList()); - query.setCourses(courses); + // and now, we filter it! + CourseList filtered = applyFilters(filters, courses); + query.setCourses(filtered.getCourses()); + } + + // to apply our filters we need to traverse the tree and make new grouping as we go. + public CourseList applyFilters(List filters, List coursesToFilter) + { + CourseList root = new CourseList(); + root.setCourses(applyFiltersRecursive(coursesToFilter, filters, 0)); + return root; + } + + // the actual recursive part. Level is how many filters deep we are. + private List applyFiltersRecursive(List courses, List filters, int level) + { + // base case. we have gone past all filters or theres only one course in this list. already sorted! + if (level >= filters.size() || courses.size() <= 1) + { + return courses; + } + + // grab out current sorting strategy for this level, and sort the courselist. + CourseSorter sorter = filters.get(level); + sorter.sortCourses(courses); + + // the resulting sorted list, with new groupings + List result = new ArrayList<>(); + + // courses with an equal value. + List currentGroup = new ArrayList<>(); + + ICourse prev = null; + + // run through the courses, if + for (ICourse c : courses) + { + /* always add the first course to a new group. when iterating through courses, if we have to values that are equal, we need to add them into a group together. + * think about it this way. If we have [ 1, 2, 2, 2, 3, 4 ]. 1 is first, so its in it's own group. 2 /= 1, so 2 gets its own group. + * now do 2 again. we add it to the existing group 2. Same with the next 2. Now 3. 3 /= 2, so we put it in it's own group. + */ + if (prev == null || !sorter.isEqual(prev, c)) + { + // already a course in that group? we now have two equal values and so + if (!currentGroup.isEmpty()) + { + result.add(makeGroup(currentGroup, filters, level)); + currentGroup = new ArrayList<>(); + } + } + + currentGroup.add(c); + prev = c; + } + + // handle the last group. + if (!currentGroup.isEmpty()) + { + result.add(makeGroup(currentGroup, filters, level)); + } + + return result; } + + // make a CourseList group, a sublist of a group, and filter it. + private ICourse makeGroup(List group, List filters, int level) + { + // base case, group only has one course in it (already sorted) + if (group.size() == 1) return group.get(0); + + // group has more than 1 course in it, it needs to be sorted more if possible. + CourseList subList = new CourseList(); + subList.setCourses(applyFiltersRecursive(group, filters, level + 1)); + return subList; + } } -- cgit v1.2.3 From e265d5cbb6fd803d6bb05e34268f21e6814e0e8b Mon Sep 17 00:00:00 2001 From: WillemDalton Date: Wed, 8 Oct 2025 21:52:21 -0400 Subject: reversed the sorting order of difficulty and par to be descending instead of ascending. --- src/main/java/design/model/course_search/SortByDifficulty.java | 2 +- src/main/java/design/model/course_search/SortByHoles.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/design/model') diff --git a/src/main/java/design/model/course_search/SortByDifficulty.java b/src/main/java/design/model/course_search/SortByDifficulty.java index 7660541..c6bb7ac 100644 --- a/src/main/java/design/model/course_search/SortByDifficulty.java +++ b/src/main/java/design/model/course_search/SortByDifficulty.java @@ -12,7 +12,7 @@ public class SortByDifficulty implements CourseSorter { @Override public void sortCourses(List courses) { - courses.sort(Comparator.comparing(ICourse::getDifficultyRating)); + courses.sort(Comparator.comparing(ICourse::getDifficultyRating).reversed()); // hardest to easiest } @Override diff --git a/src/main/java/design/model/course_search/SortByHoles.java b/src/main/java/design/model/course_search/SortByHoles.java index 80c0d16..33c5473 100644 --- a/src/main/java/design/model/course_search/SortByHoles.java +++ b/src/main/java/design/model/course_search/SortByHoles.java @@ -12,7 +12,7 @@ public class SortByHoles implements CourseSorter { @Override public void sortCourses(List courses) { - courses.sort(Comparator.comparing(ICourse::getHoleCount)); + courses.sort(Comparator.comparing(ICourse::getHoleCount).reversed()); // highest par to lowest par } @Override -- cgit v1.2.3 From ddcfcf82baf737e183ec7b00edeee26894516c58 Mon Sep 17 00:00:00 2001 From: sowgro Date: Thu, 9 Oct 2025 08:06:56 -0400 Subject: fix formatting --- .../design/model/course_search/CourseList.java | 66 ++++++++++--------- .../model/course_search/CurrentSearchQuery.java | 75 +++++++++------------- .../model/course_search/SortByDifficulty.java | 13 ++-- .../design/model/course_search/SortByHoles.java | 13 ++-- .../design/model/course_search/SortByLocation.java | 15 ++--- .../design/model/course_search/SortByName.java | 13 ++-- .../java/design/model/course_search/SortByPar.java | 13 ++-- 7 files changed, 90 insertions(+), 118 deletions(-) (limited to 'src/main/java/design/model') diff --git a/src/main/java/design/model/course_search/CourseList.java b/src/main/java/design/model/course_search/CourseList.java index 360dc9b..c2411f7 100644 --- a/src/main/java/design/model/course_search/CourseList.java +++ b/src/main/java/design/model/course_search/CourseList.java @@ -1,10 +1,10 @@ package design.model.course_search; +import design.model.Hole; + import java.util.ArrayList; import java.util.List; -import design.model.*; - /* * Defines a list of courses that can be sorted, added to or removed from. * Willem Dalton @@ -13,83 +13,87 @@ public class CourseList implements ICourse { private CourseSorter sorter; private List courses; - public CourseList() - { + public CourseList() { courses = new ArrayList<>(); } /* * Grab the list of courses */ - public List getCourses() - { + public List getCourses() { return courses; } /* * Set the list of courses equal to an existing list */ - public void setCourses(List courses) - { + public void setCourses(List courses) { this.courses = courses; } /* - * set the chosen sorting algorithm for the given list. - */ - public void setSorter(CourseSorter courseSorter) - { + * set the chosen sorting algorithm for the given list. + */ + public void setSorter(CourseSorter courseSorter) { sorter = courseSorter; } /* * Add a new course to the list. */ - public void add(ICourse course) - { + public void add(ICourse course) { courses.add(course); } /* - * Remove a course from the list. + * Remove a course from the list. */ - public void remove(ICourse course) - { + public void remove(ICourse course) { courses.remove(course); } /* * Sort the list. */ - public void sort() - { + public void sort() { sorter.sortCourses(courses); } - + /* * All overrides of the ICourse class. This is a drawback of the composite pattern, but it's pretty negligible here. return some dummy values. */ @Override - public String getName() { return "Course List"; } - + public String getName() { + return "Course List"; + } + @Override - public float getDifficultyRating() { return 0; } + public float getDifficultyRating() { + return 0; + } @Override - public String getLocation() { return ""; } - + public String getLocation() { + return ""; + } + @Override - public int getTotalPar() { return 0; } + public int getTotalPar() { + return 0; + } @Override - public int getHoleCount() { return 0; } + public int getHoleCount() { + return 0; + } @Override - public List getHoles() { return null; } + public List getHoles() { + return null; + } - @Override - public String toString() - { + @Override + public String toString() { return "Course List"; } } diff --git a/src/main/java/design/model/course_search/CurrentSearchQuery.java b/src/main/java/design/model/course_search/CurrentSearchQuery.java index e1f52ce..999dfcb 100644 --- a/src/main/java/design/model/course_search/CurrentSearchQuery.java +++ b/src/main/java/design/model/course_search/CurrentSearchQuery.java @@ -1,81 +1,72 @@ package design.model.course_search; +import design.persistence.MasterDatabase; + import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import design.persistence.MasterDatabase; - -/* +/* * Represents the state of our current search. */ public class CurrentSearchQuery { public static final CurrentSearchQuery INSTANCE = new CurrentSearchQuery(); - + // initialize our search with the master db data MasterDatabase db = MasterDatabase.INSTANCE; private CourseList query = db.getCourseList(); private final List filters = new ArrayList(); // reset the query - public void reset() - { + public void reset() { query = db.getCourseList(); } // add a new filter - public void addFilter(CourseSorter filter) - { + public void addFilter(CourseSorter filter) { filters.add(filter); } // clear the filters - public void clearFilters() - { + public void clearFilters() { filters.clear(); } // print out the filters we're currently using and the order - public String printFilters() - { + public String printFilters() { String filterResult = ""; // no filters? let the user know. - if(filters.size() == 0) - { + if (filters.size() == 0) { return "nothing"; } - for( CourseSorter f : filters) - { + for (CourseSorter f : filters) { filterResult += f.toString() + " --> "; } // remove last arrow and add padding - filterResult = filterResult.substring(0, filterResult.length() - 5); + filterResult = filterResult.substring(0, filterResult.length() - 5); filterResult += "\n"; return filterResult; } // get all the filters - public List getFilters() - { + public List getFilters() { return filters; } // get our current query. - public CourseList getQueryResult() - { + public CourseList getQueryResult() { return query; } - public void search(String searchQuery) - { + public void search(String searchQuery) { // only grab courses which fit our search List courses = db.getCourseList().getCourses().stream() - .filter(s -> s.toString().toLowerCase().contains(searchQuery.toLowerCase())) - .collect(Collectors.toList()); + .filter(s -> s.toString().toLowerCase().contains(searchQuery.toLowerCase())) + .collect(Collectors.toList()); // and now, we filter it! CourseList filtered = applyFilters(filters, courses); @@ -83,19 +74,16 @@ public class CurrentSearchQuery { } // to apply our filters we need to traverse the tree and make new grouping as we go. - public CourseList applyFilters(List filters, List coursesToFilter) - { + public CourseList applyFilters(List filters, List coursesToFilter) { CourseList root = new CourseList(); root.setCourses(applyFiltersRecursive(coursesToFilter, filters, 0)); return root; } // the actual recursive part. Level is how many filters deep we are. - private List applyFiltersRecursive(List courses, List filters, int level) - { - // base case. we have gone past all filters or theres only one course in this list. already sorted! - if (level >= filters.size() || courses.size() <= 1) - { + private List applyFiltersRecursive(List courses, List filters, int level) { + // base case. we have gone past all filters or theres only one course in this list. already sorted! + if (level >= filters.size() || courses.size() <= 1) { return courses; } @@ -112,17 +100,14 @@ public class CurrentSearchQuery { ICourse prev = null; // run through the courses, if - for (ICourse c : courses) - { + for (ICourse c : courses) { /* always add the first course to a new group. when iterating through courses, if we have to values that are equal, we need to add them into a group together. - * think about it this way. If we have [ 1, 2, 2, 2, 3, 4 ]. 1 is first, so its in it's own group. 2 /= 1, so 2 gets its own group. - * now do 2 again. we add it to the existing group 2. Same with the next 2. Now 3. 3 /= 2, so we put it in it's own group. - */ - if (prev == null || !sorter.isEqual(prev, c)) - { + * think about it this way. If we have [ 1, 2, 2, 2, 3, 4 ]. 1 is first, so its in it's own group. 2 /= 1, so 2 gets its own group. + * now do 2 again. we add it to the existing group 2. Same with the next 2. Now 3. 3 /= 2, so we put it in it's own group. + */ + if (prev == null || !sorter.isEqual(prev, c)) { // already a course in that group? we now have two equal values and so - if (!currentGroup.isEmpty()) - { + if (!currentGroup.isEmpty()) { result.add(makeGroup(currentGroup, filters, level)); currentGroup = new ArrayList<>(); } @@ -133,8 +118,7 @@ public class CurrentSearchQuery { } // handle the last group. - if (!currentGroup.isEmpty()) - { + if (!currentGroup.isEmpty()) { result.add(makeGroup(currentGroup, filters, level)); } @@ -142,8 +126,7 @@ public class CurrentSearchQuery { } // make a CourseList group, a sublist of a group, and filter it. - private ICourse makeGroup(List group, List filters, int level) - { + private ICourse makeGroup(List group, List filters, int level) { // base case, group only has one course in it (already sorted) if (group.size() == 1) return group.get(0); @@ -151,5 +134,5 @@ public class CurrentSearchQuery { CourseList subList = new CourseList(); subList.setCourses(applyFiltersRecursive(group, filters, level + 1)); return subList; - } + } } diff --git a/src/main/java/design/model/course_search/SortByDifficulty.java b/src/main/java/design/model/course_search/SortByDifficulty.java index c6bb7ac..b8a8aea 100644 --- a/src/main/java/design/model/course_search/SortByDifficulty.java +++ b/src/main/java/design/model/course_search/SortByDifficulty.java @@ -1,29 +1,26 @@ package design.model.course_search; -import java.util.List; import java.util.Comparator; +import java.util.List; /* * Concrete strategy for sorting courses by their difficulty rating. * Willem Dalton */ public class SortByDifficulty implements CourseSorter { - + @Override - public void sortCourses(List courses) - { + public void sortCourses(List courses) { courses.sort(Comparator.comparing(ICourse::getDifficultyRating).reversed()); // hardest to easiest } @Override - public boolean isEqual(ICourse a, ICourse b) - { + public boolean isEqual(ICourse a, ICourse b) { return a.getDifficultyRating() == b.getDifficultyRating(); } @Override - public String toString() - { + public String toString() { return "Difficulty"; } } \ No newline at end of file diff --git a/src/main/java/design/model/course_search/SortByHoles.java b/src/main/java/design/model/course_search/SortByHoles.java index 33c5473..1971e42 100644 --- a/src/main/java/design/model/course_search/SortByHoles.java +++ b/src/main/java/design/model/course_search/SortByHoles.java @@ -1,29 +1,26 @@ package design.model.course_search; -import java.util.List; import java.util.Comparator; +import java.util.List; /* * Concrete strategy by sorting courses by their hole count (9 or 18) * Willem Dalton */ public class SortByHoles implements CourseSorter { - + @Override - public void sortCourses(List courses) - { + public void sortCourses(List courses) { courses.sort(Comparator.comparing(ICourse::getHoleCount).reversed()); // highest par to lowest par } @Override - public boolean isEqual(ICourse a, ICourse b) - { + public boolean isEqual(ICourse a, ICourse b) { return a.getHoleCount() == b.getHoleCount(); } @Override - public String toString() - { + public String toString() { return "Hole Count"; } diff --git a/src/main/java/design/model/course_search/SortByLocation.java b/src/main/java/design/model/course_search/SortByLocation.java index 98ca0c6..f748a51 100644 --- a/src/main/java/design/model/course_search/SortByLocation.java +++ b/src/main/java/design/model/course_search/SortByLocation.java @@ -1,29 +1,26 @@ package design.model.course_search; -import java.util.List; import java.util.Comparator; +import java.util.List; /* * Concrete strategy for sorting courses by their location. * Willem Dalton */ public class SortByLocation implements CourseSorter { - + @Override - public void sortCourses(List courses) - { + public void sortCourses(List courses) { courses.sort(Comparator.comparing(ICourse::getLocation)); } - + @Override - public boolean isEqual(ICourse a, ICourse b) - { + public boolean isEqual(ICourse a, ICourse b) { return a.getLocation().equals(b.getLocation()); } @Override - public String toString() - { + public String toString() { return "Location"; } } \ No newline at end of file diff --git a/src/main/java/design/model/course_search/SortByName.java b/src/main/java/design/model/course_search/SortByName.java index 17553a8..68f2a72 100644 --- a/src/main/java/design/model/course_search/SortByName.java +++ b/src/main/java/design/model/course_search/SortByName.java @@ -1,29 +1,26 @@ package design.model.course_search; -import java.util.List; import java.util.Comparator; +import java.util.List; /* * Concrete strategy for sorting courses base on their name. * Willem Dalton */ public class SortByName implements CourseSorter { - + @Override - public void sortCourses(List courses) - { + public void sortCourses(List courses) { courses.sort(Comparator.comparing(ICourse::getName)); } @Override - public boolean isEqual(ICourse a, ICourse b) - { + public boolean isEqual(ICourse a, ICourse b) { return a.getName().equals(b.getName()); } @Override - public String toString() - { + public String toString() { return "Name"; } } \ No newline at end of file diff --git a/src/main/java/design/model/course_search/SortByPar.java b/src/main/java/design/model/course_search/SortByPar.java index 203aeaf..868b39d 100644 --- a/src/main/java/design/model/course_search/SortByPar.java +++ b/src/main/java/design/model/course_search/SortByPar.java @@ -1,29 +1,26 @@ package design.model.course_search; -import java.util.List; import java.util.Comparator; +import java.util.List; /* * Concrete strategy for sorting courses based on their total par. * Willem Dalton */ public class SortByPar implements CourseSorter { - + @Override - public void sortCourses(List courses) - { + public void sortCourses(List courses) { courses.sort(Comparator.comparing(ICourse::getTotalPar)); } @Override - public boolean isEqual(ICourse a, ICourse b) - { + public boolean isEqual(ICourse a, ICourse b) { return a.getTotalPar() == b.getTotalPar(); } @Override - public String toString() - { + public String toString() { return "Total Par"; } } \ No newline at end of file -- cgit v1.2.3