pyerualjetwork 2.5.9__tar.gz → 2.6.3__tar.gz

{pyerualjetwork-2.5.9 → pyerualjetwork-2.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyerualjetwork
-Version: 2.5.9
+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

{pyerualjetwork-2.5.9 → pyerualjetwork-2.6.3}/plan/plan.py

@@ -6,25 +6,6 @@ Created on Tue Jun 18 23:32:16 2024
 @author: hasan
 """
 
-# optic
-
-# -*- coding: utf-8 -*-
-"""
-Created on Fri Jun 21 05:21:35 2024
-
-@author: hasan
-"""
-
-# -*- coding: utf-8 -*-
-
-
-
-"""
-Created on Thu Jun 12 00:00:00 2024
-
-@author: hasan can beydili
-"""
-
 import pandas as pd
 import numpy as np
 import time
@@ -47,7 +28,7 @@ def fit(
     val_count= None,
     x_val= None,
     y_val= None,
-    activation_potential=None # (float): Input activation potential (optional)
+    activation_potentiation=None # (float): Input activation_potentiation (optional)
 ) -> str:
 
     infoPLAN = """
@@ -58,10 +39,11 @@ 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_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
-        activation_potential (float): Input activation potential (for binary injection) (optional) in range: -1, 1
+        activation_potentiation (float): Input activation potentiation (for binary injection) (optional) in range: -1, 1
     Returns:
         list([num]): (Weight matrices list, train_predictions list, Train_acc).
         error handled ?: Process status ('e')
@@ -81,15 +63,13 @@ def fit(
     if val == True and val_count == None:
 
         val_count =  0.1
-        val_count_copy = val_count
 
-    if val == True:
+    if val == True and val_count != None:
         
         val_count = int(len(x_train) * val_count)
-
         val_count_copy = val_count
 
-    if show_training == True or show_training == 'final' and show_count == None:
+    if show_count == None:
         
         show_count = 10
 
@@ -143,7 +123,7 @@ def fit(
             neural_layer = normalization(neural_layer)
 
             if Layer == 'fex':
-                W[Lindex] = fex(neural_layer, W[Lindex], True, y[index], activation_potential)
+                W[Lindex] = fex(neural_layer, W[Lindex], True, y[index], activation_potentiation)
 
         for i, w in enumerate(W):
                 trained_W[i] = trained_W[i] + w
@@ -153,6 +133,13 @@ def fit(
 
             if index == val_count:
                 
+                if show_training == True:
+                    try:
+                        plt.close(fig)
+
+                    except:
+                        pass
+
                 val_count += val_count_copy
 
                 layers.append('cat')
@@ -221,14 +208,14 @@ def fit(
                     suptitle_info = 'Weight Learning Progress: % '
                     title_info = 'Weight Matrix Of Fex Layer'
                     
-                    
-               
+                
+            
 
-                progress_status = f"{progress:.1f}"
-                fig.suptitle(suptitle_info + progress_status)
-                plt.draw()
-                plt.pause(0.1)
-                  
+            progress_status = f"{progress:.1f}"
+            fig.suptitle(suptitle_info + progress_status)
+            plt.draw()
+            plt.pause(0.1)
+            
                   
         W = weight_identification(
             len(layers) - 1, len(class_count), neurons, x_train_size)
@@ -381,48 +368,48 @@ def fex(
     w,                   # num: Weight matrix of the neural network.
     is_training,        # bool: Flag indicating if the function is called during training (True or False).
     Class,               # int: Which class is, if training.
-    activation_potential # float or None: Input activation potential (optional)
+    activation_potentiation # float or None: Input activation potentiation (optional)
 ) -> tuple:
     """
-    Applies feature extraction process to the input data using synaptic pruning.
+    Applies feature extraction process to the input data using synaptic potentiation.
 
     Args:
         Input (num): Input data.
         w (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.
-        activation_potential (float or None): Threshold value for comparison. (optional)
+        activation_potentiation (float or None): Threshold value for comparison. (optional)
 
     Returns:
         tuple: A tuple (vector) containing the neural layer result and the updated weight matrix.
     """
 
-    if is_training == True and activation_potential == None:
+    if is_training == True and activation_potentiation == None:
         
         w[Class, :] = Input
 
         return w
 
-    elif is_training == True and activation_potential != None:
+    elif is_training == True and activation_potentiation != None:
    
             
-            Input[Input < activation_potential] = 0
-            Input[Input > activation_potential] = 1
+            Input[Input < activation_potentiation] = 0
+            Input[Input > activation_potentiation] = 1
             
             w[Class,:] = Input
         
             return w
            
-    elif is_training == False and activation_potential == None:
+    elif is_training == False and activation_potentiation == None:
         
             neural_layer = np.dot(w, Input)
      
             return neural_layer
         
-    elif is_training == False and activation_potential != None:
+    elif is_training == False and activation_potentiation != None:
         
-            Input[Input < activation_potential] = 0
-            Input[Input > activation_potential] = 1
+            Input[Input < activation_potentiation] = 0
+            Input[Input > activation_potentiation] = 1
         
             neural_layer = np.dot(w, Input)
         
@@ -504,7 +491,7 @@ 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_potential=None # activation_potential (float or None): Threshold value for comparison. (optional)
+    activation_potentiation=None # activation_potentiation (float or None): Threshold value for comparison. (optional)
 ) -> tuple:
     infoTestModel = """
     Tests the neural network model with the given test data.
@@ -514,7 +501,7 @@ def evaluate(
         y_test (list[num]): Test labels.
         show_metrices (bool): (True or False)
         W (list[num]): Weight matrix list of the neural network.
-        activation_potential (float or None): Threshold value for comparison. (optional)
+        activation_potentiation (float or None): Threshold value for comparison. (optional)
 
     Returns:
         tuple: A tuple containing the predicted labels and the accuracy of the model.
@@ -545,7 +532,7 @@ def evaluate(
                 neural_layer = normalization(neural_layer)
     
                 if Layer == 'fex':
-                    neural_layer = fex(neural_layer, W[index], False, None, activation_potential)
+                    neural_layer = fex(neural_layer, W[index], False, None, activation_potentiation)
                 elif Layer == 'cat':
                     neural_layer = np.dot(W[index], neural_layer)
     
@@ -621,7 +608,7 @@ def multiple_evaluate(
     y_test,         # list[num]: Test labels.
     show_metrices,      # show_metrices (bool): Visualize test progress ? (True or False)
     MW,                  # list[list[num]]: Weight matrix of the neural network.
-    activation_potential=None # (float or None): Threshold value for comparison. (optional)
+    activation_potentiation=None # (float or None): Threshold value for comparison. (optional)
 ) -> tuple:
     infoTestModel = """
     Tests the neural network model with the given test data.
@@ -668,7 +655,7 @@ def multiple_evaluate(
                     neural_layer = normalization(neural_layer)
 
                     if Layer == 'fex':
-                        neural_layer = fex(neural_layer, W[index], False, None, activation_potential)
+                        neural_layer = fex(neural_layer, W[index], False, None, activation_potentiation)
                     elif Layer == 'cat':
                         neural_layer = np.dot(W[index], neural_layer)
 
@@ -738,7 +725,7 @@ def multiple_evaluate(
 
     except:
 
-        print(Fore.RED + "ERROR: Testing model parameters like 'activation_potential' must be same as trained model. Check parameters. Are you sure weights are loaded ? from: evaluate" + infoTestModel + Style.RESET_ALL)
+        print(Fore.RED + "ERROR: Testing model parameters like 'activation_potentiation' must be same as trained model. Check parameters. Are you sure weights are loaded ? from: evaluate" + infoTestModel + Style.RESET_ALL)
         return 'e'
 
     return W, y_preds, acc
@@ -753,11 +740,11 @@ def save_model(model_name,
                model_path,
                scaler_params,
                W,
-               activation_potential=None
+               activation_potentiation=None
                ):
 
     infosave_model = """
-    Function to save a pruning learning model.
+    Function to save a potentiation learning model.
 
     Arguments:
     model_name (str): Name of the model.
@@ -769,7 +756,7 @@ def save_model(model_name,
     model_path (str): Path where the model will be saved. For example: C:/Users/beydili/Desktop/denemePLAN/
     scaler_params (int, float): standard scaler params list: mean,std. If not used standard scaler then be: None.
     W: Weights of the model.
-    activation_potential (float or None): Threshold value for comparison. (optional)
+    activation_potentiation (float or None): Threshold value for comparison. (optional)
     
     Returns:
     str: Message indicating if the model was saved successfully or encountered an error.
@@ -819,7 +806,7 @@ def save_model(model_name,
             'WEIGHTS FORMAT': weights_format,
             'MODEL PATH': model_path,
             'STANDARD SCALER': scaler_params,
-            'ACTIVATION POTENTIAL': activation_potential
+            'ACTIVATION POTENTIATION': activation_potentiation
             }
     try:
 
@@ -908,14 +895,14 @@ def load_model(model_name,
                model_path,
                ):
     infoload_model = """
-   Function to load a pruning learning model.
+   Function to load a potentiation learning model.
 
    Arguments:
    model_name (str): Name of the model.
    model_path (str): Path where the model is saved.
 
    Returns:
-   lists: W(list[num]), activation_potential, DataFrame of the model
+   lists: W(list[num]), activation_potentiation, DataFrame of the model
     """
     pass
 
@@ -955,7 +942,7 @@ def load_model(model_name,
 def predict_model_ssd(Input, model_name, model_path):
 
     infopredict_model_ssd = """
-    Function to make a prediction using a divided pruning learning artificial neural network (PLAN).
+    Function to make a prediction using a divided potentiation learning artificial neural network (PLAN).
 
     Arguments:
     Input (list or ndarray): Input data for the model (single vector or single matrix).
@@ -965,15 +952,15 @@ def predict_model_ssd(Input, model_name, model_path):
     """
     W, df = load_model(model_name, model_path)
     
-    activation_potential = str(df['ACTIVATION POTENTIAL'].iloc[0])
+    activation_potentiation = str(df['ACTIVATION POTENTIATION'].iloc[0])
 
-    if activation_potential != 'nan':
+    if activation_potentiation != 'nan':
 
-        activation_potential = float(activation_potential)
+        activation_potentiation = float(activation_potentiation)
         
     else:
     
-        activation_potential = None
+        activation_potentiation = None
     
     try:
         
@@ -1003,7 +990,7 @@ def predict_model_ssd(Input, model_name, model_path):
             neural_layer = normalization(neural_layer)
 
             if Layer == 'fex':
-                neural_layer = fex(neural_layer, W[index], False, None, activation_potential)
+                neural_layer = fex(neural_layer, W[index], False, None, activation_potentiation)
             elif Layer == 'cat':
                 neural_layer = np.dot(W[index], neural_layer)
     except:
@@ -1015,17 +1002,17 @@ def predict_model_ssd(Input, model_name, model_path):
     return neural_layer
 
 
-def predict_model_ram(Input, scaler_params, W, activation_potential=None):
+def predict_model_ram(Input, scaler_params, W, activation_potentiation=None):
 
     infopredict_model_ram = """
-    Function to make a prediction using a divided pruning learning artificial neural network (PLAN).
+    Function to make a prediction using a divided potentiation learning artificial neural network (PLAN).
     from weights and parameters stored in memory.
 
     Arguments:
     Input (list or ndarray): Input data for the model (single vector or single matrix).
     scaler_params (int, float): standard scaler params list: mean,std. If not used standard scaler then be: None.
     W (list of ndarrays): Weights of the model.
-    activation_potential (float or None): Threshold value for comparison. (optional)
+    activation_potentiation (float or None): Threshold value for comparison. (optional)
 
     Returns:
     ndarray: Output from the model.
@@ -1049,7 +1036,7 @@ def predict_model_ram(Input, scaler_params, W, activation_potential=None):
             neural_layer = normalization(neural_layer)
 
             if Layer == 'fex':
-                neural_layer = fex(neural_layer, W[index], False, None, activation_potential)
+                neural_layer = fex(neural_layer, W[index], False, None, activation_potentiation)
             elif Layer == 'cat':
                 neural_layer = np.dot(W[index], neural_layer)
 
@@ -1695,4 +1682,4 @@ def get_preds():
 
 def get_acc():
 
-    return 2
+    return 2

{pyerualjetwork-2.5.9 → pyerualjetwork-2.6.3}/pyerualjetwork.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyerualjetwork
-Version: 2.5.9
+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

{pyerualjetwork-2.5.9 → pyerualjetwork-2.6.3}/setup.py

@@ -5,7 +5,7 @@ from setuptools import setup, find_packages
 setup(
       
       name = "pyerualjetwork",
-      version = "2.5.9",
+      version = "2.6.3",
       author = "Hasan Can Beydili",
       author_email = "tchasancan@gmail.com",
       description= "New optional parameters added for fit function, x_val, y_val show_count, val_count, val. For more information please read user document",