fix: address PR comments

Author: zepfred

pyproject.toml

@@ -3,7 +3,6 @@ requires = [
     "setuptools>=69.1.1",
     "stubgenj>=0.2.5",
     "JPype1>=1.5.0",
-    "wheel",
-    "multipledispatch>=1.0.0"
+    "wheel"
 ]
 build-backend = "setuptools.build_meta"

setup.py

@@ -145,8 +145,7 @@ def find_stub_files(stub_root: str):
     test_suite='tests',
     python_requires='>=3.10',
     install_requires=[
-        'JPype1>=1.5.0',
-        'multipledispatch>=1.0.0'
+        'JPype1>=1.5.0'
     ],
     cmdclass={'build_py': FetchDependencies},
     package_data={

tests/test_solution_manager.py

@@ -141,14 +141,14 @@ def assert_score_analysis(problem: Solution, score_analysis: ScoreAnalysis):
 
 
 def assert_score_analysis_summary(score_analysis: ScoreAnalysis):
-    summary = score_analysis.summarize
+    summary = score_analysis.summary
     assert "Explanation of score (3):" in summary
     assert "Constraint matches:" in summary
     assert "3: constraint (Maximize Value) has 3 matches:" in summary
     assert "1: justified with" in summary
 
     match = score_analysis.constraint_analyses[0]
-    match_summary = match.summarize
+    match_summary = match.summary
     assert "Explanation of score (3):" in match_summary
     assert "Constraint matches:" in match_summary
     assert "3: constraint (Maximize Value) has 3 matches:" in match_summary
@@ -201,6 +201,10 @@ def test_score_manager_diff():
     diff = score_analysis.diff(second_score_analysis)
     assert diff.score.score == -1
 
+    diff_operation = score_analysis - second_score_analysis
+    assert diff_operation.score.score == -1
+    print(diff, diff_operation)
+
     constraint_analyses = score_analysis.constraint_analyses
     assert len(constraint_analyses) == 1
 
@@ -241,6 +245,8 @@ def test_score_manager_constraint_ref():
 ignored_java_functions_per_class = {
     'Indictment': {'getJustification'},  # deprecated
     'ConstraintRef': {'of', 'packageName', 'constraintName'},  # built-in constructor and properties with @dataclass
+    'ConstraintAnalysis': {'summarize'},  # using summary instead
+    'ScoreAnalysis': {'summarize'},  # using summary instead
     'ConstraintMatch': {
         'getConstraintRef',  # built-in constructor and properties with @dataclass
         'getConstraintPackage',  # deprecated

timefold-solver-python-core/src/main/python/score/_score_analysis.py

@@ -3,9 +3,8 @@
 from .._timefold_java_interop import _java_score_mapping_dict
 from _jpyinterpreter import unwrap_python_like_object, add_java_interface
 from dataclasses import dataclass
-from multipledispatch import dispatch
 
-from typing import TypeVar, Generic, Union, TYPE_CHECKING, Any, cast, Optional, Type
+from typing import overload, TypeVar, Generic, Union, TYPE_CHECKING, Any, cast, Optional, Type
 
 if TYPE_CHECKING:
     # These imports require a JVM to be running, so only import if type checking
@@ -120,7 +119,7 @@ def identification_string(self) -> str:
         return self.constraint_ref.constraint_id
 
     @property
-    def get_indicted_object_list(self):
+    def indicted_object_list(self):
         return self.indicted_objects
 
     def __hash__(self) -> int:
@@ -467,7 +466,7 @@ class ConstraintAnalysis(Generic[Score_]):
          but still non-zero constraint weight; non-empty if constraint has matches.
          This is a list to simplify access to individual elements,
          but it contains no duplicates just like `set` wouldn't.
-    summarize : str
+    summary : str
         Returns a diagnostic text
         that explains part of the score quality through the ConstraintAnalysis API.
     match_count : int
@@ -513,7 +512,7 @@ def score(self) -> Score_:
         return to_python_score(self._delegate.score())
 
     @property
-    def summarize(self) -> str:
+    def summary(self) -> str:
         return self._delegate.summarize()
 
 
@@ -547,7 +546,7 @@ class ScoreAnalysis:
     constraint_analyses : list[ConstraintAnalysis]
         Individual ConstraintAnalysis instances that make up this ScoreAnalysis.
 
-    summarize : str
+    summary : str
         Returns a diagnostic text that explains the solution through the `ConstraintAnalysis` API to identify which
         Constraints cause that score quality.
         The string is built fresh every time the method is called.
@@ -572,7 +571,10 @@ def __init__(self, delegate: '_JavaScoreAnalysis'):
         self._delegate = delegate
 
     def __str__(self):
-        return self.summarize
+        return self.summary
+
+    def __sub__(self, other):
+        return self.diff(other)
 
     @property
     def score(self) -> 'Score':
@@ -595,41 +597,37 @@ def constraint_analyses(self) -> list[ConstraintAnalysis]:
                 list['_JavaConstraintAnalysis[Score]'], self._delegate.constraintAnalyses())
         ]
 
-    @dispatch(str, str)
+    @overload
     def constraint_analysis(self, constraint_package: str, constraint_name: str) -> ConstraintAnalysis:
-        """
-        Performs a lookup on `constraint_map`.
-
-        Parameters
-        ----------
-        constraint_package : str
-        constraint_name : str
+        ...
 
-        Returns
-        -------
-        ConstraintAnalysis
-            None if no constraint matches of such constraint are present
-        """
-        return ConstraintAnalysis(self._delegate.getConstraintAnalysis(constraint_package, constraint_name))
-
-    @dispatch(ConstraintRef)
+    @overload
     def constraint_analysis(self, constraint_ref: 'ConstraintRef') -> ConstraintAnalysis:
+        ...
+
+    def constraint_analysis(self, *args) -> ConstraintAnalysis:
         """
         Performs a lookup on `constraint_map`.
 
         Parameters
         ----------
+        constraint_package : str
+        constraint_name : str
         constraint_ref : ConstraintRef
 
         Returns
         -------
         ConstraintAnalysis
             None if no constraint matches of such constraint are present
         """
-        return ConstraintAnalysis(self._delegate.getConstraintAnalysis(constraint_ref._to_java()))
+        print(args)
+        if len(args) == 1:
+            return ConstraintAnalysis(self._delegate.getConstraintAnalysis(args[0]._to_java()))
+        else:
+            return ConstraintAnalysis(self._delegate.getConstraintAnalysis(args[0], args[1]))
 
     @property
-    def summarize(self) -> str:
+    def summary(self) -> str:
         return self._delegate.summarize()
 
     @property

tox.ini

@@ -13,7 +13,6 @@ deps =
     pytest-cov>=4.1.0
     coverage>=7.4.3
     JPype1>=1.5.0
-    multipledispatch>=1.0.0
 commands =
     pytest --import-mode=importlib {posargs} tests