icol 0.10.0__py3-none-any.whl → 0.10.2__py3-none-any.whl

icol/logistic_icol.py

@@ -131,7 +131,7 @@ class LOGISTIC_ADALASSO:
         nonancols = np.isnan(X).sum(axis=0)==0
         noinfcols = np.isinf(X).sum(axis=0)==0
         valcols = np.logical_and(nonancols, noinfcols)
-        if self.gamma <= 1e-10:
+        if np.abs(self.gamma) <= 1e-10:
             beta_hat = np.ones(X.shape[1])
             w_hat = np.ones(X.shape[1])
             X_star_star = X.copy()
@@ -159,9 +159,10 @@ class LOGISTIC_ADALASSO:
                 break
 
         self.model_idx = best_idx
-        self.coef_idx_ = np.arange(len(self.coef_))[np.abs(np.ravel(self.coef_)) > self.eps_nnz]
-
         beta_hat_star_star = self.models[self.model_idx].coef_.ravel()
+
+        self.coef_idx_ = np.arange(len(beta_hat_star_star))[np.abs(np.ravel(beta_hat_star_star)) > self.eps_nnz]
+
         beta_hat_star_n_valcol = np.array([beta_hat_star_star[j]/w_hat[j] for j in range(len(beta_hat_star_star))])
         beta_hat_star_n = np.zeros(X.shape[1])
         beta_hat_star_n[valcols] = beta_hat_star_n_valcol
@@ -171,7 +172,6 @@ class LOGISTIC_ADALASSO:
         self.model.coef_ = self.coef_
 
         return self
-
     
     def _count_nnz(self, coef):
         return int(np.sum(
@@ -179,9 +179,7 @@ class LOGISTIC_ADALASSO:
             ))
     
     def __str__(self):
-        params = self.get_params()
-        params_str = ", ".join(f"{k}={params[k]!r}" for k in sorted(params))
-        return f"LogisticLasso({params_str})"
+        return f"Logistic{0}Lasso".format("Ada" if np.abs(self.gamma)<=1e-10 else '')
     
     def decision_function(self, X):
         return np.dot(X, self.model.coef_.ravel())

{icol-0.10.0.dist-info → icol-0.10.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: icol
-Version: 0.10.0
+Version: 0.10.2
 Summary: Iterative Correlation Learning implementation
 Author-email: Simon Teshuva <simon.teshuva@gmail.com>
 License: MIT

icol-0.10.2.dist-info/RECORD

@@ -0,0 +1,9 @@
+icol/__init__.py,sha256=nnhJPjnFCpho8OB-5q-Mq8J91EeCV_o3KVO-lLC8tQY,173
+icol/feature_expansion.py,sha256=frWmfvneP1lFxMm-b_oVoRT2zvLk2WpqBM1Pzpb2rJQ,12520
+icol/icol.py,sha256=uZihshYZydEL4gU32CWVtx5CsTr-fuypZER5gwLSaPU,29228
+icol/logistic_icol.py,sha256=4K3CvgckaIUj19FNNSww9-9kY0VyN5A3e8d6Lb8lsk0,16365
+icol-0.10.2.dist-info/LICENSE,sha256=aD00NFSvGfojy-IWFmtKpeSg262O0dWzmsfXAaT0xuk,1070
+icol-0.10.2.dist-info/METADATA,sha256=ME6sk7A2YsIPzxwN99FyZHreWz1E7n3VZGbHfyD1hpU,1978
+icol-0.10.2.dist-info/WHEEL,sha256=WnJ8fYhv8N4SYVK2lLYNI6N0kVATA7b0piVUNvqIIJE,91
+icol-0.10.2.dist-info/top_level.txt,sha256=OKisIKQUWtt2x-hxR53qbTr2AR3kdeRfTChIdmn2sDY,5
+icol-0.10.2.dist-info/RECORD,,

icol-0.10.0.dist-info/RECORD

@@ -1,9 +0,0 @@
-icol/__init__.py,sha256=nnhJPjnFCpho8OB-5q-Mq8J91EeCV_o3KVO-lLC8tQY,173
-icol/feature_expansion.py,sha256=frWmfvneP1lFxMm-b_oVoRT2zvLk2WpqBM1Pzpb2rJQ,12520
-icol/icol.py,sha256=uZihshYZydEL4gU32CWVtx5CsTr-fuypZER5gwLSaPU,29228
-icol/logistic_icol.py,sha256=L3t60n29x-7NQ6ZH0gJDP82QWzyphW11C-TFucL0B2c,16413
-icol-0.10.0.dist-info/LICENSE,sha256=aD00NFSvGfojy-IWFmtKpeSg262O0dWzmsfXAaT0xuk,1070
-icol-0.10.0.dist-info/METADATA,sha256=NcX0bGJ6JmESs4u4WTVBaa87n1lVuVsJLvHPfyd6ewQ,1978
-icol-0.10.0.dist-info/WHEEL,sha256=WnJ8fYhv8N4SYVK2lLYNI6N0kVATA7b0piVUNvqIIJE,91
-icol-0.10.0.dist-info/top_level.txt,sha256=OKisIKQUWtt2x-hxR53qbTr2AR3kdeRfTChIdmn2sDY,5
-icol-0.10.0.dist-info/RECORD,,