psyke 0.7.5.dev8__py3-none-any.whl → 0.7.6__py3-none-any.whl

psyke/extraction/hypercubic/hex/__init__.py

@@ -3,7 +3,7 @@ import pandas as pd
 from sklearn.linear_model import LinearRegression
 
 from psyke import get_default_random_seed, Target
-from psyke.extraction.hypercubic import Grid, HyperCube, GenericCube, ClassificationCube
+from psyke.extraction.hypercubic import Grid, HyperCube, GenericCube, ClassificationCube, RegressionCube
 from psyke.extraction.hypercubic.gridex import GridEx
 
 
@@ -29,19 +29,16 @@ class HEx(GridEx):
     def _gain(self, parent_cube: GenericCube, new_cube: GenericCube) -> float:
         if isinstance(parent_cube, ClassificationCube):
             return parent_cube.output != new_cube.output
-        return parent_cube.diversity - new_cube.diversity > self.threshold / 3.0
+        return parent_cube.error - new_cube.error > self.threshold
 
     def _iterate(self, surrounding: HyperCube, dataframe: pd.DataFrame):
         fake = dataframe.copy()
         surrounding.update(dataframe, self.predictor)
         prev = [surrounding]
-        next_iteration = []
 
         for iteration in self.grid.iterate():
             next_iteration = []
             for cube in prev:
-                # subcubes =
-                # [c for c in self._merge(self._cubes_to_split(cube, iteration, dataframe, fake, True), fake)]
                 subcubes, fake = self._cubes_to_split(cube, surrounding, iteration, dataframe, fake, True)
                 cleaned = [c for c in subcubes if c.count(dataframe) > 0 and self._gain(cube, c)]
                 if len(subcubes) > len(cleaned):
@@ -51,4 +48,4 @@ class HEx(GridEx):
                     self._hypercubes = [cube] + self._hypercubes
                 next_iteration += self._merge(cleaned, fake)
             prev = next_iteration.copy()
-        self._hypercubes = [cube for cube in next_iteration] + self._hypercubes
+        self._hypercubes = [cube for cube in prev] + self._hypercubes

psyke/extraction/hypercubic/hypercube.py

@@ -70,6 +70,7 @@ class HyperCube:
         self._limits = limits if limits is not None else set()
         self._output = output
         self._diversity = 0.0
+        self._error = 0.0
         self._barycenter = Point([], [])
 
     def __contains__(self, point: dict[str, float]) -> bool:
@@ -115,6 +116,10 @@ class HyperCube:
     def diversity(self) -> float:
         return self._diversity
 
+    @property
+    def error(self) -> float:
+        return self._error
+
     @property
     def barycenter(self) -> Point:
         return self._barycenter
@@ -369,6 +374,7 @@ class HyperCube:
         predictions = predictor.predict(filtered)
         self._output = np.mean(predictions)
         self._diversity = np.std(predictions)
+        self._error = (abs(predictions - self._output)).mean()
         means = filtered.describe().loc['mean']
         self._barycenter = Point(means.index.values, means.values)
 
@@ -386,7 +392,7 @@ class RegressionCube(HyperCube):
         if len(filtered > 0):
             predictions = predictor.predict(filtered)
             self._output.fit(filtered, predictions)
-            self._diversity = (abs(self._output.predict(filtered) - predictions)).mean()
+            self._diversity = self._error = (abs(self._output.predict(filtered) - predictions)).mean()
             means = filtered.describe().loc['mean']
             self._barycenter = Point(means.index.values, means.values)
 
@@ -415,7 +421,7 @@ class ClassificationCube(HyperCube):
         if len(filtered > 0):
             predictions = predictor.predict(filtered)
             self._output = mode(predictions)
-            self._diversity = 1 - sum(prediction == self.output for prediction in predictions) / len(filtered)
+            self._diversity = self._error = 1 - sum(p == self.output for p in predictions) / len(predictions)
             means = filtered.describe().loc['mean']
             self._barycenter = Point(means.index.values, means.values)
 

{psyke-0.7.5.dev8.dist-info → psyke-0.7.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: psyke
-Version: 0.7.5.dev8
+Version: 0.7.6
 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.7.5.dev8.dist-info → psyke-0.7.6.dist-info}/RECORD

