pyerualjetwork 2.2.0__tar.gz → 2.2.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyerualjetwork
-Version: 2.2.0
+Version: 2.2.2
 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.0 → pyerualjetwork-2.2.2}/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)

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

@@ -58,7 +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)
     start_time = time.time()
@@ -72,19 +72,6 @@ def fit(
                   infoPLAN + Style.RESET_ALL)
             return 'e'
 
-        for Ulindex, Ul in enumerate(class_count):
-
-            if Ul == y_train[index]:
-                for Windex, w in enumerate(W):
-                    for i, ul in enumerate(Ul):
-                        if ul == 1.0:
-                            k = i
-
-                    cs = Divides[int(k)][Windex][0]
-
-                    W[Windex] = synaptic_pruning(w, cs, 'row', int(
-                        k), len(class_count), Piece[Windex], True)
-
         neural_layer = inp
 
         for Lindex, Layer in enumerate(layers):
@@ -94,8 +81,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 +150,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 +289,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 +405,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 +527,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 +843,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 +888,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." +

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyerualjetwork
-Version: 2.2.0
+Version: 2.2.2
 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.0 → pyerualjetwork-2.2.2}/setup.py

@@ -5,7 +5,7 @@ from setuptools import setup, find_packages
 setup(
       
       name = "pyerualjetwork",
-      version = "2.2.0",
+      version = "2.2.2",
       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)",