pyerualjetwork 4.1.8b5__py3-none-any.whl → 4.1.8b7__py3-none-any.whl

pyerualjetwork/__init__.py

@@ -48,7 +48,7 @@ for package_name in package_names:
 
 print(f"PyerualJetwork is ready to use with {err} errors")
 
-__version__ = "4.1.8b5"
+__version__ = "4.1.8b7"
 __update__ = "* Changes: https://github.com/HCB06/PyerualJetwork/blob/main/CHANGES\n* PyerualJetwork document: https://github.com/HCB06/PyerualJetwork/blob/main/Welcome_to_PyerualJetwork/PYERUALJETWORK_USER_MANUEL_AND_LEGAL_INFORMATION(EN).pdf\n* YouTube tutorials: https://www.youtube.com/@HasanCanBeydili"
 
 def print_version(__version__):

pyerualjetwork/plan.py

@@ -171,7 +171,7 @@ def fit(
     return normalization(LTPW, dtype=dtype)
 
 
-def learner(x_train, y_train, optimizator, x_test=None, y_test=None, strategy='accuracy', gen=None, batch_size=1,
+def learner(x_train, y_train, optimizer, x_test=None, y_test=None, strategy='accuracy', gen=None, batch_size=1,
            neural_web_history=False, show_current_activations=False, auto_normalization=True,
            neurons_history=False, early_stop=False, loss='categorical_crossentropy', show_history=False,
            interval=33.33, target_acc=None, target_loss=None, except_this=None,
@@ -190,9 +190,9 @@ def learner(x_train, y_train, optimizator, x_test=None, y_test=None, strategy='a
 
         y_train (array-like): Labels for training data. one-hot encoded.
 
-        optimizator (function): PLAN optimization technique with hyperparameters. (PLAN using NEAT(PLANEAT) for optimization.) Please use this: from pyerualjetwork import planeat (and) optimizator = lambda *args, **kwargs: planeat.evolve(*args, 'here give your neat hyperparameters for example:  activation_add_prob=0.85', **kwargs) Example:
+        optimizer (function): PLAN optimization technique with hyperparameters. (PLAN using NEAT(PLANEAT) for optimization.) Please use this: from pyerualjetwork import planeat (and) optimizer = lambda *args, **kwargs: planeat.evolve(*args, 'here give your neat hyperparameters for example:  activation_add_prob=0.85', **kwargs) Example:
         ```python
-        genetic_optimizator = lambda *args, **kwargs: planeat.evolve(*args,
+        genetic_optimizer = lambda *args, **kwargs: planeat.evolve(*args,
                                                                     activation_add_prob=0.85,
                                                                     mutations=False,
                                                                     strategy='cross_over',
@@ -200,7 +200,7 @@ def learner(x_train, y_train, optimizator, x_test=None, y_test=None, strategy='a
 
         model = plan.learner(x_train,
                              y_train,
-                             optimizator=genetic_optimizator,
+                             optimizer=genetic_optimizer,
                              strategy='accuracy',
                              show_history=True,
                              target_acc=0.94,
@@ -337,7 +337,6 @@ def learner(x_train, y_train, optimizator, x_test=None, y_test=None, strategy='a
     target_pop = []
 
     for i in range(len(activation_potentiation)):
-        print(f"\rPre-Run {i}/{len(activation_potentiation)}",end='')
 
         if i == 0 and start_this_act is not None:
             act_pop[0] = activation_potentiation[i]
@@ -363,7 +362,8 @@ def learner(x_train, y_train, optimizator, x_test=None, y_test=None, strategy='a
             if strategy == 'recall': target_pop.append(recall_score)
             if strategy == 'f1': target_pop.append(f1_score)
 
-    weight_pop, act_pop = optimizator(np.array(weight_pop, dtype=dtype), act_pop, 0, np.array(target_pop, dtype=dtype), target_fitness=target_fitness, bar_status=False)
+        print(f"\rPre-Fit {i}/{len(activation_potentiation)}, {data} {strategy}: {target_pop[-1]}",end='')
+
     progress = initialize_loading_bar(total=len(activation_potentiation), desc="", ncols=ncols, bar_format=bar_format_learner)
 
     for i in range(gen):
@@ -374,7 +374,7 @@ def learner(x_train, y_train, optimizator, x_test=None, y_test=None, strategy='a
         progress.last_print_n = 0
         progress.update(0)
         
-        weight_pop, act_pop = optimizator(np.array(weight_pop, dtype=dtype), act_pop, i, np.array(target_pop, dtype=dtype, copy=False), target_fitness=target_fitness, bar_status=False)
+        weight_pop, act_pop = optimizer(np.array(weight_pop, dtype=dtype), act_pop, i, np.array(target_pop, dtype=dtype, copy=False), target_fitness=target_fitness, bar_status=False)
         target_pop = []
 
         for j in range(len(activation_potentiation)):

pyerualjetwork/plan_cuda.py

@@ -14,6 +14,7 @@ PYERUALJETWORK document: https://github.com/HCB06/PyerualJetwork/blob/main/Welco
 """
 
 import cupy as cp
+import numpy as np
 from colorama import Fore
 import math
 
@@ -187,7 +188,7 @@ def fit(
     return normalization(LTPW, dtype=dtype)
 
 
-def learner(x_train, y_train, optimizator, x_test=None, y_test=None, strategy='accuracy', gen=None, batch_size=1,
+def learner(x_train, y_train, optimizer, x_test=None, y_test=None, strategy='accuracy', gen=None, batch_size=1,
            neural_web_history=False, show_current_activations=False, auto_normalization=True,
            neurons_history=False, early_stop=False, loss='categorical_crossentropy', show_history=False,
            interval=33.33, target_acc=None, target_loss=None, except_this=None,
@@ -206,9 +207,9 @@ def learner(x_train, y_train, optimizator, x_test=None, y_test=None, strategy='a
 
         y_train (array-like): Labels for training data.
 
-        optimizator (function): PLAN optimization technique with hyperparameters. (PLAN using NEAT(PLANEAT) for optimization.) Please use this: from pyerualjetwork import planeat_cuda (and) optimizator = lambda *args, **kwargs: planeat_cuda.evolve(*args, 'here give your neat hyperparameters for example:  activation_add_prob=0.85', **kwargs) Example:
+        optimizer (function): PLAN optimization technique with hyperparameters. (PLAN using NEAT(PLANEAT) for optimization.) Please use this: from pyerualjetwork import planeat_cuda (and) optimizer = lambda *args, **kwargs: planeat_cuda.evolve(*args, 'here give your neat hyperparameters for example:  activation_add_prob=0.85', **kwargs) Example:
         ```python
-        genetic_optimizator = lambda *args, **kwargs: planeat_cuda.evolve(*args,
+        genetic_optimizer = lambda *args, **kwargs: planeat_cuda.evolve(*args,
                                                                     activation_add_prob=0.85,
                                                                     mutations=False,
                                                                     strategy='cross_over',
@@ -216,7 +217,7 @@ def learner(x_train, y_train, optimizator, x_test=None, y_test=None, strategy='a
 
         model = plan_cuda.learner(x_train,
                              y_train,
-                             optimizator=genetic_optimizator,
+                             optimizer=genetic_optimizer,
                              strategy='accuracy',
                              show_history=True,
                              target_acc=0.94,
@@ -317,9 +318,9 @@ def learner(x_train, y_train, optimizator, x_test=None, y_test=None, strategy='a
 
     # Initialize progress bar
     if batch_size == 1:
-        ncols = 76
+        ncols = 86
     else:
-        ncols = 89
+        ncols = 99
 
     # Initialize variables
     act_pop = []
@@ -332,7 +333,6 @@ def learner(x_train, y_train, optimizator, x_test=None, y_test=None, strategy='a
         weight_pop.append(start_this_W)
         
         x_test_batch, y_test_batch = batcher(x_test, y_test, batch_size=batch_size)
-        
         model = evaluate(x_test_batch, y_test_batch, W=start_this_W, loading_bar_status=False, activation_potentiation=act_pop, dtype=dtype, memory=memory)
 
         if loss == 'categorical_crossentropy':
@@ -349,7 +349,6 @@ def learner(x_train, y_train, optimizator, x_test=None, y_test=None, strategy='a
     target_pop = []
 
     for i in range(len(activation_potentiation)):
-        print(f"\rPre-Run {i}/{len(activation_potentiation)}",end='')
 
         if i == 0 and start_this_act is not None:
             act_pop[0] = activation_potentiation[i]
@@ -375,9 +374,8 @@ def learner(x_train, y_train, optimizator, x_test=None, y_test=None, strategy='a
             if strategy == 'recall': target_pop.append(recall_score)
             if strategy == 'f1': target_pop.append(f1_score)
 
-        
+        print(f"\rPre-Fit {i}/{len(activation_potentiation)}, {data} {strategy}: {target_pop[-1]}",end='')
 
-    weight_pop, act_pop = optimizator(cp.array(weight_pop, dtype=dtype), act_pop, 0, cp.array(target_pop, dtype=dtype), target_fitness=target_fitness, bar_status=False)
     progress = initialize_loading_bar(total=len(activation_potentiation), desc="", ncols=ncols, bar_format=bar_format_learner)
 
     for i in range(gen):
@@ -388,6 +386,9 @@ def learner(x_train, y_train, optimizator, x_test=None, y_test=None, strategy='a
         progress.last_print_n = 0
         progress.update(0)
 
+        weight_pop, act_pop = optimizer(cp.array(weight_pop, dtype=dtype), act_pop, i, cp.array(target_pop, dtype=dtype, copy=False), target_fitness=target_fitness, bar_status=False)
+        target_pop = []
+
         for j in range(len(activation_potentiation)):
 
             x_test_batch, y_test_batch = batcher(x_test, y_test, batch_size=batch_size)

pyerualjetwork/planeat_cuda.py

@@ -230,17 +230,15 @@ Example:
    else:
       raise ValueError("genome population size must be even number. for example: not 99, make 100 or 98.")
 
-   sort_indices = cp.argsort(fitness)
-
 ### FITNESS LIST IS SORTED IN ASCENDING (OR DESCENDING) ORDER, AND THE WEIGHT AND ACTIVATIONS OF EACH GENOME ARE SORTED ACCORDING TO THIS ORDER:
 
-   if target_fitness == 'max': sort_indices = np.argsort(fitness)
-   elif target_fitness == 'min': sort_indices = np.argsort(-fitness)
+   if target_fitness == 'max': sort_indices = cp.argsort(fitness)
+   elif target_fitness == 'min': sort_indices = cp.argsort(-fitness)
 
    fitness = fitness[sort_indices]
    weights = weights[sort_indices]
 
-   activation_potentiations = [activation_potentiations[i] for i in sort_indices]
+   activation_potentiations = [activation_potentiations[int(i)] for i in sort_indices]
 
 ### GENOMES ARE DIVIDED INTO TWO GROUPS: GOOD GENOMES AND BAD GENOMES:
 
@@ -355,9 +353,9 @@ Example:
       print("  ACTIVATION SELECTION RATE (THRESHOLD VALUE FOR SINGLE CROSS OVER):", str(activation_selection_rate) + '\n')
 
       print("*** Performance ***")
-      print("  MAX REWARD: ", str(round(max(fitness), 2)))
-      print("  MEAN REWARD: ", str(round(cp.mean(fitness), 2)))
-      print("  MIN REWARD: ", str(round(min(fitness), 2)) + '\n')
+      print(" MAX REWARD: ", str(cp.round(max(fitness), 2)))
+      print("  MEAN REWARD: ", str(cp.round(cp.mean(fitness), 2)))
+      print("  MIN REWARD: ", str(cp.round(min(fitness), 2)) + '\n')
 
       print("  BEST GENOME INDEX: ", str(len(weights)-1))
       print("  NOTE: Genomes are always sorted from the least successful to the most successful according to their performance ranking. Therefore, the genome at the last index is the king of the previous generation. " + '\n')

{pyerualjetwork-4.1.8b5.dist-info → pyerualjetwork-4.1.8b7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyerualjetwork
-Version: 4.1.8b5
+Version: 4.1.8b7
 Summary: PyerualJetwork is a machine learning library written in Python for professionals, incorporating advanced, unique, new, and modern techniques.
 Author: Hasan Can Beydili
 Author-email: tchasancan@gmail.com

{pyerualjetwork-4.1.8b5.dist-info → pyerualjetwork-4.1.8b7.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyerualjetwork/__init__.py,sha256=TjNWEkaJUK3BCnAwlidyDnpk-xNRJG1jekVTq5IB5vk,2177
+pyerualjetwork/__init__.py,sha256=1nfR13uyGk9RA12z_vzmGRlH3he4Y2fX4bDnLnZgmYY,2177
 pyerualjetwork/activation_functions.py,sha256=WWOdMd5pI6ZKe-ieKCIsKAYPQODHuXYxx7tzhA5xjes,11767
 pyerualjetwork/activation_functions_cuda.py,sha256=KmXJ5Cdig46XAMYakXFPEOlxSxtFJjD21-i3nGtxPjE,11807
 pyerualjetwork/data_operations.py,sha256=ZM24BuPsIAtI0a_Exr4HgCjmlb285wEeO8juFY9sJr0,14680
@@ -11,14 +11,14 @@ pyerualjetwork/metrics.py,sha256=q7MkhnZDRbCjFBDDfUgrl8lBYnUT_1ro1LxeBq105pI,607
 pyerualjetwork/metrics_cuda.py,sha256=73h9GC7XwmnFCVzFEEiPQfF8CwHIz2wsCbxpZrJtYgw,5061
 pyerualjetwork/model_operations.py,sha256=hnhR8dtoICNJWIwGgJ65-LN3GYN_DYH4LMe6YpZVbnI,12967
 pyerualjetwork/model_operations_cuda.py,sha256=XnKKq54ZLaqCm-NaJ6d8IToACKcKg2Ttq6moowVRRWo,13365
-pyerualjetwork/plan.py,sha256=K24krCR7oN2fH0JLM9i_wtd4NRqLV608tX1bcQKbjRQ,35553
-pyerualjetwork/plan_cuda.py,sha256=3rZvnuv6zF0Wns8xwT0jH1ySOKYXzSUMvg2FI8beLys,36181
+pyerualjetwork/plan.py,sha256=RtvLjszctY3aHbV1DinGfFVPPjm_tuXJOeMeoM4-pWM,35408
+pyerualjetwork/plan_cuda.py,sha256=oc1Fim1-SQfA0-0ctu4PvmzsTn0Iz2Z-XSmuFc5Wkeg,36247
 pyerualjetwork/planeat.py,sha256=VtWtWndbKoFNYTWd1EsyKBV4Vp5U6cc7uWDgQ4WjHqo,40248
-pyerualjetwork/planeat_cuda.py,sha256=6cizuh06kgq8x8dPqVutbgpgrpM76cF_XWRtUVQ9U1k,40265
+pyerualjetwork/planeat_cuda.py,sha256=fSn28ZbxctPvBjpKgtv_uGwwUdTEXkBizy76mMlZYJ0,40237
 pyerualjetwork/ui.py,sha256=wu2BhU1k-w3Kcho5Jtq4SEKe68ftaUeRGneUOSCVDjU,575
 pyerualjetwork/visualizations.py,sha256=QaYSIyVkJZ8NqpBKArQKkI1y37nCQo_KIM98IMssnRc,28766
 pyerualjetwork/visualizations_cuda.py,sha256=9qw46Y4bo67l0nVVF1FSNS8ksyzbIAJdaPDFOhN5J8Y,29188
-pyerualjetwork-4.1.8b5.dist-info/METADATA,sha256=NamWj41_Jt1lC-dRwfJPK5J3goq2OtDfo9YDdNM8nSg,7795
-pyerualjetwork-4.1.8b5.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-pyerualjetwork-4.1.8b5.dist-info/top_level.txt,sha256=BRyt62U_r3ZmJpj-wXNOoA345Bzamrj6RbaWsyW4tRg,15
-pyerualjetwork-4.1.8b5.dist-info/RECORD,,
+pyerualjetwork-4.1.8b7.dist-info/METADATA,sha256=-SWnXD8f5SB85DpF-beH6drOdrIv8xC_zoljAznyFUk,7795
+pyerualjetwork-4.1.8b7.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+pyerualjetwork-4.1.8b7.dist-info/top_level.txt,sha256=BRyt62U_r3ZmJpj-wXNOoA345Bzamrj6RbaWsyW4tRg,15
+pyerualjetwork-4.1.8b7.dist-info/RECORD,,