Merge branch 'bugfix/refactoring'

Author: tiskw

.gitignore

@@ -9,3 +9,6 @@ __pycache__
 
 # Ignore virtual environment.
 venv
+
+# Ignore coverage files.
+.coverage

rfflearn/cpu/__init__.py

@@ -68,7 +68,7 @@
                   ImportWarning)
 
 # Import shap-related modules if `shap` is available.
-if (importlib.util.find_spec("matplotlib") is not None) and (importlib.util.find_spec("shap") is not None):
+if all(importlib.util.find_spec(name) is not None for name in ["matplotlib", "shap"]):
 
     # Import explainer module.
     explainer = importlib.import_module("explainer")

rfflearn/cpu/rfflearn_cpu_common.py

@@ -84,7 +84,8 @@ def box_muller_method(xs, ys):
         return np.array([zs1, zs2])
 
     # Generate sobol sequence engine and throw away the first several values.
-    sampler = scipy.stats.qmc.Sobol(dim_in, scramble=True, seed=np.random.randint(0, np.iinfo(np.int32).max))
+    int32_max = np.iinfo(np.int32).max
+    sampler = scipy.stats.qmc.Sobol(dim_in, scramble=True, seed=np.random.randint(0, int32_max))
     sampler.fast_forward(QUASI_MC_SKIP)
 
     # Generate uniform random matrix.

rfflearn/cpu/rfflearn_cpu_regression.py

@@ -3,7 +3,7 @@
 """
 
 # Declare published functions and variables.
-__all__ = ["RFFRegression", "ORFRegression", "QRFRegression"]
+__all__ = ["RFFRegressor", "ORFRegressor", "QRFRegressor"]
 
 # Import 3rd-party packages.
 import sklearn.linear_model

rfflearn/gpu/__init__.py

@@ -59,7 +59,7 @@
                   ImportWarning)
 
 # Import shap-related modules if `shap` is available.
-if (importlib.util.find_spec("matplotlib") is not None) and (importlib.util.find_spec("shap") is not None):
+if all(importlib.util.find_spec(name) is not None for name in ["matplotlib", "shap"]):
 
     # Import explainer module.
     explainer = importlib.import_module("explainer")

rfflearn/rfflearn_common.py

@@ -2,6 +2,6 @@
 Common functions/variables of rfflearn.
 """
 
-__version__ = "2024.10.27"
+__version__ = "2024.10.28"
 
 # vim: expandtab tabstop=4 shiftwidth=4 fdm=marker