From e218e35f333f8a30d213c7d3eebeb6f5f6bbcea3 Mon Sep 17 00:00:00 2001 From: WillemDalton Date: Thu, 2 Oct 2025 08:55:33 -0400 Subject: more progress on the strategy, unit testing --- .../design/model/course_search/CourseList.java | 89 ++++++++++++++++++++++ .../design/model/course_search/CourseSorter.java | 12 +++ .../model/course_search/SortByDifficulty.java | 16 ++++ .../design/model/course_search/SortByHoles.java | 16 ++++ .../design/model/course_search/SortByLocation.java | 16 ++++ .../design/model/course_search/SortByName.java | 16 ++++ .../java/design/model/course_search/SortByPar.java | 16 ++++ 7 files changed, 181 insertions(+) create mode 100644 src/main/java/design/model/course_search/CourseList.java create mode 100644 src/main/java/design/model/course_search/CourseSorter.java create mode 100644 src/main/java/design/model/course_search/SortByDifficulty.java create mode 100644 src/main/java/design/model/course_search/SortByHoles.java create mode 100644 src/main/java/design/model/course_search/SortByLocation.java create mode 100644 src/main/java/design/model/course_search/SortByName.java create mode 100644 src/main/java/design/model/course_search/SortByPar.java (limited to 'src/main/java/design/model/course_search') diff --git a/src/main/java/design/model/course_search/CourseList.java b/src/main/java/design/model/course_search/CourseList.java new file mode 100644 index 0000000..82648c2 --- /dev/null +++ b/src/main/java/design/model/course_search/CourseList.java @@ -0,0 +1,89 @@ +package design.model.course_search; + +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 + */ +public class CourseList implements ICourse { + private CourseSorter sorter; + private List courses; + + public CourseList() + { + courses = new ArrayList<>(); + } + + /* + * Grab the list of courses + */ + public List getCourses() + { + return courses; + } + + /* + * Set the list of courses equal to an existing list + */ + public void setCourses(List courses) + { + this.courses = courses; + } + + /* + * 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) + { + courses.add(course); + } + + /* + * Remove a course from the list. + */ + public void remove(ICourse course) + { + courses.remove(course); + } + + /* + * Sort the list. + */ + 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"; } + + @Override + public float getDifficultyRating() { return 0; } + + @Override + public String getLocation() { return ""; } + + @Override + public int getTotalPar() { return 0; } + + @Override + public int getHoleCount() { return 0; } + + @Override + public List getHoles() { return null; } +} diff --git a/src/main/java/design/model/course_search/CourseSorter.java b/src/main/java/design/model/course_search/CourseSorter.java new file mode 100644 index 0000000..a3d1186 --- /dev/null +++ b/src/main/java/design/model/course_search/CourseSorter.java @@ -0,0 +1,12 @@ +package design.model.course_search; + +import design.model.*; +import java.util.List; + +/* + * Defines an interface that concrete strategies will implement + * Willem Dalton + */ +public interface CourseSorter { + public void sortCourses(List courses); +} \ 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 new file mode 100644 index 0000000..c006a40 --- /dev/null +++ b/src/main/java/design/model/course_search/SortByDifficulty.java @@ -0,0 +1,16 @@ +package design.model.course_search; + +import design.model.*; +import java.util.List; +import java.util.Comparator; + +/* + * Concrete strategy for sorting courses by their difficulty rating. + * Willem Dalton + */ +public class SortByDifficulty implements CourseSorter { + public void sortCourses(List courses) + { + courses.sort(Comparator.comparing(ICourse::getDifficultyRating)); + } +} \ 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 new file mode 100644 index 0000000..da98d4f --- /dev/null +++ b/src/main/java/design/model/course_search/SortByHoles.java @@ -0,0 +1,16 @@ +package design.model.course_search; + +import design.model.*; +import java.util.List; +import java.util.Comparator; + +/* + * Concrete strategy by sorting courses by their hole count (9 or 18) + * Willem Dalton + */ +public class SortByHoles implements CourseSorter { + public void sortCourses(List courses) + { + courses.sort(Comparator.comparing(ICourse::getHoleCount)); + } +} \ No newline at end of file diff --git a/src/main/java/design/model/course_search/SortByLocation.java b/src/main/java/design/model/course_search/SortByLocation.java new file mode 100644 index 0000000..ae9bd8b --- /dev/null +++ b/src/main/java/design/model/course_search/SortByLocation.java @@ -0,0 +1,16 @@ +package design.model.course_search; + +import design.model.*; +import java.util.List; +import java.util.Comparator; + +/* + * Concrete strategy for sorting courses by their location. + * Willem Dalton + */ +public class SortByLocation implements CourseSorter { + public void sortCourses(List courses) + { + courses.sort(Comparator.comparing(ICourse::getLocation)); + } +} \ 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 new file mode 100644 index 0000000..04625c6 --- /dev/null +++ b/src/main/java/design/model/course_search/SortByName.java @@ -0,0 +1,16 @@ +package design.model.course_search; + +import design.model.*; +import java.util.List; +import java.util.Comparator; + +/* + * Concrete strategy for sorting courses base on their name. + * Willem Dalton + */ +public class SortByName implements CourseSorter { + public void sortCourses(List courses) + { + courses.sort(Comparator.comparing(ICourse::getName)); + } +} \ 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 new file mode 100644 index 0000000..2fa388c --- /dev/null +++ b/src/main/java/design/model/course_search/SortByPar.java @@ -0,0 +1,16 @@ +package design.model.course_search; + +import design.model.*; +import java.util.List; +import java.util.Comparator; + +/* + * Concrete strategy for sorting courses based on their total par. + * Willem Dalton + */ +public class SortByPar implements CourseSorter { + public void sortCourses(List courses) + { + courses.sort(Comparator.comparing(ICourse::getTotalPar)); + } +} \ No newline at end of file -- cgit v1.2.3 From 42fcc633ddc0e328561f984a6aa0b8593765dcf2 Mon Sep 17 00:00:00 2001 From: sowgro Date: Fri, 3 Oct 2025 21:52:50 -0400 Subject: minor project reorganization --- .../java/design/model/course_search/CourseSorter.java | 1 - src/main/java/design/model/course_search/ICourse.java | 18 ++++++++++++++++++ .../design/model/course_search/SortByDifficulty.java | 1 - .../java/design/model/course_search/SortByHoles.java | 1 - .../design/model/course_search/SortByLocation.java | 1 - .../java/design/model/course_search/SortByName.java | 1 - .../java/design/model/course_search/SortByPar.java | 1 - 7 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 src/main/java/design/model/course_search/ICourse.java (limited to 'src/main/java/design/model/course_search') diff --git a/src/main/java/design/model/course_search/CourseSorter.java b/src/main/java/design/model/course_search/CourseSorter.java index a3d1186..7549645 100644 --- a/src/main/java/design/model/course_search/CourseSorter.java +++ b/src/main/java/design/model/course_search/CourseSorter.java @@ -1,6 +1,5 @@ package design.model.course_search; -import design.model.*; import java.util.List; /* diff --git a/src/main/java/design/model/course_search/ICourse.java b/src/main/java/design/model/course_search/ICourse.java new file mode 100644 index 0000000..e50eb1b --- /dev/null +++ b/src/main/java/design/model/course_search/ICourse.java @@ -0,0 +1,18 @@ +package design.model.course_search; + +import design.model.Hole; + +import java.util.List; + +/* + * Defines the interface for courses to implement + * Willem Dalton + */ +public interface ICourse { + String getName(); + float getDifficultyRating(); + String getLocation(); + List getHoles(); + int getHoleCount(); + int getTotalPar(); +} diff --git a/src/main/java/design/model/course_search/SortByDifficulty.java b/src/main/java/design/model/course_search/SortByDifficulty.java index c006a40..8c3251c 100644 --- a/src/main/java/design/model/course_search/SortByDifficulty.java +++ b/src/main/java/design/model/course_search/SortByDifficulty.java @@ -1,6 +1,5 @@ package design.model.course_search; -import design.model.*; import java.util.List; import java.util.Comparator; diff --git a/src/main/java/design/model/course_search/SortByHoles.java b/src/main/java/design/model/course_search/SortByHoles.java index da98d4f..b1badab 100644 --- a/src/main/java/design/model/course_search/SortByHoles.java +++ b/src/main/java/design/model/course_search/SortByHoles.java @@ -1,6 +1,5 @@ package design.model.course_search; -import design.model.*; import java.util.List; import java.util.Comparator; diff --git a/src/main/java/design/model/course_search/SortByLocation.java b/src/main/java/design/model/course_search/SortByLocation.java index ae9bd8b..0d8a8d2 100644 --- a/src/main/java/design/model/course_search/SortByLocation.java +++ b/src/main/java/design/model/course_search/SortByLocation.java @@ -1,6 +1,5 @@ package design.model.course_search; -import design.model.*; import java.util.List; import java.util.Comparator; diff --git a/src/main/java/design/model/course_search/SortByName.java b/src/main/java/design/model/course_search/SortByName.java index 04625c6..2847d3e 100644 --- a/src/main/java/design/model/course_search/SortByName.java +++ b/src/main/java/design/model/course_search/SortByName.java @@ -1,6 +1,5 @@ package design.model.course_search; -import design.model.*; import java.util.List; import java.util.Comparator; diff --git a/src/main/java/design/model/course_search/SortByPar.java b/src/main/java/design/model/course_search/SortByPar.java index 2fa388c..9a3eaf9 100644 --- a/src/main/java/design/model/course_search/SortByPar.java +++ b/src/main/java/design/model/course_search/SortByPar.java @@ -1,6 +1,5 @@ package design.model.course_search; -import design.model.*; import java.util.List; import java.util.Comparator; -- cgit v1.2.3