pyerualjetwork 2.6.3__py3-none-any.whl → 2.6.5__py3-none-any.whl

plan/plan.py

@@ -15,6 +15,7 @@ import math
 from scipy.special import expit, softmax
 import matplotlib.pyplot as plt
 import seaborn as sns
+from tqdm import tqdm
 
 # BUILD -----
 
@@ -25,7 +26,6 @@ def fit(
     show_training,
     show_count= None,
     val= None,
-    val_count= None,
     x_val= None,
     y_val= None,
     activation_potentiation=None # (float): Input activation_potentiation (optional)
@@ -39,7 +39,7 @@ def fit(
         y_train (list[num]): List of target labels. (one hot encoded)
         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)
-        val (None or True): validation in training process ? None or True Default: None
+        val (None, True or 'final'): validation in training process ? None, True or 'final' Default: None
         val_count (None, int): After how many examples learned will an accuracy test be performed? Default: 0.1 (%10) (optional)
         x_val (list[num]): List of validation data. (optional) Default: x_train
         y_val (list[num]): (list[num]): List of target labels. (one hot encoded) (optional) Default: y_train
@@ -60,14 +60,10 @@ def fit(
         x_val = x_train
         y_val = y_train
 
-    if val == True and val_count == None:
-
-        val_count =  0.1
-
-    if val == True and val_count != None:
+    if val == True or val == 'final':
+        
+        val_bar = tqdm(total=1, desc="Training / Validating Accuracy", ncols=120)
         
-        val_count = int(len(x_train) * val_count)
-        val_count_copy = val_count
 
     if show_count == None:
         
@@ -89,25 +85,23 @@ def fit(
 
     neurons = [len(class_count), len(class_count)]
     layers = ['fex']
-    val_list = [None]
+    val_list = []
 
     x_train[0] = np.array(x_train[0])
     x_train[0] = x_train[0].ravel()
     x_train_size = len(x_train[0])
 
-    W = weight_identification(
-        len(layers) - 1, len(class_count), neurons, x_train_size)
+    STPW = weight_identification(
+        len(layers) - 1, len(class_count), neurons, x_train_size) # STPW = SHORT TIME POTENTIATION WEIGHT
+
+    LTPW = [1] * len(STPW) # LTPW = LONG TIME POTENTIATION WEIGHT
 
-    trained_W = [1] * len(W)
-    print(Fore.GREEN + "Train Started with 0 ERROR" + Style.RESET_ALL)
-    start_time = time.time()
     y = decode_one_hot(y_train)
 
     for index, inp in enumerate(x_train):
-
+        
         progress = index / len(x_train) * 100
 
-        uni_start_time = time.time()
         inp = np.array(inp)
         inp = inp.ravel()
         
@@ -123,48 +117,37 @@ def fit(
             neural_layer = normalization(neural_layer)
 
             if Layer == 'fex':
-                W[Lindex] = fex(neural_layer, W[Lindex], True, y[index], activation_potentiation)
+                STPW[Lindex] = fex(neural_layer, STPW[Lindex], True, y[index], activation_potentiation)
 
-        for i, w in enumerate(W):
-                trained_W[i] = trained_W[i] + w
+        for i, w in enumerate(STPW):
+                LTPW[i] = LTPW[i] + w
 
             
         if val == True:
+            
+            if show_training == True:
+                try:
+                    plt.close(fig)
 
-            if index == val_count:
-                
-                if show_training == True:
-                    try:
-                        plt.close(fig)
-
-                    except:
-                        pass
-
-                val_count += val_count_copy
-
-                layers.append('cat')
-                trained_W.append(np.eye(len(class_count)))
-
-                validation_model = evaluate(x_val, y_val, None, trained_W)
-                                            
-                layers.pop()
-                trained_W.pop()
-
-                val_acc = validation_model[get_acc()]
+                except:
+                    pass
 
-                val_list.append(val_acc)
+            validation_model = evaluate(x_val, y_val, None, LTPW, activation_potentiation, None)
+            
+            val_acc = validation_model[get_acc()]
 
+            val_list.append(val_acc)
+            
+            if index == 0:
+                
+                val_bar.update(val_acc)
+            
+            if index != 0:
                 
-                plt.plot(val_list, linestyle='-',
-                color='r')
+                val_acc = val_acc - val_list[index - 1]
                 
-                progress_status = f"{progress:.1f}"
-                plt.title('Validation accuracy graph. Amount of data learned by the model: % ' + progress_status)
-                plt.xlabel('Learning Progress')
-                plt.ylabel('Accuracy')
-                plt.ylim(0, 1)
-                plt.draw()
-                plt.pause(0.1)
+                val_bar.update(val_acc)
+               
 
         if show_training == True:
 
@@ -220,21 +203,6 @@ def fit(
         W = weight_identification(
             len(layers) - 1, len(class_count), neurons, x_train_size)
 
-        uni_end_time = time.time()
-
-        calculating_est = round(
-            (uni_end_time - uni_start_time) * (len(x_train) - index), 3)
-
-        if calculating_est < 60:
-            print('\rest......(sec):', calculating_est, '\n', end="")
-
-        elif calculating_est > 60 and calculating_est < 3600:
-            print('\rest......(min):', calculating_est/60, '\n', end="")
-
-        elif calculating_est > 3600:
-            print('\rest......(h):', calculating_est/3600, '\n', end="")
-
-        print('\rTraining: ', index, "/", len(x_train), "\n", end="")
 
     if show_training == 'final':
             
@@ -257,26 +225,18 @@ def fit(
             plt.pause(0.1)
 
 
-    EndTime = time.time()
-
-    calculating_est = round(EndTime - start_time, 2)
-
-    print(Fore.GREEN + " \nTrain Finished with 0 ERROR\n" + Style.RESET_ALL)
-
-    if calculating_est < 60:
-        print('Total training time(sec): ', calculating_est)
-
-    elif calculating_est > 60 and calculating_est < 3600:
-        print('Total training time(min): ', calculating_est/60)
-
-    elif calculating_est > 3600:
-        print('Total training time(h): ', calculating_est/3600)
+    if val == 'final':
+   
+        validation_model = evaluate(x_val, y_val, None, LTPW, activation_potentiation, None)
+        
+        val_acc = validation_model[get_acc()]
     
-    layers.append('cat')
-    trained_W.append(np.eye(len(class_count)))
+        val_list.append(val_acc)
+        
+        val_bar.update(val_acc)
                 
                 
-    return trained_W
+    return LTPW
 
 # FUNCTIONS -----
 
@@ -491,7 +451,8 @@ def evaluate(
     y_test,         # list[num]: Test labels.
     show_metrices,      # show_metrices (bool): (True or False)
     W,               # list[num]: Weight matrix list of the neural network.
-    activation_potentiation=None # activation_potentiation (float or None): Threshold value for comparison. (optional)
+    activation_potentiation=None, # activation_potentiation (float or None): Threshold value for comparison. (optional)
+    acc_bar_status = True
 ) -> tuple:
     infoTestModel = """
     Tests the neural network model with the given test data.
@@ -502,12 +463,13 @@ def evaluate(
         show_metrices (bool): (True or False)
         W (list[num]): Weight matrix list of the neural network.
         activation_potentiation (float or None): Threshold value for comparison. (optional)
+        acc_bar_status (bool): Loading bar for accuracy (True or None)
 
     Returns:
         tuple: A tuple containing the predicted labels and the accuracy of the model.
     """
 
-    layers = ['fex', 'cat']
+    layers = ['fex']
 
     try:
         Wc = [0] * len(W)  # Wc = Weight copy
@@ -518,9 +480,10 @@ def evaluate(
         for i, w in enumerate(W):
             Wc[i] = np.copy(w)
             print('\rCopying weights.....', i+1, '/', len(W), end="")
-    
-        print(Fore.GREEN + "\n\nTest Started with 0 ERROR\n" + Style.RESET_ALL)
-        start_time = time.time()
+            
+       # print(Fore.GREEN + "\n\nTest Started with 0 ERROR\n" + Style.RESET_ALL)
+        if acc_bar_status == True:
+            acc_bar = tqdm(total=1, desc="Test Accuracy", ncols=75)
         for inpIndex, Input in enumerate(x_test):
             Input = np.array(Input)
             Input = Input.ravel()
@@ -533,8 +496,7 @@ def evaluate(
     
                 if Layer == 'fex':
                     neural_layer = fex(neural_layer, W[index], False, None, activation_potentiation)
-                elif Layer == 'cat':
-                    neural_layer = np.dot(W[index], neural_layer)
+    
     
             for i, w in enumerate(Wc):
                 W[i] = np.copy(w)
@@ -543,56 +505,25 @@ def evaluate(
             if RealOutput == PredictedOutput:
                 true += 1
             acc = true / len(y_test)
-            if show_metrices == True:
-                acc_list.append(acc)
-            y_preds[inpIndex] = PredictedOutput
     
-            uni_end_time = time.time()
-    
-            calculating_est = round(
-                (uni_end_time - uni_start_time) * (len(x_test) - inpIndex), 3)
     
-            if calculating_est < 60:
-                print('\rest......(sec):', calculating_est, '\n', end="")
-                print('\rTest accuracy: ', acc, "\n", end="")
-    
-            elif calculating_est > 60 and calculating_est < 3600:
-                print('\rest......(min):', calculating_est/60, '\n', end="")
-                print('\rTest accuracy: ', acc, "\n", end="")
-    
-            elif calculating_est > 3600:
-                print('\rest......(h):', calculating_est/3600, '\n', end="")
-                print('\rTest accuracy: ', acc, "\n", end="")
+            acc_list.append(acc)
+            y_preds[inpIndex] = PredictedOutput
+            
+            if acc_bar_status == True:
+                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)
         
-        EndTime = time.time()
+        
         for i, w in enumerate(Wc):
             W[i] = np.copy(w)
-    
-        calculating_est = round(EndTime - start_time, 2)
-    
-        print(Fore.GREEN + "\nTest Finished with 0 ERROR\n")
-    
-        if calculating_est < 60:
-            print('Total testing time(sec): ', calculating_est)
-    
-        elif calculating_est > 60 and calculating_est < 3600:
-            print('Total testing time(min): ', calculating_est/60)
-    
-        elif calculating_est > 3600:
-            print('Total testing time(h): ', calculating_est/3600)
-    
-        if acc >= 0.8:
-            print(Fore.GREEN + '\nTotal Test accuracy: ',
-                  acc, '\n' + Style.RESET_ALL)
-    
-        elif acc < 0.8 and acc > 0.6:
-            print(Fore.MAGENTA + '\nTotal Test accuracy: ',
-                  acc, '\n' + Style.RESET_ALL)
-    
-        elif acc <= 0.6:
-            print(Fore.RED + '\nTotal Test accuracy: ', acc, '\n' + Style.RESET_ALL)
 
     except:
 
@@ -656,8 +587,6 @@ def multiple_evaluate(
 
                     if Layer == 'fex':
                         neural_layer = fex(neural_layer, W[index], False, None, activation_potentiation)
-                    elif Layer == 'cat':
-                        neural_layer = np.dot(W[index], neural_layer)
 
                 output_layer += neural_layer
 
@@ -765,7 +694,7 @@ def save_model(model_name,
     # Operations to be performed by the function will be written here
     pass
 
-    layers = ['fex', 'cat']
+    layers = ['fex']
 
     if weights_type != 'txt' and weights_type != 'npy' and weights_type != 'mat':
         print(Fore.RED + "ERROR110: Save Weight type (File Extension) Type must be 'txt' or 'npy' or 'mat' from: save_model" +
@@ -976,7 +905,7 @@ def predict_model_ssd(Input, model_name, model_path):
         non_scaled = True
         
 
-    layers = ['fex', 'cat']
+    layers = ['fex']
 
     Wc = [0] * len(W)
     for i, w in enumerate(W):
@@ -1022,7 +951,7 @@ def predict_model_ram(Input, scaler_params, W, activation_potentiation=None):
 
         Input = standard_scaler(None, Input, scaler_params)
 
-    layers = ['fex', 'cat']
+    layers = ['fex']
 
     Wc = [0] * len(W)
     for i, w in enumerate(W):

pyerualjetwork-2.6.5.dist-info/METADATA

@@ -0,0 +1,8 @@
+Metadata-Version: 2.1
+Name: pyerualjetwork
+Version: 2.6.5
+Summary: Visual improvements, new option added for val paramater in fit function: 'final'. Removed: val_count parameter.
+Author: Hasan Can Beydili
+Author-email: tchasancan@gmail.com
+Keywords: model evaluation,classifcation,potentiation learning artficial neural networks
+

pyerualjetwork-2.6.5.dist-info/RECORD

@@ -0,0 +1,6 @@
+plan/__init__.py,sha256=gmaz8lnQfl18MbOQwabBUPmShajK5S99jfyY-hQe8tc,502
+plan/plan.py,sha256=QP0z-MfKFhSnWqAEBLZ2L1sJUhTnkefeXAsgJTA_fYU,53321
+pyerualjetwork-2.6.5.dist-info/METADATA,sha256=GbAd2Jfv-c3Lt_Ut0MgjmHg1ETBNvAePdVqRiXA-pWw,338
+pyerualjetwork-2.6.5.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+pyerualjetwork-2.6.5.dist-info/top_level.txt,sha256=G0Al3HuNJ88434XneyDtRKAIUaLCizOFYFYNhd7e2OM,5
+pyerualjetwork-2.6.5.dist-info/RECORD,,

pyerualjetwork-2.6.3.dist-info/METADATA

@@ -1,8 +0,0 @@
-Metadata-Version: 2.1
-Name: pyerualjetwork
-Version: 2.6.3
-Summary: New optional parameters added for fit function, x_val, y_val show_count, val_count, val. For more information please read user document
-Author: Hasan Can Beydili
-Author-email: tchasancan@gmail.com
-Keywords: model evaluation,classifcation,pruning learning artficial neural networks
-

pyerualjetwork-2.6.3.dist-info/RECORD

@@ -1,6 +0,0 @@
-plan/__init__.py,sha256=gmaz8lnQfl18MbOQwabBUPmShajK5S99jfyY-hQe8tc,502
-plan/plan.py,sha256=fUVW_bUadJjTPoXN3YQwU_1b-FSr64fCH3_WUAoDcn8,56253
-pyerualjetwork-2.6.3.dist-info/METADATA,sha256=uc5OY2rYco6MWnILvfmZ4rR9-9xheUTsR7MMOlg1J9Q,357
-pyerualjetwork-2.6.3.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-pyerualjetwork-2.6.3.dist-info/top_level.txt,sha256=G0Al3HuNJ88434XneyDtRKAIUaLCizOFYFYNhd7e2OM,5
-pyerualjetwork-2.6.3.dist-info/RECORD,,