psyke 0.8.14.dev4__py3-none-any.whl → 0.8.15__py3-none-any.whl

psyke/extraction/hypercubic/hypercube.py

@@ -471,12 +471,12 @@ class RegressionCube(HyperCube):
         return new_cube
 
     def body(self, variables: dict[str, Var], ignore: list[str], unscale=None, normalization=None) -> Iterable[Struct]:
-        intercept = self.output.intercept_ if normalization is None else unscale(sum(
+        intercept = self.output.intercept_
+        intercept = np.array(intercept).flatten()[0] if isinstance(intercept, Iterable) else intercept
+        intercept = intercept if normalization is None else unscale(sum(
             [-self.output.coef_.flatten()[i] * normalization[name][0] / normalization[name][1] for i, name in
-             enumerate(self.dimensions.keys())], self.output.intercept_), list(normalization.keys())[-1])
-        if isinstance(intercept, list):
-            intercept = intercept[0]
-        coefs = self.output.coef_ if normalization is None else [
+             enumerate(self.dimensions.keys())], intercept), list(normalization.keys())[-1])
+        coefs = self.output.coef_.flatten() if normalization is None else [
             self.output.coef_.flatten()[i] / normalization[name][1] * normalization[list(normalization.keys())[-1]][1]
             for i, name in enumerate(self.dimensions.keys())
         ]

psyke/tuning/pedro/__init__.py

@@ -55,8 +55,10 @@ class PEDRO(SKEOptimizer, IterativeOptimizer):
         patience = self.patience
         while patience > 0:
             print("{}. {}. Threshold = {:.2f}. ".format(self.algorithm_name, grid, threshold), end="")
-            extractor = self.algorithm(self.predictor, grid, min_examples=25, output=self.output,
-                                       threshold=threshold, normalization=self.normalization)
+            param_dict = dict(min_examples=25, threshold=threshold, normalization=self.normalization)
+            if self.algorithm != Extractor.gridrex:
+                param_dict['output'] = self.output
+            extractor = self.algorithm(self.predictor, grid, **param_dict)
             _ = extractor.extract(self.dataframe)
             error_function = (lambda *x: 1 - extractor.accuracy(*x)) if self.output == Target.CLASSIFICATION \
                 else extractor.mae

{psyke-0.8.14.dev4.dist-info → psyke-0.8.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: psyke
-Version: 0.8.14.dev4
+Version: 0.8.15
 Summary: Python-based implementation of PSyKE, i.e. a Platform for Symbolic Knowledge Extraction
 Home-page: https://github.com/psykei/psyke-python
 Author: Matteo Magnini

{psyke-0.8.14.dev4.dist-info → psyke-0.8.15.dist-info}/RECORD

@@ -8,7 +8,7 @@ psyke/extraction/__init__.py,sha256=ziZ8T9eAOZjKipepE5_j1zfZgyFPONjW8MGERSk83nI,
 psyke/extraction/cart/__init__.py,sha256=r2mDULg7oTHrIMPw9lqD6MyXhkkymP4r9PoGUKjAWCM,4569
 psyke/extraction/cart/predictor.py,sha256=_YBedfyz4rGIBeNpN7OaL2BKWdF_5nuq8AlXkVfCtvk,3359
 psyke/extraction/hypercubic/__init__.py,sha256=w_NmfSjh8fCWLDXVXpRLiAApq697cvUSPTgju-jtZCA,10620
-psyke/extraction/hypercubic/hypercube.py,sha256=DlphGxbUHg4MePmpZm97PPw2GL8Ot2fypZBut-aTpwc,25794
+psyke/extraction/hypercubic/hypercube.py,sha256=s1fuGOZfN2ZE21C7f6-b1T3Ta_934c4rwDLD_pBWwFk,25847
 psyke/extraction/hypercubic/strategy.py,sha256=X-roIsfcpJyMdo2px5JtbhP7-XE-zUNkaEK7XGXoWA8,1636
 psyke/extraction/hypercubic/utils.py,sha256=D2FN5CCm_T3h23DmLFoTnIcFo7LvIq__ktl4hjUqkcA,1525
 psyke/extraction/hypercubic/cosmik/__init__.py,sha256=XQUvOtMFpR0vMHYtwIVl3G626HMqN8Clt6BqNm4nvFs,1880
@@ -26,15 +26,15 @@ psyke/schema/__init__.py,sha256=axv4ejZY0ItUwrC9IXb_yAhaQL5f1vwvXXmaIAHJmt0,2606
 psyke/tuning/__init__.py,sha256=yd_ForFmHeYbtRXltY1fOa-mPJvpE6ijzg50M_8Sdxw,3649
 psyke/tuning/crash/__init__.py,sha256=zIHEF75EFy_mRIieqzP04qKLG3GLsSc_mYZHpPfkzxU,2623
 psyke/tuning/orchid/__init__.py,sha256=s64iABbteik27CrRPHSVHNZX25JKlDu7YYjhseOizxw,3618
-psyke/tuning/pedro/__init__.py,sha256=Q7Te3FWeLvJ7g2dkDraorUs6eRtxFgE9HEc3MshcATs,6648
+psyke/tuning/pedro/__init__.py,sha256=rIUqL-xjqrfCGSxhkGySsAS6AThAB_2tbUPFYTNla4A,6736
 psyke/utils/__init__.py,sha256=F-fgBT9CkthIwW8dDCuF5OoQDVMBNvIsZyvNqkgZNUA,1767
 psyke/utils/dataframe.py,sha256=cPbCl_paACCtO0twCiHKUcEKIYiT89WDwQ-f5I9oKrg,6841
 psyke/utils/logic.py,sha256=P_hmhpRhpyCzWwOS1uOWGzvNAh6Eo10wbOBUQNZ_Rxo,12236
 psyke/utils/metrics.py,sha256=Oo5BOonOSfo0qYsXWT5dmypZ7jiStByFC2MKEU0uMHg,2250
 psyke/utils/plot.py,sha256=dE8JJ6tQ0Ezosid-r2jqAisREjFe5LqExRzsVi5Ns-c,7785
 psyke/utils/sorted.py,sha256=C3CPW2JisND30BRk5c1sAAHs3Lb_wsRB2qZrYFuRnfM,678
-psyke-0.8.14.dev4.dist-info/licenses/LICENSE,sha256=KP9K6Hgezf_xdMFW7ORyKz9uA8Y8k52YJn292wcP-_E,11354
-psyke-0.8.14.dev4.dist-info/METADATA,sha256=CyJWqYqgEEqMKyv0AcI0TzVkwUVRJt-Q7IaILWqWbbM,8395
-psyke-0.8.14.dev4.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-psyke-0.8.14.dev4.dist-info/top_level.txt,sha256=q1HglxOqqoIRukFtyis_ZNHczZg4gANRUPWkD7HAUTU,6
-psyke-0.8.14.dev4.dist-info/RECORD,,
+psyke-0.8.15.dist-info/licenses/LICENSE,sha256=KP9K6Hgezf_xdMFW7ORyKz9uA8Y8k52YJn292wcP-_E,11354
+psyke-0.8.15.dist-info/METADATA,sha256=_hP1lBjndLBLumETFJ7ojWfEgSz3nKo6kQaeemuYntI,8390
+psyke-0.8.15.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+psyke-0.8.15.dist-info/top_level.txt,sha256=q1HglxOqqoIRukFtyis_ZNHczZg4gANRUPWkD7HAUTU,6
+psyke-0.8.15.dist-info/RECORD,,