hossam 0.4.15__py3-none-any.whl → 0.4.16__py3-none-any.whl

hossam/hs_plot.py

@@ -22,7 +22,7 @@ from statsmodels.nonparametric.smoothers_lowess import lowess as sm_lowess
 from statannotations.Annotator import Annotator
 
 # ===================================================================
-from sklearn.cluster._kmeans import KMeans
+from sklearn.cluster import AgglomerativeClustering, KMeans
 
 from sklearn.metrics import (
     mean_squared_error,
@@ -2559,7 +2559,7 @@ def distribution_plot(
 
 
 def silhouette_plot(
-    estimator: KMeans,
+    estimator: KMeans | AgglomerativeClustering,
     data: DataFrame,
     title: str | None = None,
     width: int = config.width,
@@ -2574,7 +2574,7 @@ def silhouette_plot(
     군집분석 결과의 실루엣 플롯을 시각화함.
 
     Args:
-        estimator (KMeans): 학습된 KMeans 군집 모델 객체.
+        estimator (KMeans | AgglomerativeClustering): 학습된 KMeans 또는 AgglomerativeClustering 군집 모델 객체.
         data (DataFrame): 군집분석에 사용된 입력 데이터 (n_samples, n_features).
         title (str, optional): 플롯 제목. None이면 자동 생성.
         width (int, optional): 플롯 가로 크기 (inch 단위).
@@ -2605,7 +2605,15 @@ def silhouette_plot(
     y_lower = 10
 
     # 클러스터링 갯수별로 fill_betweenx( )형태의 막대 그래프 표현.
-    for i in range(estimator.n_clusters):  # type: ignore
+    n_clusters: int = 0
+    if hasattr(estimator, "n_clusters") and estimator.n_clusters is not None:   # type: ignore
+        n_clusters = estimator.n_clusters  # type: ignore
+    elif hasattr(estimator, "n_clusters_") and estimator.n_clusters_ is not None:    # type: ignore
+        n_clusters = estimator.n_clusters_  # type: ignore
+    else:
+        n_clusters = len(np.unique(estimator.labels_))  # type: ignore
+
+    for i in range(n_clusters):  # type: ignore
         ith_cluster_sil_values = sil_values[estimator.labels_ == i]  # type: ignore
         ith_cluster_sil_values.sort()  # type: ignore
 
@@ -2626,18 +2634,18 @@ def silhouette_plot(
     ax.set_xlabel("The silhouette coefficient values")  # type: ignore
     ax.set_ylabel("Cluster label")  # type: ignore
     ax.set_xlim([-0.1, 1])  # type: ignore
-    ax.set_ylim([0, len(data) + (estimator.n_clusters + 1) * 10])  # type: ignore
+    ax.set_ylim([0, len(data) + (n_clusters + 1) * 10])  # type: ignore
     ax.set_yticks([])  # type: ignore
     ax.set_xticks([0, 0.2, 0.4, 0.6, 0.8, 1])  # type: ignore
 
     if title is None:
-        title = "Number of Cluster : " + str(estimator.n_clusters) + ", Silhouette Score :" + str(round(sil_avg, 3))  # type: ignore
+        title = "Number of Cluster : " + str(n_clusters) + ", Silhouette Score :" + str(round(sil_avg, 3))  # type: ignore
 
     finalize_plot(ax, callback, outparams, save_path, True, title)  # type: ignore
 
 
 def cluster_plot(
-    estimator: KMeans | None = None,
+    estimator: KMeans | AgglomerativeClustering | None = None,
     data: DataFrame | None = None,
     xname: str | None = None,
     yname: str | None = None,
@@ -2748,7 +2756,7 @@ def cluster_plot(
 
 
 def visualize_silhouette(
-    estimator: KMeans,
+    estimator: KMeans | AgglomerativeClustering,
     data: DataFrame,
     xname: str | None = None,
     yname: str | None = None,
@@ -2765,7 +2773,7 @@ def visualize_silhouette(
     군집분석 결과의 실루엣 플롯과 군집 산점도를 한 화면에 함께 시각화함.
 
     Args:
-        estimator (KMeans): 학습된 KMeans 군집 모델 객체.
+        estimator (KMeans | AgglomerativeClustering): 학습된 KMeans 또는 AgglomerativeClustering 군집 모델 객체.
         data (DataFrame): 군집분석에 사용된 입력 데이터 (n_samples, n_features).
         xname (str, optional): 산점도 x축에 사용할 컬럼명. None이면 첫 번째 컬럼 사용.
         yname (str, optional): 산점도 y축에 사용할 컬럼명. None이면 두 번째 컬럼 사용.

{hossam-0.4.15.dist-info → hossam-0.4.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hossam
-Version: 0.4.15
+Version: 0.4.16
 Summary: Hossam Data Helper
 Author-email: Lee Kwang-Ho <leekh4232@gmail.com>
 License-Expression: MIT

{hossam-0.4.15.dist-info → hossam-0.4.16.dist-info}/RECORD

@@ -3,15 +3,15 @@ hossam/__init__.py,sha256=lJ-_g2HAmFnixOmKjCv7_cMSdiYwbM6SNlHEtptUlUI,4045
 hossam/hs_classroom.py,sha256=Sb1thy49LKn2zU90aiOVwHWhyWSMHLZbZX7eXmQlquc,27523
 hossam/hs_cluster.py,sha256=umgJRRr9vXkaFVIs6V_K3SrOo6Q5AEqVYmQSMaGj7rY,31945
 hossam/hs_gis.py,sha256=DVmndBK-_7GMK3J1_on3ieEQk1S0MfUZ8_wlX-cDdZQ,11581
-hossam/hs_plot.py,sha256=Xv5aBJ8PibAW9QP-cvv0mHM7MQkByNs0mZKArrDcWwY,94918
+hossam/hs_plot.py,sha256=xE3blKlggntXqfAJpORYrxylmgwSQfG4Of2aBceF6t4,95515
 hossam/hs_prep.py,sha256=ypuX97mCxpo7CLoI_S79bUw7th0ok5LCZjt4vzRaGiI,38326
 hossam/hs_stats.py,sha256=MDS3rvaXDP8aYwcE36JTetWiZgE4fkXnNo0vwlXu-pA,119890
 hossam/hs_study.py,sha256=ZzL76_V0IHnk_YUTbWncIIBruOj2Sz3xs91snS6cpu0,2776
 hossam/hs_timeserise.py,sha256=NzGV4bJmVQr3qUFySOP25qENItmloYjgh3VgwSbSmXc,43163
 hossam/hs_util.py,sha256=ptl-2W7-0Ad_BemZMR8cFnDt6-SHCRRCk1Gh7giFjSs,16149
 hossam/leekh.png,sha256=1PB5NQ24SDoHA5KMiBBsWpSa3iniFcwFTuGwuOsTHfI,6395
-hossam-0.4.15.dist-info/licenses/LICENSE,sha256=nIqzhlcFY_2D6QtFsYjwU7BWkafo-rUJOQpDZ-DsauI,941
-hossam-0.4.15.dist-info/METADATA,sha256=XhcpBu7ZhjNeWCaPfJQxhmCj8IOHFqY0IJOX8SjJ_qk,3803
-hossam-0.4.15.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-hossam-0.4.15.dist-info/top_level.txt,sha256=_-7bwjhthHplWhywEaHIJX2yL11CQCaLjCNSBlk6wiQ,7
-hossam-0.4.15.dist-info/RECORD,,
+hossam-0.4.16.dist-info/licenses/LICENSE,sha256=nIqzhlcFY_2D6QtFsYjwU7BWkafo-rUJOQpDZ-DsauI,941
+hossam-0.4.16.dist-info/METADATA,sha256=iMd8FAm4u9Q9dk6gI_b1jWhYNKGD3jnlQ9Gmb3v6kig,3803
+hossam-0.4.16.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+hossam-0.4.16.dist-info/top_level.txt,sha256=_-7bwjhthHplWhywEaHIJX2yL11CQCaLjCNSBlk6wiQ,7
+hossam-0.4.16.dist-info/RECORD,,