@@ -8,7 +8,7 @@ psyke/extraction/__init__.py,sha256=Zmq83HqmmDVyw-4KsaEVm52h8T2_Hy-lYSHF75hDIL8,
 psyke/extraction/cart/__init__.py,sha256=IilEP4DxSAK9_x5ehPTvopuwlQqBMpGMiNRo-f90rqQ,4179
 psyke/extraction/cart/predictor.py,sha256=2-2mv5fI0lTwwfTaEonxKh0ZUdhxuIEE6OP_rJxgmqc,3019
 psyke/extraction/hypercubic/__init__.py,sha256=0XUHTtUCClMBdyA0cLIq9D5gHfqqFiSVt3DsHDQy94M,6786
-psyke/extraction/hypercubic/hypercube.py,sha256=QqQdaelyrvv79r_rNErkeTCVPHVPahUe9KCrhAs_3HI,19849
+psyke/extraction/hypercubic/hypercube.py,sha256=TS-Iwd45my-mQmmg4L_1JarGHnTxvqlM1-x3FrunB-Q,20023
 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=OIfAZFFZVXKdvQvOut6NfUbey3TClR-W76DrlQH8LrM,1937
@@ -16,7 +16,7 @@ psyke/extraction/hypercubic/creepy/__init__.py,sha256=QcYGm3OHzUxutuuQ159oUNwr-4
 psyke/extraction/hypercubic/divine/__init__.py,sha256=qWoOeTNwNRD8VHZQLqVuv8Jfr4X2sGaQOylm8fw0m9g,3619
 psyke/extraction/hypercubic/gridex/__init__.py,sha256=QWgfIDojpb38DC7Z49KyyPCHqb2-3GIkBWa2ApjMNl4,5688
 psyke/extraction/hypercubic/gridrex/__init__.py,sha256=h9usK5tFqd6ngBmRydsgkfQ1jlcQKj2uG72Tr1puFHk,595
-psyke/extraction/hypercubic/hex/__init__.py,sha256=uLO8geJ1BjWPkhhjXkhDafx8rlNGSWI5Z-jEL3SN41o,2641
+psyke/extraction/hypercubic/hex/__init__.py,sha256=pAog2-sRbhLJSbOHcJs-6WV9SFYTRDJawNfyTVGhw1c,2465
 psyke/extraction/hypercubic/iter/__init__.py,sha256=E_Z8KLTei71n_Hd4p7eXvR8tjRoLdVBWLh-ph7x0JSs,10141
 psyke/extraction/real/__init__.py,sha256=DN9z51QdldUh1g9rzh7H8bgvZJZ-qOKpTQvHKR8NkAI,6417
 psyke/extraction/real/utils.py,sha256=eHGU-Y0inn_8jrk9lMcuRUKXpsTkI-s_myXSWz4bALQ,2190
@@ -33,8 +33,8 @@ psyke/utils/logic.py,sha256=7bbW6qcKof5PlqoQ0n5Kt3Obcot-KqGAvpE8rMXvEPE,12419
 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.7.5.dev8.dist-info/LICENSE,sha256=KP9K6Hgezf_xdMFW7ORyKz9uA8Y8k52YJn292wcP-_E,11354
-psyke-0.7.5.dev8.dist-info/METADATA,sha256=d-cxB_aCypHW4ZoYKYDmXX9q4KydZEHSmCDEQKAC_ac,8107
-psyke-0.7.5.dev8.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-psyke-0.7.5.dev8.dist-info/top_level.txt,sha256=q1HglxOqqoIRukFtyis_ZNHczZg4gANRUPWkD7HAUTU,6
-psyke-0.7.5.dev8.dist-info/RECORD,,
+psyke-0.7.6.dist-info/LICENSE,sha256=KP9K6Hgezf_xdMFW7ORyKz9uA8Y8k52YJn292wcP-_E,11354
+psyke-0.7.6.dist-info/METADATA,sha256=ZYT-3xeCAaJG5rXimqM726Y06stZ-O858gf8LmRrM_U,8102
+psyke-0.7.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+psyke-0.7.6.dist-info/top_level.txt,sha256=q1HglxOqqoIRukFtyis_ZNHczZg4gANRUPWkD7HAUTU,6
+psyke-0.7.6.dist-info/RECORD,,