pyerualjetwork 2.7.2__py3-none-any.whl → 2.7.4__py3-none-any.whl

plan/plan.py

@@ -1,3 +1,10 @@
+# -*- coding: utf-8 -*-
+"""
+Created on Fri Jun 21 05:21:35 2024
+
+@author: hasan
+"""
+
 # -*- coding: utf-8 -*-
 """
 Created on Tue Jun 18 23:32:16 2024
@@ -40,8 +47,8 @@ def fit(
         val (None, True or 'final'): validation in training process ? None, True or 'final' Default: None (optional)
         val_count (None, int): After how many examples learned will an accuracy test be performed? Default: 0.1 (%10) (optional)
         activation_potentiation (float): Input activation potentiation (for binary injection) (optional) in range: -1, 1
-        x_val (list[num]): List of validation data. (optional) Default: 10% of x_train (auto_balanced)
-        y_val (list[num]): (list[num]): List of target labels. (one hot encoded) (optional) Default: 10% of y_train (auto_balanced)
+        x_val (list[num]): List of validation data. (optional) Default: 1% of x_train (auto_balanced) it means every %1 of train progress starts validation
+        y_val (list[num]): (list[num]): List of target labels. (one hot encoded) (optional) Default: 1% of y_train (auto_balanced) it means every %1 of train progress starts validation
         show_training (bool, str): True, None or'final'
         show_count (None, int): How many learning steps in total will be displayed in a single figure? (Adjust according to your hardware) Default: 10 (optional)
     Returns:
@@ -72,7 +79,7 @@ def fit(
 
             if val_count == None:
 
-                val_count = 0.1
+                val_count = 0.01
 
             v_iter = 0
 
@@ -246,7 +253,7 @@ def fit(
 
     if val == 'final':
    
-        validation_model = evaluate(x_val, y_val, None, LTPW, activation_potentiation, None)
+        validation_model = evaluate(x_val, y_val, LTPW, activation_potentiation, bar_status=None, show_metrices=None)
         
         val_acc = validation_model[get_acc()]
     
@@ -469,7 +476,7 @@ def evaluate(
     y_test,         # list[num]: Test labels.
     W,               # list[num]: Weight matrix list of the neural network.
     activation_potentiation=None, # activation_potentiation (float or None): Threshold value for comparison. (optional) Default: None
-    acc_bar_status=True,  # acc_bar_status (bool): Loading bar for accuracy (True or None) (optional) Default: True
+    bar_status=True,  # bar_status (bool): Loading bar for accuracy (True or None) (optional) Default: True
     show_metrices=None     # show_metrices (bool): (True or None) (optional) Default: None
 ) -> tuple:
     infoTestModel = """
