psyke 0.8.5__tar.gz → 0.8.6.dev2__tar.gz

{psyke-0.8.5/psyke.egg-info → psyke-0.8.6.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: psyke
-Version: 0.8.5
+Version: 0.8.6.dev2
 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.6.dev2/VERSION

@@ -0,0 +1 @@
+0.8.6.dev2

{psyke-0.8.5 → psyke-0.8.6.dev2}/psyke/extraction/cart/__init__.py

@@ -52,7 +52,7 @@ class Cart(PedagogicalExtractor):
         nodes = [node for node in self._cart_predictor]
         nodes = Cart._simplify_nodes(nodes) if self._simplify else nodes
         for (constraints, prediction) in nodes:
-            if self.normalization is not None:
+            if self.normalization is not None and data.columns[-1] in self.normalization:
                 m, s = self.normalization[data.columns[-1]]
                 prediction = prediction * s + m
             variables = create_variable_list(self.discretization, data)

{psyke-0.8.5 → psyke-0.8.6.dev2}/psyke/tuning/__init__.py

@@ -84,4 +84,6 @@ class IterativeOptimizer(Optimizer, ABC):
     def _check_iteration_improvement(self, best, current):
         improvement = \
             self._iteration_improvement([best[0], best[1]], [current[0], current[1]]) if best is not None else np.inf
+        if isinstance(improvement, complex):
+            improvement = 1.0
         return current, improvement < 1.2

{psyke-0.8.5 → psyke-0.8.6.dev2}/psyke/tuning/pedro/__init__.py

@@ -98,21 +98,25 @@ class PEDRO(SKEOptimizer, IterativeOptimizer):
         return False
 
     def search(self):
-        base_strategy = FixedStrategy(2)
-        strategies = [base_strategy, FixedStrategy(3)]
-
-        base_partitions = base_strategy.partition_number(self.dataframe.columns[:-1])
+        base_partitions = FixedStrategy(2).partition_number(self.dataframe.columns[:-1]) * 3
+        if base_partitions <= 50:
+            strategies = [FixedStrategy(2)]
+            if FixedStrategy(3).partition_number(self.dataframe.columns[:-1]) <= base_partitions:
+                strategies.append(FixedStrategy(3))
+        else:
+            strategies = []
+            base_partitions = 50
 
         for n in [2, 3, 5, 10]:
             for th in [0.99, 0.75, 0.67, 0.5, 0.3]:
                 strategy = AdaptiveStrategy(self.ranked, [(th, n)])
-                if strategy.partition_number(self.dataframe.columns[:-1]) < base_partitions * 3 and \
+                if strategy.partition_number(self.dataframe.columns[:-1]) < base_partitions and \
                         not self.__contains(strategies, strategy):
                     strategies.append(strategy)
 
         for (a, b) in [(0.33, 0.67), (0.25, 0.75), (0.1, 0.9)]:
             strategy = AdaptiveStrategy(self.ranked, [(a, 2), (b, 3)])
-            if strategy.partition_number(self.dataframe.columns[:-1]) < base_partitions * 3 and \
+            if strategy.partition_number(self.dataframe.columns[:-1]) < base_partitions and \
                     not self.__contains(strategies, strategy):
                 strategies.append(strategy)
 
@@ -125,7 +129,7 @@ class PEDRO(SKEOptimizer, IterativeOptimizer):
         for strategy in strategies:
             params += self._search_depth(strategy,
                                          strategy.partition_number(self.dataframe.columns[:-1]) > avg,
-                                         base_partitions * 3)
+                                         base_partitions)
         self.params = params
 
     def _print_params(self, name, params):

{psyke-0.8.5 → psyke-0.8.6.dev2/psyke.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: psyke
-Version: 0.8.5
+Version: 0.8.6.dev2
 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.5/VERSION

@@ -1 +0,0 @@
-0.8.5