pyerualjetwork 2.1.9__py3-none-any.whl → 2.2.1__py3-none-any.whl

plan_bi/plan_bi.py

@@ -95,8 +95,6 @@ def fit(
 
             if Layer == 'fex':
                 W[Lindex] = fex(neural_layer, W[Lindex], activation_potential, Piece[Windex], True, y)
-            elif Layer == 'cat':
-                W[Lindex] = cat(neural_layer, W[Lindex], True, y)
                 
         
         for i, w in enumerate(W):
@@ -172,6 +170,8 @@ def weight_identification(
     for w in range(ws):
         W[w + 1] = np.ones((neurons[w + 1],neurons[w]))
     W[layer_count] = np.ones((class_count,neurons[layer_count - 1]))
+    W[len(W) - 1] = np.eye(class_count)
+
     return W
 
 def synaptic_pruning(
@@ -471,7 +471,7 @@ def evaluate(
             if layers[index] == 'fex':
                 neural_layer = fex(neural_layer, W[index],  activation_potential, None, False, None)
             if layers[index] == 'cat':
-                neural_layer = cat(neural_layer, W[index], False, None)
+                neural_layer = np.dot(W[index], neural_layer)
                 
         for i, w in enumerate(Wc):
             W[i] = np.copy(w)
@@ -594,7 +594,7 @@ def multiple_evaluate(
                     if layers[index] == 'fex':
                         neural_layer = fex(neural_layer, W[index],  activation_potentials[m], None, False, None)
                     if layers[index] == 'cat':
-                        neural_layer = cat(neural_layer, W[index], False, None)
+                        neural_layer = np.dot(W[index], neural_layer)
                     
                 output_layer += neural_layer
             
@@ -914,7 +914,7 @@ def predict_model_ssd(Input, model_name, model_path):
             if layers[index] == 'fex':
                 neural_layer = fex(neural_layer, W[index],  activation_potential, None, False, None)
             if layers[index] == 'cat':
-                neural_layer = cat(neural_layer, W[index], False, None)
+                neural_layer = np.dot(W[index], neural_layer)
     except:
        print(Fore.RED + "ERROR: The input was probably entered incorrectly. from: predict_model_ssd"  + infopredict_model_ssd + Style.RESET_ALL)
        return 'e'
@@ -958,7 +958,7 @@ def predict_model_ram(Input, activation_potential, scaler, W):
             if layers[index] == 'fex':
                 neural_layer = fex(neural_layer, W[index],  activation_potential, None, False, None)
             if layers[index] == 'cat':
-                neural_layer = cat(neural_layer, W[index], False, None)
+                neural_layer = np.dot(W[index], neural_layer)
                 
     except:
         print(Fore.RED + "ERROR: Unexpected input or wrong model parameters from: predict_model_ram."  + infopredict_model_ram + Style.RESET_ALL)
@@ -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()))
 
-    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
+    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))])
 
-    return micro_precision, micro_recall, micro_f1
+    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):
@@ -1378,21 +1391,49 @@ def plot_evaluate(y_test, y_preds, acc_list):
         axs[1, 0].legend(loc="lower right")
         axs[1, 0].legend(loc="lower right")
     else:
-        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[1, 0].bar(Class, accuracy_per_class, color='b', alpha=0.7)
-        axs[1, 0].set_xlabel('Class')
-        axs[1, 0].set_ylabel('Accuracy')
-        axs[1, 0].set_title('Class-wise Accuracy')
-        axs[1, 0].set_xticks(Class)
-        axs[1, 0].grid(True)
 
