deskit 1.2.1__tar.gz → 1.2.2__tar.gz

{deskit-1.2.1/src/deskit.egg-info → deskit-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deskit
-Version: 1.2.1
+Version: 1.2.2
 Summary: A Python library for Dynamic Ensemble Selection
 Author: Tikhon Vodyanov
 License-Expression: MIT

{deskit-1.2.1 → deskit-1.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "deskit"
-version = "1.2.1"
+version = "1.2.2"
 description = "A Python library for Dynamic Ensemble Selection"
 readme = "README.md"
 license = "MIT"

{deskit-1.2.1 → deskit-1.2.2}/src/deskit/des/dewsi.py

@@ -69,7 +69,7 @@ class DEWSI(KNNBase):
         )
         super().fit(features, y, preds_dict)
 
-    def _weights_batch(self, x, temperature=None, threshold=None):
+    def _weights_batch(self, x, temperature=None, threshold=None, k=None):
         """
         Core weight computation. x is a 2-D float64 numpy array (batch, n_features).
         Returns (batch, n_models) weight array.
@@ -79,7 +79,7 @@ class DEWSI(KNNBase):
              (0.5 if self.mode == 'min' else 1.0))
         th = threshold if threshold is not None else self.threshold
 
-        distances, indices = self.model.kneighbors(x)               # both (batch, k)
+        distances, indices = self.model.kneighbors(x, k=k)               # both (batch, k)
 
         # Inverse-distance-weighted average of each model's scores over K neighbors
         inv_dist   = 1.0 / np.maximum(distances, 1e-8)              # (batch, k)

{deskit-1.2.1 → deskit-1.2.2}/src/deskit/des/dewsiv.py

@@ -84,7 +84,7 @@ class DEWSIV(KNNBase):
                 preds = np.asarray(preds_dict[name])
                 self._var_matrix[:, j] = np.vectorize(_signed_residual)(y, preds)
 
-    def _weights_batch(self, x, temperature=None, threshold=None):
+    def _weights_batch(self, x, temperature=None, threshold=None, k=None):
         """
         Core weight computation. x is a 2-D float64 numpy array (batch, n_features).
         Returns (batch, n_models) weight array.
@@ -94,7 +94,7 @@ class DEWSIV(KNNBase):
              (0.5 if self.mode == 'min' else 1.0))
         th = threshold if threshold is not None else self.threshold
 
-        distances, indices = self.model.kneighbors(x)                # both (batch, k)
+        distances, indices = self.model.kneighbors(x, k=k)                # both (batch, k)
 
         # Inverse-distance weights
         inv_dist   = 1.0 / np.maximum(distances, 1e-8)               # (batch, k)

{deskit-1.2.1 → deskit-1.2.2}/src/deskit/des/dewst.py

@@ -86,7 +86,7 @@ class DEWST(KNNBase):
         )
         super().fit(features, y, preds_dict)
 
-    def _weights_batch(self, x, temperature=None, threshold=None):
+    def _weights_batch(self, x, temperature=None, threshold=None, k=None, r2_threshold=None):
         """
         Core weight computation. x is a 2-D float64 numpy array (batch, n_features).
         Returns (batch, n_models) weight array.
@@ -94,9 +94,10 @@ class DEWST(KNNBase):
         t  = temperature if temperature is not None else (
              self._temperature if self._temperature is not None else
              (0.5 if self._real_mode == 'min' else 1.0))
-        th = threshold if threshold is not None else self.threshold
+        th    = threshold    if threshold    is not None else self.threshold
+        r2_th = r2_threshold if r2_threshold is not None else self.r2_threshold
 
-        distances, indices = self.model.kneighbors(x)               # (batch, k)
+        distances, indices = self.model.kneighbors(x, k=k)          # (batch, k)
         k = distances.shape[1]
 
         # Inverse-distance weights
@@ -157,7 +158,7 @@ class DEWST(KNNBase):
             trend_scores = intercept
 
         # Blend: trust trend where R² ≥ threshold, fall back otherwise
-        use_trend  = r2 >= self.r2_threshold
+        use_trend  = r2 >= r2_th
         avg_scores = np.where(use_trend, trend_scores, dewsi_scores)
 
         # Standard DEWS softmax

{deskit-1.2.1 → deskit-1.2.2}/src/deskit/des/dewsu.py

@@ -65,7 +65,7 @@ class DEWSU(KNNBase):
         )
         super().fit(features, y, preds_dict)
 
-    def _weights_batch(self, x, temperature=None, threshold=None):
+    def _weights_batch(self, x, temperature=None, threshold=None, k=None):
         """
         Core weight computation. x is a 2-D float64 numpy array (batch, n_features).
         Returns (batch, n_models) weight array.
