pyerualjetwork 2.1.8__tar.gz → 2.2.0__tar.gz

{pyerualjetwork-2.1.8 → pyerualjetwork-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyerualjetwork
-Version: 2.1.8
+Version: 2.2.0
 Summary:  8 new functions: multiple_evaluate , encode_one_hot, split, metrics, decode_one_hot, roc_curve, confusion_matrix, plot_evaluate And Code improvements (Documentation in desc. Examples in GİTHUB: https://github.com/HCB06/PyerualJetwork)
 Author: Hasan Can Beydili
 Author-email: tchasancan@gmail.com

{pyerualjetwork-2.1.8 → pyerualjetwork-2.2.0}/plan_bi/plan_bi.py

@@ -1171,13 +1171,14 @@ def split(X, y, test_size, random_state):
     return x_train, x_test, y_train, y_test
 
 
-def metrics(y_ts, test_preds):
+def metrics(y_ts, test_preds, average='weighted'):
     """
     Calculates precision, recall and F1 score for a classification task.
-
+    
     Args:
-        y_test (list or numpy.ndarray): True labels.
+        y_ts (list or numpy.ndarray): True labels.
         test_preds (list or numpy.ndarray): Predicted labels.
+        average (str): Type of averaging ('micro', 'macro', 'weighted').
 
     Returns:
         tuple: Precision, recall, F1 score.
@@ -1218,17 +1219,29 @@ def metrics(y_ts, test_preds):
     for c in classes:
         precision[c] = tp[c] / (tp[c] + fp[c]) if (tp[c] + fp[c]) > 0 else 0
         recall[c] = tp[c] / (tp[c] + fn[c]) if (tp[c] + fn[c]) > 0 else 0
-        f1[c] = 2 * (precision[c] * recall[c]) / (precision[c] +
-                                                  recall[c]) if (precision[c] + recall[c]) > 0 else 0
+        f1[c] = 2 * (precision[c] * recall[c]) / (precision[c] + recall[c]) if (precision[c] + recall[c]) > 0 else 0
+
+    if average == 'micro':
+        precision_val = np.sum(list(tp.values())) / (np.sum(list(tp.values())) + np.sum(list(fp.values()))) if (np.sum(list(tp.values())) + np.sum(list(fp.values()))) > 0 else 0
+        recall_val = np.sum(list(tp.values())) / (np.sum(list(tp.values())) + np.sum(list(fn.values()))) if (np.sum(list(tp.values())) + np.sum(list(fn.values()))) > 0 else 0
+        f1_val = 2 * (precision_val * recall_val) / (precision_val + recall_val) if (precision_val + recall_val) > 0 else 0
+
+    elif average == 'macro':
+        precision_val = np.mean(list(precision.values()))
+        recall_val = np.mean(list(recall.values()))
+        f1_val = np.mean(list(f1.values()))
+
+    elif average == 'weighted':
+        weights = np.array([np.sum(y_test_d == c) for c in classes])
+        weights = weights / np.sum(weights)
+        precision_val = np.sum([weights[i] * precision[classes[i]] for i in range(len(classes))])
+        recall_val = np.sum([weights[i] * recall[classes[i]] for i in range(len(classes))])
+        f1_val = np.sum([weights[i] * f1[classes[i]] for i in range(len(classes))])
 
-    micro_precision = np.sum(list(tp.values())) / (np.sum(list(tp.values())) + np.sum(
-        list(fp.values()))) if (np.sum(list(tp.values())) + np.sum(list(fp.values()))) > 0 else 0
-    micro_recall = np.sum(list(tp.values())) / (np.sum(list(tp.values())) + np.sum(list(
-        fn.values()))) if (np.sum(list(tp.values())) + np.sum(list(fn.values()))) > 0 else 0
-    micro_f1 = 2 * (micro_precision * micro_recall) / (micro_precision +
-                                                       micro_recall) if (micro_precision + micro_recall) > 0 else 0
+    else:
+        raise ValueError("Invalid value for 'average'. Choose from 'micro', 'macro', 'weighted'.")
 
-    return micro_precision, micro_recall, micro_f1
+    return precision_val, recall_val, f1_val
 
 
 def decode_one_hot(encoded_data):
@@ -1348,13 +1361,14 @@ def plot_evaluate(y_test, y_preds, acc_list):
 
     y_true = np.array(y_true)
     y_preds = np.array(y_preds)
-    fpr, tpr, thresholds = roc_curve(y_true, y_preds)
-    precision, recall, f1 = metrics(y_test, y_preds)
     Class = np.unique(decode_one_hot(y_test))
+
+    precision, recall, f1 = metrics(y_test, y_preds)
     
-   
-    cm = confusion_matrix(y_true, y_preds, len(Class))
     
+    # Confusion matrix
+    cm = confusion_matrix(y_true, y_preds, len(Class))
+    # Subplot içinde düzenleme
     fig, axs = plt.subplots(2, 2, figsize=(16, 12))
     
     # Confusion Matrix
@@ -1363,51 +1377,100 @@ def plot_evaluate(y_test, y_preds, acc_list):
     axs[0, 0].set_xlabel("Predicted Class")
     axs[0, 0].set_ylabel("Actual Class")
     
-    # ROC Curve
-    roc_auc = np.trapz(tpr, fpr)
-    axs[1, 0].plot(fpr, tpr, color='darkorange', lw=2, label=f'ROC curve (area = {roc_auc:.2f})')
-    axs[1, 0].plot([0, 1], [0, 1], color='navy', lw=2, linestyle='--')
-    axs[1, 0].set_xlim([0.0, 1.0])
-    axs[1, 0].set_ylim([0.0, 1.05])
-    axs[1, 0].set_xlabel('False Positive Rate')
-    axs[1, 0].set_ylabel('True Positive Rate')
-    axs[1, 0].set_title('Receiver Operating Characteristic (ROC) Curve')
-    axs[1, 0].legend(loc="lower right")
-    axs[1, 0].legend(loc="lower right")
+    if len(Class) == 2:
+        fpr, tpr, thresholds = roc_curve(y_true, y_preds)
+        # ROC Curve
+        roc_auc = np.trapz(tpr, fpr)
+        axs[1, 0].plot(fpr, tpr, color='darkorange', lw=2, label=f'ROC curve (area = {roc_auc:.2f})')
+        axs[1, 0].plot([0, 1], [0, 1], color='navy', lw=2, linestyle='--')
+        axs[1, 0].set_xlim([0.0, 1.0])
+        axs[1, 0].set_ylim([0.0, 1.05])
+        axs[1, 0].set_xlabel('False Positive Rate')
+        axs[1, 0].set_ylabel('True Positive Rate')
+        axs[1, 0].set_title('Receiver Operating Characteristic (ROC) Curve')
+        axs[1, 0].legend(loc="lower right")
+        axs[1, 0].legend(loc="lower right")
+    else:
+
+        for i in range(len(Class)):
+            
+            y_true_copy = np.copy(y_true)
+            y_preds_copy = np.copy(y_preds)
+        
+            y_true_copy[y_true_copy == i] = 0
+            y_true_copy[y_true_copy != 0] = 1
+            
+            y_preds_copy[y_preds_copy == i] = 0
+            y_preds_copy[y_preds_copy != 0] = 1
+            
+
+            fpr, tpr, thresholds = roc_curve(y_true_copy, y_preds_copy)
+            
+            roc_auc = np.trapz(tpr, fpr)
+            axs[1, 0].plot(fpr, tpr, color='darkorange', lw=2, label=f'ROC curve (area = {roc_auc:.2f})')
+            axs[1, 0].plot([0, 1], [0, 1], color='navy', lw=2, linestyle='--')
+            axs[1, 0].set_xlim([0.0, 1.0])
+            axs[1, 0].set_ylim([0.0, 1.05])
+            axs[1, 0].set_xlabel('False Positive Rate')
+            axs[1, 0].set_ylabel('True Positive Rate')
+            axs[1, 0].set_title('Receiver Operating Characteristic (ROC) Curve')
+            axs[1, 0].legend(loc="lower right")
+            axs[1, 0].legend(loc="lower right")
+        
+        
+        """
+            accuracy_per_class = []
+        
+            for cls in Class:
+                correct = np.sum((y_true == cls) & (y_preds == cls))
+                total = np.sum(y_true == cls)
+                accuracy_cls = correct / total if total > 0 else 0.0
+                accuracy_per_class.append(accuracy_cls)
+        
+            axs[2, 0].bar(Class, accuracy_per_class, color='b', alpha=0.7)
+            axs[2, 0].set_xlabel('Class')
+            axs[2, 0].set_ylabel('Accuracy')
+            axs[2, 0].set_title('Class-wise Accuracy')
+            axs[2, 0].set_xticks(Class)
+            axs[2, 0].grid(True)
+"""
+
+
+
     
     # Precision, Recall, F1 Score, Accuracy
     metric = ['Precision', 'Recall', 'F1 Score', 'Accuracy']
     values = [precision, recall, f1, acc]
     colors = ['#1f77b4', '#ff7f0e', '#2ca02c', '#d62728']
     
-    
+    #
     bars = axs[0, 1].bar(metric, values, color=colors)
     
-   
+    
     for bar, value in zip(bars, values):
         axs[0, 1].text(bar.get_x() + bar.get_width() / 2, bar.get_height() - 0.05, f'{value:.2f}', 
                        ha='center', va='bottom', fontsize=12, color='white', weight='bold')
     
-    axs[0, 1].set_ylim(0, 1) 
+    axs[0, 1].set_ylim(0, 1)  # Y eksenini 0 ile 1 arasında sınırla
     axs[0, 1].set_xlabel('Metrics')
     axs[0, 1].set_ylabel('Score')
-    axs[0, 1].set_title('Precision, Recall, F1 Score, and Accuracy')
+    axs[0, 1].set_title('Precision, Recall, F1 Score, and Accuracy (Wighted)')
     axs[0, 1].grid(True, axis='y', linestyle='--', alpha=0.7)
     
-          
+               # Accuracy
     plt.plot(acc_list, marker='o', linestyle='-',
              color='r', label='Accuracy')
     
-
+    
     plt.axhline(y=1, color='g', linestyle='--', label='Maximum Accuracy')
     
-
+    
     plt.xlabel('Samples')
     plt.ylabel('Accuracy')
     plt.title('Accuracy History')
     plt.legend()
     
-
+    
     plt.tight_layout()
     plt.show()
    

{pyerualjetwork-2.1.8 → pyerualjetwork-2.2.0}/plan_di/plan_di.py

@@ -1145,13 +1145,14 @@ def split(X, y, test_size, random_state):
     return x_train, x_test, y_train, y_test
 
 
-def metrics(y_ts, test_preds):
+def metrics(y_ts, test_preds, average='weighted'):
     """
     Calculates precision, recall and F1 score for a classification task.
-
+    
     Args:
-        y_test (list or numpy.ndarray): True labels.
+        y_ts (list or numpy.ndarray): True labels.
         test_preds (list or numpy.ndarray): Predicted labels.
+        average (str): Type of averaging ('micro', 'macro', 'weighted').
 
     Returns:
         tuple: Precision, recall, F1 score.
@@ -1192,17 +1193,29 @@ def metrics(y_ts, test_preds):
     for c in classes:
         precision[c] = tp[c] / (tp[c] + fp[c]) if (tp[c] + fp[c]) > 0 else 0
         recall[c] = tp[c] / (tp[c] + fn[c]) if (tp[c] + fn[c]) > 0 else 0
-        f1[c] = 2 * (precision[c] * recall[c]) / (precision[c] +
-                                                  recall[c]) if (precision[c] + recall[c]) > 0 else 0
+        f1[c] = 2 * (precision[c] * recall[c]) / (precision[c] + recall[c]) if (precision[c] + recall[c]) > 0 else 0
 
-    micro_precision = np.sum(list(tp.values())) / (np.sum(list(tp.values())) + np.sum(
-        list(fp.values()))) if (np.sum(list(tp.values())) + np.sum(list(fp.values()))) > 0 else 0
-    micro_recall = np.sum(list(tp.values())) / (np.sum(list(tp.values())) + np.sum(list(
-        fn.values()))) if (np.sum(list(tp.values())) + np.sum(list(fn.values()))) > 0 else 0
-    micro_f1 = 2 * (micro_precision * micro_recall) / (micro_precision +
-                                                       micro_recall) if (micro_precision + micro_recall) > 0 else 0
+    if average == 'micro':
+        precision_val = np.sum(list(tp.values())) / (np.sum(list(tp.values())) + np.sum(list(fp.values()))) if (np.sum(list(tp.values())) + np.sum(list(fp.values()))) > 0 else 0
+        recall_val = np.sum(list(tp.values())) / (np.sum(list(tp.values())) + np.sum(list(fn.values()))) if (np.sum(list(tp.values())) + np.sum(list(fn.values()))) > 0 else 0
+        f1_val = 2 * (precision_val * recall_val) / (precision_val + recall_val) if (precision_val + recall_val) > 0 else 0
 
-    return micro_precision, micro_recall, micro_f1
+    elif average == 'macro':
+        precision_val = np.mean(list(precision.values()))
+        recall_val = np.mean(list(recall.values()))
+        f1_val = np.mean(list(f1.values()))
+
+    elif average == 'weighted':
+        weights = np.array([np.sum(y_test_d == c) for c in classes])
+        weights = weights / np.sum(weights)
+        precision_val = np.sum([weights[i] * precision[classes[i]] for i in range(len(classes))])
+        recall_val = np.sum([weights[i] * recall[classes[i]] for i in range(len(classes))])
+        f1_val = np.sum([weights[i] * f1[classes[i]] for i in range(len(classes))])
+
+    else:
+        raise ValueError("Invalid value for 'average'. Choose from 'micro', 'macro', 'weighted'.")
+
+    return precision_val, recall_val, f1_val
 
 
 def decode_one_hot(encoded_data):
@@ -1315,9 +1328,10 @@ def plot_evaluate(y_test, y_preds, acc_list):
 
     y_true = np.array(y_true)
     y_preds = np.array(y_preds)
-    fpr, tpr, thresholds = roc_curve(y_true, y_preds)
-    precision, recall, f1 = metrics(y_test, y_preds)
     Class = np.unique(decode_one_hot(y_test))
+
+    precision, recall, f1 = metrics(y_test, y_preds)
+    
     
     # Confusion matrix
     cm = confusion_matrix(y_true, y_preds, len(Class))
@@ -1330,17 +1344,66 @@ def plot_evaluate(y_test, y_preds, acc_list):
     axs[0, 0].set_xlabel("Predicted Class")
     axs[0, 0].set_ylabel("Actual Class")
     
-    # ROC Curve
-    roc_auc = np.trapz(tpr, fpr)
-    axs[1, 0].plot(fpr, tpr, color='darkorange', lw=2, label=f'ROC curve (area = {roc_auc:.2f})')
-    axs[1, 0].plot([0, 1], [0, 1], color='navy', lw=2, linestyle='--')
-    axs[1, 0].set_xlim([0.0, 1.0])
-    axs[1, 0].set_ylim([0.0, 1.05])
-    axs[1, 0].set_xlabel('False Positive Rate')
-    axs[1, 0].set_ylabel('True Positive Rate')
-    axs[1, 0].set_title('Receiver Operating Characteristic (ROC) Curve')
-    axs[1, 0].legend(loc="lower right")
-    axs[1, 0].legend(loc="lower right")
+    if len(Class) == 2:
+        fpr, tpr, thresholds = roc_curve(y_true, y_preds)
+        # ROC Curve
+        roc_auc = np.trapz(tpr, fpr)
+        axs[1, 0].plot(fpr, tpr, color='darkorange', lw=2, label=f'ROC curve (area = {roc_auc:.2f})')
+        axs[1, 0].plot([0, 1], [0, 1], color='navy', lw=2, linestyle='--')
+        axs[1, 0].set_xlim([0.0, 1.0])
+        axs[1, 0].set_ylim([0.0, 1.05])
+        axs[1, 0].set_xlabel('False Positive Rate')
+        axs[1, 0].set_ylabel('True Positive Rate')
+        axs[1, 0].set_title('Receiver Operating Characteristic (ROC) Curve')
+        axs[1, 0].legend(loc="lower right")
+        axs[1, 0].legend(loc="lower right")
+    else:
+
+        for i in range(len(Class)):
+            
+            y_true_copy = np.copy(y_true)
+            y_preds_copy = np.copy(y_preds)
+        
+            y_true_copy[y_true_copy == i] = 0
+            y_true_copy[y_true_copy != 0] = 1
+            
+            y_preds_copy[y_preds_copy == i] = 0
+            y_preds_copy[y_preds_copy != 0] = 1
+            
+
+            fpr, tpr, thresholds = roc_curve(y_true_copy, y_preds_copy)
+            
+            roc_auc = np.trapz(tpr, fpr)
+            axs[1, 0].plot(fpr, tpr, color='darkorange', lw=2, label=f'ROC curve (area = {roc_auc:.2f})')
+            axs[1, 0].plot([0, 1], [0, 1], color='navy', lw=2, linestyle='--')
+            axs[1, 0].set_xlim([0.0, 1.0])
+            axs[1, 0].set_ylim([0.0, 1.05])
+            axs[1, 0].set_xlabel('False Positive Rate')
+            axs[1, 0].set_ylabel('True Positive Rate')
+            axs[1, 0].set_title('Receiver Operating Characteristic (ROC) Curve')
+            axs[1, 0].legend(loc="lower right")
+            axs[1, 0].legend(loc="lower right")
+        
+        
+        """
+            accuracy_per_class = []
+        
+            for cls in Class:
+                correct = np.sum((y_true == cls) & (y_preds == cls))
+                total = np.sum(y_true == cls)
+                accuracy_cls = correct / total if total > 0 else 0.0
+                accuracy_per_class.append(accuracy_cls)
+        
+            axs[2, 0].bar(Class, accuracy_per_class, color='b', alpha=0.7)
+            axs[2, 0].set_xlabel('Class')
+            axs[2, 0].set_ylabel('Accuracy')
+            axs[2, 0].set_title('Class-wise Accuracy')
+            axs[2, 0].set_xticks(Class)
+            axs[2, 0].grid(True)
+"""
+
+
+
     
     # Precision, Recall, F1 Score, Accuracy
     metric = ['Precision', 'Recall', 'F1 Score', 'Accuracy']
@@ -1358,7 +1421,7 @@ def plot_evaluate(y_test, y_preds, acc_list):
     axs[0, 1].set_ylim(0, 1)  # Y eksenini 0 ile 1 arasında sınırla
     axs[0, 1].set_xlabel('Metrics')
     axs[0, 1].set_ylabel('Score')
-    axs[0, 1].set_title('Precision, Recall, F1 Score, and Accuracy')
+    axs[0, 1].set_title('Precision, Recall, F1 Score, and Accuracy (Wighted)')
     axs[0, 1].grid(True, axis='y', linestyle='--', alpha=0.7)
     
                # Accuracy

{pyerualjetwork-2.1.8 → pyerualjetwork-2.2.0}/pyerualjetwork.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyerualjetwork
-Version: 2.1.8
+Version: 2.2.0
 Summary:  8 new functions: multiple_evaluate , encode_one_hot, split, metrics, decode_one_hot, roc_curve, confusion_matrix, plot_evaluate And Code improvements (Documentation in desc. Examples in GİTHUB: https://github.com/HCB06/PyerualJetwork)
 Author: Hasan Can Beydili
 Author-email: tchasancan@gmail.com

{pyerualjetwork-2.1.8 → pyerualjetwork-2.2.0}/setup.py

@@ -5,7 +5,7 @@ from setuptools import setup, find_packages
 setup(
       
       name = "pyerualjetwork",
-      version = "2.1.8",
+      version = "2.2.0",
       author = "Hasan Can Beydili",
       author_email = "tchasancan@gmail.com",
       description= " 8 new functions: multiple_evaluate , encode_one_hot, split, metrics, decode_one_hot, roc_curve, confusion_matrix, plot_evaluate And Code improvements (Documentation in desc. Examples in GİTHUB: https://github.com/HCB06/PyerualJetwork)",