+        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)
+"""
 
 
 
@@ -1413,7 +1454,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

plan_di/plan_di.py

@@ -58,6 +58,7 @@ def fit(
 
     W = weight_identification(
         len(layers) - 1, len(class_count), neurons, x_train_size)
+
     Divides, Piece = synaptic_dividing(len(class_count), W)
     trained_W = [1] * len(W)
     print(Fore.GREEN + "Train Started with 0 ERROR" + Style.RESET_ALL)
@@ -94,8 +95,6 @@ def fit(
             y = np.argmax(y_train[index])
             if Layer == 'fex':
                 W[Lindex] = fex(neural_layer, W[Lindex], True, y)
-            elif Layer == 'cat':
-                W[Lindex] = cat(neural_layer, W[Lindex], True, y)
 
         for i, w in enumerate(W):
             trained_W[i] = trained_W[i] + w
@@ -165,6 +164,8 @@ def weight_identification(
     for w in range(ws):
         W[w + 1] = np.ones((neurons[w + 1], neurons[w]))
     W[layer_count] = np.ones((class_count, neurons[layer_count - 1]))
+    W[len(W) - 1] = np.eye(class_count)
+    
     return W
 
 
@@ -302,37 +303,6 @@ def fex(
         return neural_layer
 
 
-def cat(
-    Input,               # list[num]: Input data.
-    w,                   # list[num]: Weight matrix of the neural network.
-    # (bool): Flag indicating if the function is called during training (True or False).
-    is_training,
-    Class
-) -> tuple:
-    """
-    Applies categorization process to the input data using synaptic pruning if specified.
-
-    Args:
-        Input (list[num]): Input data.
-        w (list[num]): Weight matrix of the neural network.
-        is_training (bool): Flag indicating if the function is called during training (True or False).
-        Class (int): if is during training then which class(label) ? is isnt then put None.
-    Returns:
-        tuple: A tuple containing the neural layer (vector) result and the possibly updated weight matrix.
-    """
-
-    if is_training == True:
-
-        w[Class, Class] += 1
-
-        return w
-
-    else:
-
-        neural_layer = np.dot(w, Input)
-
-        return neural_layer
-
 
 def normalization(
     Input  # num: Input data to be normalized.
@@ -449,7 +419,7 @@ def evaluate(
                 if Layer == 'fex':
                     neural_layer = fex(neural_layer, W[index], False, None)
                 elif Layer == 'cat':
-                    neural_layer = cat(neural_layer, W[index], False, None)
+                    neural_layer = np.dot(W[index], neural_layer)
     
             for i, w in enumerate(Wc):
                 W[i] = np.copy(w)
@@ -571,7 +541,7 @@ def multiple_evaluate(
                     if Layer == 'fex':
                         neural_layer = fex(neural_layer, W[index], False, None)
                     elif Layer == 'cat':
-                        neural_layer = cat(neural_layer, W[index], False, None)
+                        neural_layer = np.dot(W[index], neural_layer)
 
                 output_layer += neural_layer
 
@@ -887,7 +857,7 @@ def predict_model_ssd(Input, model_name, model_path):
             if Layer == 'fex':
                 neural_layer = fex(neural_layer, W[index], False, None)
             elif Layer == 'cat':
-                neural_layer = cat(neural_layer, W[index], False, None)
+                neural_layer = np.dot(W[index], neural_layer)
     except:
         print(Fore.RED + "ERROR: The input was probably entered incorrectly. from: predict_model_ssd" +
               infopredict_model_ssd + Style.RESET_ALL)
@@ -932,7 +902,7 @@ def predict_model_ram(Input, scaler, W):
             if Layer == 'fex':
                 neural_layer = fex(neural_layer, W[index], False, None)
             elif Layer == 'cat':
-                neural_layer = cat(neural_layer, W[index], False, None)
+                neural_layer = np.dot(W[index], neural_layer)
 
     except:
         print(Fore.RED + "ERROR: Unexpected input or wrong model parameters from: predict_model_ram." +
@@ -1145,13 +1115,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 +1163,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
 
-    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
+    elif average == 'macro':
+        precision_val = np.mean(list(precision.values()))
+        recall_val = np.mean(list(recall.values()))
+        f1_val = np.mean(list(f1.values()))
 
-    return micro_precision, micro_recall, micro_f1
+    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):
@@ -1345,21 +1328,49 @@ def plot_evaluate(y_test, y_preds, acc_list):
         axs[1, 0].legend(loc="lower right")
         axs[1, 0].legend(loc="lower right")
     else:
-        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[1, 0].bar(Class, accuracy_per_class, color='b', alpha=0.7)
-        axs[1, 0].set_xlabel('Class')
-        axs[1, 0].set_ylabel('Accuracy')
-        axs[1, 0].set_title('Class-wise Accuracy')
-        axs[1, 0].set_xticks(Class)
-        axs[1, 0].grid(True)
 
+        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)
+"""
 
 
 
@@ -1380,7 +1391,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
@@ -1417,4 +1428,4 @@ def get_preds():
 
 def get_acc():
 
-    return 2
+    return 2

{pyerualjetwork-2.1.9.dist-info → pyerualjetwork-2.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyerualjetwork
-Version: 2.1.9
+Version: 2.2.1
 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.2.1.dist-info/RECORD

@@ -0,0 +1,8 @@
+plan_bi/__init__.py,sha256=82q8bWRYqzwMrFuViQzBg7P19i6EqdV7VYBVxuQ-LV0,517
+plan_bi/plan_bi.py,sha256=fNJK07y9JDVLU0GORD_RHKBjTUnVzb5ciYcQFpyiSvc,50490
+plan_di/__init__.py,sha256=Eut7tVtvQaczEejYyqfQ4eqF71j69josJcY91WN_dkk,508
+plan_di/plan_di.py,sha256=gKY0yCzX1nNNwdRwGOfmaLcvuQwfg1VrWD5oieVXz08,46265
+pyerualjetwork-2.2.1.dist-info/METADATA,sha256=0P5kjlorW8wIUW_p7b90xAvyFYM6cprTalkAHOZ3IMo,457
+pyerualjetwork-2.2.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+pyerualjetwork-2.2.1.dist-info/top_level.txt,sha256=aaXSOcnD62fbXG1x7tw4nV50Qxx9g9zDNLK7OD4BdPE,16
+pyerualjetwork-2.2.1.dist-info/RECORD,,

pyerualjetwork-2.1.9.dist-info/RECORD

@@ -1,8 +0,0 @@
-plan_bi/__init__.py,sha256=82q8bWRYqzwMrFuViQzBg7P19i6EqdV7VYBVxuQ-LV0,517
-plan_bi/plan_bi.py,sha256=5lzUpnRV5hKhSsErqojShC9jtJ0Uy83Two90jmKOvZk,48701
-plan_di/__init__.py,sha256=Eut7tVtvQaczEejYyqfQ4eqF71j69josJcY91WN_dkk,508
-plan_di/plan_di.py,sha256=LYfuCW2KkzP-rACl4jt9zTry96-L-nSOJSf1tS9pXr0,45451
-pyerualjetwork-2.1.9.dist-info/METADATA,sha256=QrFkTmYHTP1coZUcEoB8iKxsCXe-njXxheq_6d4JBJc,457
-pyerualjetwork-2.1.9.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-pyerualjetwork-2.1.9.dist-info/top_level.txt,sha256=aaXSOcnD62fbXG1x7tw4nV50Qxx9g9zDNLK7OD4BdPE,16
-pyerualjetwork-2.1.9.dist-info/RECORD,,