@@ -75,7 +75,7 @@ class DEWSU(KNNBase):
              (0.5 if self.mode == 'min' else 1.0))
         th = threshold if threshold is not None else self.threshold
 
-        _, indices = self.model.kneighbors(x)                        # (batch, k)
+        _, indices = self.model.kneighbors(x, k=k)                        # (batch, k)
 
         # Average each model's scores over the K neighbors
         avg_scores = self.matrix[indices].mean(axis=1)               # (batch, n_models)

{deskit-1.2.1 → deskit-1.2.2}/src/deskit/des/dewsv.py

@@ -84,7 +84,7 @@ class DEWSV(KNNBase):
                 preds = np.asarray(preds_dict[name])
                 self._var_matrix[:, j] = np.vectorize(_signed_residual)(y, preds)
 
-    def _weights_batch(self, x, temperature=None, threshold=None):
+    def _weights_batch(self, x, temperature=None, threshold=None, k=None):
         """
         Core weight computation. x is a 2-D float64 numpy array (batch, n_features).
         Returns (batch, n_models) weight array.
@@ -94,7 +94,7 @@ class DEWSV(KNNBase):
              (0.5 if self.mode == 'min' else 1.0))
         th = threshold if threshold is not None else self.threshold
 
-        _, indices = self.model.kneighbors(x)                        # (batch, k)
+        _, indices = self.model.kneighbors(x, k=k)                        # (batch, k)
 
         # Uniform average of each model's scores over K neighbors
         neighbor_scores = self.matrix[indices]                        # (batch, k, n_models)

{deskit-1.2.1 → deskit-1.2.2}/src/deskit/des/knorae.py

@@ -55,7 +55,7 @@ class KNORAE(KNNBase):
         )
         super().fit(features, y, preds_dict)
 
-    def _weights_batch(self, x, temperature=None, threshold=None):
+    def _weights_batch(self, x, temperature=None, threshold=None, k=None):
         """
         Core weight computation. x is a 2-D float64 numpy array (batch, n_features).
         Returns (batch, n_models) weight array.
@@ -64,7 +64,7 @@ class KNORAE(KNNBase):
         th       = threshold if threshold is not None else self.threshold
         n_models = len(self.models)
 
-        _, indices      = self.model.kneighbors(x)
+        _, indices      = self.model.kneighbors(x, k=k)
         k               = indices.shape[1]
         neighbor_scores = self.matrix[indices]                        # (batch, k, n_models)
 

{deskit-1.2.1 → deskit-1.2.2}/src/deskit/des/knoraiu.py

@@ -56,7 +56,7 @@ class KNORAIU(KNNBase):
         )
         super().fit(features, y, preds_dict)
 
-    def _weights_batch(self, x, temperature=None, threshold=None):
+    def _weights_batch(self, x, temperature=None, threshold=None, k=None):
         """
         Core weight computation. x is a 2-D float64 numpy array (batch, n_features).
         Returns (batch, n_models) weight array.
@@ -64,7 +64,7 @@ class KNORAIU(KNNBase):
         """
         th = threshold if threshold is not None else self.threshold
 
-        distances, indices = self.model.kneighbors(x)                # both (batch, k)
+        distances, indices = self.model.kneighbors(x, k=k)                # both (batch, k)
         neighbor_scores    = self.matrix[indices]                     # (batch, k, n_models)
 
         # Normalize per neighbor: best model = 1.0, worst = 0.0

{deskit-1.2.1 → deskit-1.2.2}/src/deskit/des/knorau.py

@@ -56,7 +56,7 @@ class KNORAU(KNNBase):
         )
         super().fit(features, y, preds_dict)
 