@@ -480,7 +487,7 @@ def evaluate(
         y_test (list[num]): Test labels.
         W (list[num]): Weight matrix list of the neural network.
         activation_potentiation (float or None): Threshold value for comparison. (optional) Default: None
-        acc_bar_status (bool): Loading bar for accuracy (True or None) (optional) Default: True
+        bar_status (bool): Loading bar for accuracy (True or None) (optional) Default: True
         show_metrices (bool): (True or None) (optional) Default: None
 
     Returns:
@@ -489,69 +496,62 @@ def evaluate(
 
     layers = ['fex']
 
-    try:
-        Wc = [0] * len(W)  # Wc = Weight copy
-        true = 0
-        y_preds = [-1] * len(y_test)
-        acc_list = []
+    Wc = [0] * len(W)  # Wc = Weight copy
+    true = 0
+    y_preds = [-1] * len(y_test)
+    acc_list = []
+    
+    for i, w in enumerate(W):
+        Wc[i] = np.copy(w)
         
-        for i, w in enumerate(W):
-            Wc[i] = np.copy(w)
-            
-            
-        if acc_bar_status == True:
-
-            test_progress = tqdm(total=len(x_test),leave=False, desc='Testing',ncols=120)
-            acc_bar = tqdm(total=1, desc="Test Accuracy", ncols=120)
-            
         
-        for inpIndex, Input in enumerate(x_test):
-            Input = np.array(Input)
-            Input = Input.ravel()
-            neural_layer = Input
-
-            for index, Layer in enumerate(layers):
-
-                neural_layer = normalization(neural_layer)
+    if bar_status == True:
 
-                if Layer == 'fex':
-                    neural_layer = fex(neural_layer, W[index], False, None, activation_potentiation)
+        test_progress = tqdm(total=len(x_test),leave=False, desc='Testing',ncols=120)
+        acc_bar = tqdm(total=1, desc="Test Accuracy", ncols=120)
+        
+    
+    for inpIndex, Input in enumerate(x_test):
+        Input = np.array(Input)
+        Input = Input.ravel()
+        neural_layer = Input
 
+        for index, Layer in enumerate(layers):
 
-            for i, w in enumerate(Wc):
-                W[i] = np.copy(w)
-            RealOutput = np.argmax(y_test[inpIndex])
-            PredictedOutput = np.argmax(neural_layer)
-            if RealOutput == PredictedOutput:
-                true += 1
-            acc = true / len(y_test)
+            neural_layer = normalization(neural_layer)
 
+            if Layer == 'fex':
+                neural_layer = fex(neural_layer, W[index], False, None, activation_potentiation)
 
-            acc_list.append(acc)
-            y_preds[inpIndex] = PredictedOutput
-            
-            if acc_bar_status == True:
-                test_progress.update(1)
-                if inpIndex == 0:
-                    acc_bar.update(acc)
-                    
-                else:
-                    acc = acc - acc_list[inpIndex - 1]
-                    acc_bar.update(acc)
 
-        if show_metrices == True:
-            plot_evaluate(y_test, y_preds, acc_list)
-        
-        
         for i, w in enumerate(Wc):
             W[i] = np.copy(w)
+        RealOutput = np.argmax(y_test[inpIndex])
+        PredictedOutput = np.argmax(neural_layer)
+        if RealOutput == PredictedOutput:
+            true += 1
+        acc = true / len(y_test)
 
-    except:
 
-        print(Fore.RED + "ERROR: Are you sure weights are loaded ? from: evaluate" +
-              infoTestModel + Style.RESET_ALL)
-        return 'e'
+        acc_list.append(acc)
+        y_preds[inpIndex] = PredictedOutput
+        
+        if bar_status == True:
+            test_progress.update(1)
+            if inpIndex == 0:
+                acc_bar.update(acc)
+                
+            else:
+                acc = acc - acc_list[inpIndex - 1]
+                acc_bar.update(acc)
+
+    if show_metrices == True:
+        plot_evaluate(y_test, y_preds, acc_list)
+    
     
+    for i, w in enumerate(Wc):
+        W[i] = np.copy(w)
+
     return W, y_preds, acc
 
 

{pyerualjetwork-2.7.2.dist-info → pyerualjetwork-2.7.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyerualjetwork
-Version: 2.7.2
+Version: 2.7.4
 Summary: Optimized for Vs Code
 Author: Hasan Can Beydili
 Author-email: tchasancan@gmail.com

pyerualjetwork-2.7.4.dist-info/RECORD

@@ -0,0 +1,6 @@
+plan/__init__.py,sha256=gmaz8lnQfl18MbOQwabBUPmShajK5S99jfyY-hQe8tc,502
+plan/plan.py,sha256=t4Vghx1DcMYYzdzzdnd3G_fJobkJvNXVYMKAORJW8is,52772
+pyerualjetwork-2.7.4.dist-info/METADATA,sha256=RJUQ5bKgoOSby1F9unDSKicejquxNMMZFRfdV1meZxY,248
+pyerualjetwork-2.7.4.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+pyerualjetwork-2.7.4.dist-info/top_level.txt,sha256=G0Al3HuNJ88434XneyDtRKAIUaLCizOFYFYNhd7e2OM,5
+pyerualjetwork-2.7.4.dist-info/RECORD,,

pyerualjetwork-2.7.2.dist-info/RECORD

@@ -1,6 +0,0 @@
-plan/__init__.py,sha256=gmaz8lnQfl18MbOQwabBUPmShajK5S99jfyY-hQe8tc,502
-plan/plan.py,sha256=C2gx96Y2eyve0_ACatu9T816vs4985gzSa-fxymevXo,52937
-pyerualjetwork-2.7.2.dist-info/METADATA,sha256=t8fcUy6KUZr5GkVZ7gWQDdGHAFUYjjLyKURgafIlDL4,248
-pyerualjetwork-2.7.2.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-pyerualjetwork-2.7.2.dist-info/top_level.txt,sha256=G0Al3HuNJ88434XneyDtRKAIUaLCizOFYFYNhd7e2OM,5
-pyerualjetwork-2.7.2.dist-info/RECORD,,