From aa13d30f98978ae73e9be4504c45b5b45797033f Mon Sep 17 00:00:00 2001 From: SevgiAkten Date: Wed, 14 Aug 2024 18:22:00 +0300 Subject: [PATCH] edit init files and md files --- README.md | 11 +++++---- paper/paper.md | 11 +++++---- pycellga/__init__.py | 12 ++++++++++ pycellga/example/__init__.py | 5 ++++ pycellga/mutation/__init__.py | 9 +++++++ pycellga/neighborhoods/__init__.py | 6 +++++ .../single_objective/continuous/__init__.py | 24 +++++++++++++++++++ .../discrete/binary/__init__.py | 9 +++++++ .../discrete/permutation/__init__.py | 1 + pycellga/recombination/__init__.py | 12 ++++++++++ pycellga/selection/__init__.py | 3 +++ setup.py | 5 ++-- 12 files changed, 96 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index f5f0f99..dc3e172 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,7 @@ Here’s how we can define this problem in Python using the `ExampleProblem` cla ```python from numpy import power as pw +import pycellga class ExampleProblem: @@ -68,18 +69,18 @@ class ExampleProblem: **Usage:** ```python -result = optimizer.cga( +result = pycellga.optimizer.cga( n_cols = 5, n_rows = 5, n_gen = 100, ch_size = 5, - gen_type = GeneType.REAL, + gen_type = pycellga.optimizer.GeneType.REAL, p_crossover = 0.9, p_mutation = 0.2, problem = ExampleProblem(), # Replace with a real problem instance as needed - selection = optimizer.TournamentSelection, - recombination = optimizer.ByteOnePointCrossover, - mutation = optimizer.ByteMutationRandom, + selection = pycellga.optimizer.TournamentSelection, + recombination = pycellga.optimizer.ByteOnePointCrossover, + mutation = pycellga.optimizer.ByteMutationRandom, mins = [-32.768] * 5, # Minimum values for each gene maxs = [32.768] * 5 # Maximum values for each gene ) diff --git a/paper/paper.md b/paper/paper.md index f78d329..cdae30a 100644 --- a/paper/paper.md +++ b/paper/paper.md @@ -73,6 +73,7 @@ Here’s how we can define this problem in Python using the `ExampleProblem` cla ```python from numpy import power as pw +import pycellga class ExampleProblem: @@ -86,18 +87,18 @@ class ExampleProblem: **Usage:** ```python -result = optimizer.cga( +result = pycellga.optimizer.cga( n_cols = 5, n_rows = 5, n_gen = 100, ch_size = 5, - gen_type = GeneType.REAL, + gen_type = pycellga.optimizer.GeneType.REAL, p_crossover = 0.9, p_mutation = 0.2, problem = ExampleProblem(), # Replace with a real problem instance as needed - selection = optimizer.TournamentSelection, - recombination = optimizer.ByteOnePointCrossover, - mutation = optimizer.ByteMutationRandom, + selection = pycellga.optimizer.TournamentSelection, + recombination = pycellga.optimizer.ByteOnePointCrossover, + mutation = pycellga.optimizer.ByteMutationRandom, mins = [-32.768] * 5, # Minimum values for each gene maxs = [32.768] * 5 # Maximum values for each gene ) diff --git a/pycellga/__init__.py b/pycellga/__init__.py index e69de29..344d32e 100644 --- a/pycellga/__init__.py +++ b/pycellga/__init__.py @@ -0,0 +1,12 @@ +from . import example +from . import mutation +from . import neighborhoods +from . import problems +from . import recombination +from . import selection +from . import optimizer +from . import population +from . import individual +from . import grid +from . import byte_operators + diff --git a/pycellga/example/__init__.py b/pycellga/example/__init__.py index 5822969..18ab0b2 100644 --- a/pycellga/example/__init__.py +++ b/pycellga/example/__init__.py @@ -3,3 +3,8 @@ sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))) import optimizer from individual import GeneType +from . import example_alpha_cga +from . import example_ccga +from . import example_cga +from . import example_mcccga +from . import example_sync_cga \ No newline at end of file diff --git a/pycellga/mutation/__init__.py b/pycellga/mutation/__init__.py index e69de29..52a70d7 100644 --- a/pycellga/mutation/__init__.py +++ b/pycellga/mutation/__init__.py @@ -0,0 +1,9 @@ +from . import bit_flip_mutation +from . import byte_mutation +from . import byte_mutation_random +from . import float_uniform_mutation +from . import insertion_mutation +from . import mutation_operator +from . import shuffle_mutation +from . import swap_mutation +from . import two_opt_mutation \ No newline at end of file diff --git a/pycellga/neighborhoods/__init__.py b/pycellga/neighborhoods/__init__.py index e69de29..119cab3 100644 --- a/pycellga/neighborhoods/__init__.py +++ b/pycellga/neighborhoods/__init__.py @@ -0,0 +1,6 @@ +from . import compact_9 +from . import compact_13 +from . import compact_21 +from . import compact_25 +from . import linear_5 +from . import linear_9 diff --git a/pycellga/problems/single_objective/continuous/__init__.py b/pycellga/problems/single_objective/continuous/__init__.py index e69de29..d4ba13a 100644 --- a/pycellga/problems/single_objective/continuous/__init__.py +++ b/pycellga/problems/single_objective/continuous/__init__.py @@ -0,0 +1,24 @@ +from . import ackley +from . import bentcigar +from . import bohachevsky +from . import chichinadze +from . import dropwave +from . import fms +from . import griewank +from . import holzman +from . import levy +from . import matyas +from . import pow +from . import powell +from . import rastrigin +from . import rosenbrock +from . import rothellipsoid +from . import schaffer +from . import schaffer2 +from . import schwefel +from . import sphere +from . import styblinskitang +from . import sumofdifferentpowers +from . import threehumps +from . import zakharov +from . import zettle diff --git a/pycellga/problems/single_objective/discrete/binary/__init__.py b/pycellga/problems/single_objective/discrete/binary/__init__.py index e69de29..de66151 100644 --- a/pycellga/problems/single_objective/discrete/binary/__init__.py +++ b/pycellga/problems/single_objective/discrete/binary/__init__.py @@ -0,0 +1,9 @@ +from . import count_sat +from . import ecc +from . import fms +from . import maxcut20_01 +from . import maxcut20_09 +from . import maxcut100 +from . import mmdp +from . import one_max +from . import peak \ No newline at end of file diff --git a/pycellga/problems/single_objective/discrete/permutation/__init__.py b/pycellga/problems/single_objective/discrete/permutation/__init__.py index e69de29..62bcba8 100644 --- a/pycellga/problems/single_objective/discrete/permutation/__init__.py +++ b/pycellga/problems/single_objective/discrete/permutation/__init__.py @@ -0,0 +1 @@ +from . import tsp \ No newline at end of file diff --git a/pycellga/recombination/__init__.py b/pycellga/recombination/__init__.py index e69de29..7832b7f 100644 --- a/pycellga/recombination/__init__.py +++ b/pycellga/recombination/__init__.py @@ -0,0 +1,12 @@ +from . import arithmetic_crossover +from . import blxalpha_crossover +from . import byte_one_point_crossover +from . import byte_uniform_crossover +from . import flat_crossover +from . import linear_crossover +from . import one_point_crossover +from . import pmx_crossover +from . import recombination_operator +from . import two_point_crossover +from . import unfair_avarage_crossover +from . import uniform_crossover \ No newline at end of file diff --git a/pycellga/selection/__init__.py b/pycellga/selection/__init__.py index e69de29..d404a42 100644 --- a/pycellga/selection/__init__.py +++ b/pycellga/selection/__init__.py @@ -0,0 +1,3 @@ +from . import roulette_wheel_selection +from . import selection_operator +from . import tournament_selection \ No newline at end of file diff --git a/setup.py b/setup.py index 9835b5a..8cacd51 100644 --- a/setup.py +++ b/setup.py @@ -5,11 +5,12 @@ setup( name='pycellga', - version='0.1.8', + version='0.2.1', description='A Python Package for Improved Cellular Genetic Algorithms', author='Sevgi Akten Karakaya, Mehmet Hakan Satman', author_email='sevgiakten@gmail.com, mhsatman@gmail.com', - packages=find_packages(), + packages=find_packages(where="."), + package_dir={'pycellga': 'pycellga'}, install_requires=required, classifiers=[ 'Programming Language :: Python :: 3',