-    def _weights_batch(self, x, temperature=None, threshold=None):
+    def _weights_batch(self, x, temperature=None, threshold=None, k=None):
         """
         Core weight computation. x is a 2-D float64 numpy array (batch, n_features).
         Returns (batch, n_models) weight array.
@@ -64,7 +64,7 @@ class KNORAU(KNNBase):
         """
         th = threshold if threshold is not None else self.threshold
 
-        _, indices      = self.model.kneighbors(x)
+        _, indices      = self.model.kneighbors(x, k=k)
         neighbor_scores = self.matrix[indices]                        # (batch, k, n_models)
 
         # Normalize per neighbor: best model = 1.0, worst = 0.0

{deskit-1.2.1 → deskit-1.2.2}/src/deskit/des/lwsei.py

@@ -74,7 +74,7 @@ class LWSEI(PredictBase):
         self._y_val = y
         self._finder.fit(features)
 
-    def _weights_batch(self, x, temperature=None, **kwargs):
+    def _weights_batch(self, x, temperature=None, k=None, **kwargs):
         """
         Core weight computation. x is a 2-D float64 numpy array (batch, n_features).
         Returns (batch, n_models) weight array.
@@ -87,7 +87,7 @@ class LWSEI(PredictBase):
         n_models   = len(self.models)
         uniform    = np.full(n_models, 1.0 / n_models)
 
-        distances, indices = self._finder.kneighbors(x)              # (batch, k)
+        distances, indices = self._finder.kneighbors(x, k=k)              # (batch, k)
         weights_out        = np.empty((batch_size, n_models))
 
         for b in range(batch_size):

{deskit-1.2.1 → deskit-1.2.2}/src/deskit/des/lwseu.py

@@ -74,7 +74,7 @@ class LWSEU(PredictBase):
         self._y_val = y
         self._finder.fit(features)
 
-    def _weights_batch(self, x, temperature=None, **kwargs):
+    def _weights_batch(self, x, temperature=None, k=None, **kwargs):
         """
         Core weight computation. x is a 2-D float64 numpy array (batch, n_features).
         Returns (batch, n_models) weight array.
@@ -87,7 +87,7 @@ class LWSEU(PredictBase):
         n_models   = len(self.models)
         uniform    = np.full(n_models, 1.0 / n_models)
 
-        distances, indices = self._finder.kneighbors(x)              # (batch, k)
+        distances, indices = self._finder.kneighbors(x, k=k)              # (batch, k)
         weights_out        = np.empty((batch_size, n_models))
 
         for b in range(batch_size):

{deskit-1.2.1 → deskit-1.2.2}/src/deskit/des/ola.py

@@ -54,7 +54,7 @@ class OLA(KNNBase):
         if mat_max > mat_min:
             self.matrix = (self.matrix - mat_min) / (mat_max - mat_min)
 
-    def _weights_batch(self, x, temperature=None, threshold=None):
+    def _weights_batch(self, x, temperature=None, threshold=None, k=None):
         """
         Core weight computation. x is a 2-D float64 numpy array (batch, n_features).
         Returns (batch, n_models) weight array.
@@ -63,7 +63,7 @@ class OLA(KNNBase):
         """
         batch_size = x.shape[0]
 
-        _, indices  = self.model.kneighbors(x)
+        _, indices  = self.model.kneighbors(x, k=k)
         avg_scores  = self.matrix[indices].mean(axis=1)               # (batch, n_models)
         best_indices = np.argmax(avg_scores, axis=1)
 

{deskit-1.2.1 → deskit-1.2.2}/src/deskit/neighbors.py

@@ -89,11 +89,6 @@ _NMSLIB_METRIC_MAP = {
     'dot':        'negdotprod',
 }
 
-# Unified view for HNSWNeighborFinder validation: union of both backends.
-# We keep the old name for backwards compatibility.
-_HNSW_METRIC_MAP = _HNSWLIB_METRIC_MAP   # kept for any external references
-_HNSW_METRICS = _UNIVERSAL_METRICS  # partial — see fit() for fallback note
-
 # All metrics callable from the public API.
 ALL_METRICS = _KNN_METRICS | {'jensenshannon', 'dot'}
 

{deskit-1.2.1 → deskit-1.2.2/src/deskit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deskit
-Version: 1.2.1
+Version: 1.2.2
 Summary: A Python library for Dynamic Ensemble Selection
 Author: Tikhon Vodyanov
 License-Expression: MIT