psyke 0.8.2.dev3__py3-none-any.whl → 0.8.2.dev8__py3-none-any.whl

psyke/extraction/hypercubic/__init__.py

@@ -1,8 +1,6 @@
 from __future__ import annotations
 
 from abc import ABC
-from itertools import groupby
-from typing import Iterable
 import numpy as np
 import pandas as pd
 from sklearn.base import ClassifierMixin
@@ -16,7 +14,7 @@ from psyke.extraction.hypercubic.hypercube import HyperCube, RegressionCube, Cla
     GenericCube
 from psyke.hypercubepredictor import HyperCubePredictor
 from psyke.schema import Between, Outside, Value
-from psyke.utils.logic import create_variable_list, create_head, to_var, Simplifier, last_in_body, PRECISION
+from psyke.utils.logic import create_variable_list, create_head, to_var, Simplifier
 from psyke.utils import Target
 from psyke.extraction.hypercubic.strategy import Strategy, FixedStrategy
 

psyke/extraction/hypercubic/hypercube.py

@@ -415,8 +415,8 @@ class HyperCube:
 
 
 class RegressionCube(HyperCube):
-    def __init__(self, dimension: dict[str, tuple] = None, output=LinearRegression()):
-        super().__init__(dimension=dimension, output=output)
+    def __init__(self, dimension: dict[str, tuple] = None, output=None):
+        super().__init__(dimension=dimension, output=LinearRegression() if output is None else output)
 
     def update(self, dataset: pd.DataFrame, predictor) -> None:
         filtered = self.filter_dataframe(dataset.iloc[:, :-1])
@@ -428,7 +428,13 @@ class RegressionCube(HyperCube):
             self._barycenter = Point(means.index.values, means.values)
 
     def copy(self) -> RegressionCube:
-        return RegressionCube(self.dimensions.copy(), output=self._output)
+        output = LinearRegression()
+        try:
+            output.coef_ = self.output.coef_.copy()
+            output.intercept_ = self.output.intercept_
+        except AttributeError:
+            pass
+        return RegressionCube(self.dimensions.copy(), output=output)
 
     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(
@@ -489,11 +495,17 @@ class ClosedCube(HyperCube):
 
 
 class ClosedRegressionCube(ClosedCube, RegressionCube):
-    def __init__(self, dimension: dict[str, tuple] = None, output: LinearRegression = LinearRegression()):
-        super().__init__(dimension=dimension, output=output)
+    def __init__(self, dimension: dict[str, tuple] = None, output=None):
+        super().__init__(dimension=dimension, output=LinearRegression() if output is None else output)
 
     def copy(self) -> ClosedRegressionCube:
-        return ClosedRegressionCube(self.dimensions.copy(), output=self._output)
+        output = LinearRegression()
+        try:
+            output.coef_ = self.output.coef_.copy()
+            output.intercept_ = self.output.intercept_
+        except AttributeError:
+            pass
+        return ClosedRegressionCube(self.dimensions.copy(), output=output)
 
 
 class ClosedClassificationCube(ClosedCube, ClassificationCube):

{psyke-0.8.2.dev3.dist-info → psyke-0.8.2.dev8.dist-info}/METADATA

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

@@ -7,8 +7,8 @@ psyke/clustering/exact/__init__.py,sha256=GpMGOcN2bGn3wfaUKOdis3vnLEtAx9j886qsk-
 psyke/extraction/__init__.py,sha256=ziZ8T9eAOZjKipepE5_j1zfZgyFPONjW8MGERSk83nI,743
 psyke/extraction/cart/__init__.py,sha256=s8tr7jPhONgF0pfetHieFax2MD8cy6ddOS7dRWzZLjc,3579
 psyke/extraction/cart/predictor.py,sha256=2-2mv5fI0lTwwfTaEonxKh0ZUdhxuIEE6OP_rJxgmqc,3019
-psyke/extraction/hypercubic/__init__.py,sha256=ELY0a7MrZgUvzDORm_GbnvfbviDpCwZlXFHrQw-g_Lk,10451
-psyke/extraction/hypercubic/hypercube.py,sha256=Uqrpm3jB4UngLJlotzeQExoDRcgi3l3Ur3KyCVgjuDE,22322
+psyke/extraction/hypercubic/__init__.py,sha256=4RZkE5uLpLGUSY6G7cmwwEx1PC1cAaGZhM_HSwzlmOw,10368
+psyke/extraction/hypercubic/hypercube.py,sha256=vYJoIEAsiIY5koh84hnSdd72PPc-7-RP_1Eo5vvjxk4,22754
 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
@@ -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.8.2.dev3.dist-info/LICENSE,sha256=KP9K6Hgezf_xdMFW7ORyKz9uA8Y8k52YJn292wcP-_E,11354
-psyke-0.8.2.dev3.dist-info/METADATA,sha256=j9xt5m18B6c47PK4_jysS3QfpU8pki4hYfaKJ16Gyc4,8107
-psyke-0.8.2.dev3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-psyke-0.8.2.dev3.dist-info/top_level.txt,sha256=q1HglxOqqoIRukFtyis_ZNHczZg4gANRUPWkD7HAUTU,6
-psyke-0.8.2.dev3.dist-info/RECORD,,
+psyke-0.8.2.dev8.dist-info/LICENSE,sha256=KP9K6Hgezf_xdMFW7ORyKz9uA8Y8k52YJn292wcP-_E,11354
+psyke-0.8.2.dev8.dist-info/METADATA,sha256=Hb7rgFJQJ1JAQ0st4hyOfyFGYPN0xA5SHvggws2C-ik,8107
+psyke-0.8.2.dev8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+psyke-0.8.2.dev8.dist-info/top_level.txt,sha256=q1HglxOqqoIRukFtyis_ZNHczZg4gANRUPWkD7HAUTU,6
+psyke-0.8.2.dev8.dist-info/RECORD,,