Changeset 1185


Ignore:
Timestamp:
11/07/22 21:29:25 (4 weeks ago)
Author:
Maciej Komosinski
Message:

Renamed a module; new name is "evolalg_steps"

Location:
framspy
Files:
37 edited
2 moved

Legend:

Unmodified
Added
Removed
  • framspy/evolalg_steps/base/frams_step.py

    r1139 r1185  
    1 from evolalg.base.step import Step
     1from evolalg_steps.base.step import Step
    22
    33
  • framspy/evolalg_steps/base/lambda_step.py

    r1139 r1185  
    1 from evolalg.base.step import Step
     1from evolalg_steps.base.step import Step
    22
    33
  • framspy/evolalg_steps/base/union_step.py

    r1146 r1185  
    11from collections import Iterable
    22
    3 from evolalg.base.step import Step
     3from evolalg_steps.base.step import Step
    44
    55
  • framspy/evolalg_steps/dissimilarity/archive.py

    r1182 r1185  
    22from typing import Union
    33
    4 from evolalg.base.step import Step
    5 from evolalg.dissimilarity.dissimilarity import Dissimilarity
    6 from evolalg.dissimilarity.frams_dissimilarity import FramsDissimilarity
    7 from evolalg.statistics.halloffame_custom import HallOfFameCustom
     4from evolalg_steps.base.step import Step
     5from evolalg_steps.dissimilarity.dissimilarity import Dissimilarity
     6from evolalg_steps.dissimilarity.frams_dissimilarity import FramsDissimilarity
     7from evolalg_steps.statistics.halloffame_custom import HallOfFameCustom
    88
    99# TODO not fully tested. Verify if works OK, in particular test adding new individuals.
  • framspy/evolalg_steps/dissimilarity/dissimilarity.py

    r1182 r1185  
    11from abc import ABC
    22
    3 from evolalg.base.step import Step
     3from evolalg_steps.base.step import Step
    44import numpy as np
    55
  • framspy/evolalg_steps/dissimilarity/frams_dissimilarity.py

    r1182 r1185  
    33import numpy as np
    44
    5 from evolalg.base.frams_step import FramsStep
    6 from evolalg.dissimilarity.dissimilarity import Dissimilarity
     5from evolalg_steps.base.frams_step import FramsStep
     6from evolalg_steps.dissimilarity.dissimilarity import Dissimilarity
    77
    88
  • framspy/evolalg_steps/dissimilarity/levenshtein.py

    r1182 r1185  
    11import Levenshtein as lev
    22
    3 from evolalg.dissimilarity.dissimilarity import Dissimilarity
     3from evolalg_steps.dissimilarity.dissimilarity import Dissimilarity
    44
    55
  • framspy/evolalg_steps/examples/multicriteria.py

    r1149 r1185  
    1919
    2020from FramsticksLib import FramsticksLib
    21 from evolalg.base.lambda_step import LambdaStep
    22 from evolalg.base.step import Step
    23 from evolalg.dissimilarity.frams_dissimilarity import FramsDissimilarity
    24 from evolalg.dissimilarity.levenshtein import LevenshteinDissimilarity
    25 from evolalg.experiment import Experiment
    26 from evolalg.fitness.fitness_step import FitnessStep
    27 from evolalg.mutation_cross.frams_cross_and_mutate import FramsCrossAndMutate
    28 from evolalg.population.frams_population import FramsPopulation
    29 from evolalg.repair.remove.field import FieldRemove
    30 from evolalg.repair.remove.remove import Remove
    31 from evolalg.selection.nsga2 import NSGA2Selection
    32 from evolalg.statistics.halloffame_stats import HallOfFameStatistics
    33 from evolalg.statistics.multistatistics_deap import MultiStatistics
    34 from evolalg.statistics.statistics_deap import StatisticsDeap
    35 from evolalg.base.union_step import UnionStep
    36 from evolalg.utils.population_save import PopulationSave
     21from evolalg_steps.base.lambda_step import LambdaStep
     22from evolalg_steps.base.step import Step
     23from evolalg_steps.dissimilarity.frams_dissimilarity import FramsDissimilarity
     24from evolalg_steps.dissimilarity.levenshtein import LevenshteinDissimilarity
     25from evolalg_steps.experiment import Experiment
     26from evolalg_steps.fitness.fitness_step import FitnessStep
     27from evolalg_steps.mutation_cross.frams_cross_and_mutate import FramsCrossAndMutate
     28from evolalg_steps.population.frams_population import FramsPopulation
     29from evolalg_steps.repair.remove.field import FieldRemove
     30from evolalg_steps.repair.remove.remove import Remove
     31from evolalg_steps.selection.nsga2 import NSGA2Selection
     32from evolalg_steps.statistics.halloffame_stats import HallOfFameStatistics
     33from evolalg_steps.statistics.multistatistics_deap import MultiStatistics
     34from evolalg_steps.statistics.statistics_deap import StatisticsDeap
     35from evolalg_steps.base.union_step import UnionStep
     36from evolalg_steps.utils.population_save import PopulationSave
    3737
    3838
  • framspy/evolalg_steps/examples/niching_novelty.py

    r1182 r1185  
    99
    1010from FramsticksLib import FramsticksLib
    11 from evolalg.base.lambda_step import LambdaStep
    12 from evolalg.base.step import Step
    13 from evolalg.dissimilarity.archive import ArchiveDissimilarity
    14 from evolalg.dissimilarity.frams_dissimilarity import FramsDissimilarity
    15 from evolalg.dissimilarity.levenshtein import LevenshteinDissimilarity
    16 from evolalg.experiment import Experiment
    17 from evolalg.fitness.fitness_step import FitnessStep
    18 from evolalg.mutation_cross.frams_cross_and_mutate import FramsCrossAndMutate
    19 from evolalg.population.frams_population import FramsPopulation
    20 from evolalg.repair.remove.field import FieldRemove
    21 from evolalg.repair.remove.remove import Remove
    22 from evolalg.selection.tournament import TournamentSelection
    23 from evolalg.statistics.halloffame_stats import HallOfFameStatistics
    24 from evolalg.statistics.statistics_deap import StatisticsDeap
    25 from evolalg.base.union_step import UnionStep
    26 from evolalg.utils.population_save import PopulationSave
     11from evolalg_steps.base.lambda_step import LambdaStep
     12from evolalg_steps.base.step import Step
     13from evolalg_steps.dissimilarity.archive import ArchiveDissimilarity
     14from evolalg_steps.dissimilarity.frams_dissimilarity import FramsDissimilarity
     15from evolalg_steps.dissimilarity.levenshtein import LevenshteinDissimilarity
     16from evolalg_steps.experiment import Experiment
     17from evolalg_steps.fitness.fitness_step import FitnessStep
     18from evolalg_steps.mutation_cross.frams_cross_and_mutate import FramsCrossAndMutate
     19from evolalg_steps.population.frams_population import FramsPopulation
     20from evolalg_steps.repair.remove.field import FieldRemove
     21from evolalg_steps.repair.remove.remove import Remove
     22from evolalg_steps.selection.tournament import TournamentSelection
     23from evolalg_steps.statistics.halloffame_stats import HallOfFameStatistics
     24from evolalg_steps.statistics.statistics_deap import StatisticsDeap
     25from evolalg_steps.base.union_step import UnionStep
     26from evolalg_steps.utils.population_save import PopulationSave
    2727
    2828
     
    226226    if parsed_args.max_numconnections is not None:
    227227        remove.append(NumConnectionsHigher(parsed_args.max_numconnections))
    228     if parsed_args.max_numgenochars is not -1:
     228    if parsed_args.max_numgenochars != -1:
    229229        remove.append(NumCharsHigher(parsed_args.max_numgenochars))
    230230
  • framspy/evolalg_steps/examples/standard.py

    r1149 r1185  
    1212
    1313from FramsticksLib import FramsticksLib
    14 from evolalg.base.union_step import UnionStep
    15 from evolalg.experiment import Experiment
    16 from evolalg.fitness.fitness_step import FitnessStep
    17 from evolalg.mutation_cross.frams_cross_and_mutate import FramsCrossAndMutate
    18 from evolalg.population.frams_population import FramsPopulation
    19 from evolalg.repair.remove.field import FieldRemove
    20 from evolalg.selection.tournament import TournamentSelection
    21 from evolalg.statistics.halloffame_stats import HallOfFameStatistics
    22 from evolalg.statistics.statistics_deap import StatisticsDeap
    23 from evolalg.utils.population_save import PopulationSave
     14from evolalg_steps.base.union_step import UnionStep
     15from evolalg_steps.experiment import Experiment
     16from evolalg_steps.fitness.fitness_step import FitnessStep
     17from evolalg_steps.mutation_cross.frams_cross_and_mutate import FramsCrossAndMutate
     18from evolalg_steps.population.frams_population import FramsPopulation
     19from evolalg_steps.repair.remove.field import FieldRemove
     20from evolalg_steps.selection.tournament import TournamentSelection
     21from evolalg_steps.statistics.halloffame_stats import HallOfFameStatistics
     22from evolalg_steps.statistics.statistics_deap import StatisticsDeap
     23from evolalg_steps.utils.population_save import PopulationSave
    2424
    2525
  • framspy/evolalg_steps/experiment.py

    r1139 r1185  
    22from typing import List, Callable, Union
    33
    4 from evolalg.base.step import Step
     4from evolalg_steps.base.step import Step
    55import pickle
    66import time
    77
    8 from evolalg.base.union_step import UnionStep
    9 from evolalg.selection.selection import Selection
    10 from evolalg.utils.stable_generation import StableGeneration
     8from evolalg_steps.base.union_step import UnionStep
     9from evolalg_steps.selection.selection import Selection
     10from evolalg_steps.utils.stable_generation import StableGeneration
    1111import logging
    1212
  • framspy/evolalg_steps/fitness/fitness_step.py

    r1139 r1185  
    11from typing import Dict, List
    22
    3 from evolalg.base.frams_step import FramsStep
    4 from evolalg.base.individual import Individual
     3from evolalg_steps.base.frams_step import FramsStep
     4from evolalg_steps.base.individual import Individual
    55import frams
    66
  • framspy/evolalg_steps/fitness/multiple_evaluations.py

    r1139 r1185  
    11from typing import Dict, List
    22
    3 from evolalg.base.individual import Individual
    4 from evolalg.fitness.fitness_step import FitnessStep
     3from evolalg_steps.base.individual import Individual
     4from evolalg_steps.fitness.fitness_step import FitnessStep
    55import copy
    66
  • framspy/evolalg_steps/mutation_cross/frams_cross.py

    r1139 r1185  
    11import random
    22
    3 from evolalg.base.frams_step import FramsStep
    4 from evolalg.base.individual import Individual
     3from evolalg_steps.base.frams_step import FramsStep
     4from evolalg_steps.base.individual import Individual
    55
    66
  • framspy/evolalg_steps/mutation_cross/frams_cross_and_mutate.py

    r1139 r1185  
    1 from evolalg.base.frams_step import FramsStep
    2 from evolalg.mutation_cross.frams_cross import FramsCross
    3 from evolalg.mutation_cross.frams_mutation import FramsMutation
     1from evolalg_steps.base.frams_step import FramsStep
     2from evolalg_steps.mutation_cross.frams_cross import FramsCross
     3from evolalg_steps.mutation_cross.frams_mutation import FramsMutation
    44
    55
  • framspy/evolalg_steps/mutation_cross/frams_cross_or_mutate.py

    r1139 r1185  
    1 from evolalg.base.frams_step import FramsStep
    2 from evolalg.mutation_cross.frams_cross import FramsCross
    3 from evolalg.mutation_cross.frams_mutation import FramsMutation
     1from evolalg_steps.base.frams_step import FramsStep
     2from evolalg_steps.mutation_cross.frams_cross import FramsCross
     3from evolalg_steps.mutation_cross.frams_mutation import FramsMutation
    44import random
    55
  • framspy/evolalg_steps/mutation_cross/frams_mutation.py

    r1139 r1185  
    11import random
    22
    3 from evolalg.base.frams_step import FramsStep
    4 from evolalg.base.individual import Individual
     3from evolalg_steps.base.frams_step import FramsStep
     4from evolalg_steps.base.individual import Individual
    55
    66
  • framspy/evolalg_steps/population/frams_population.py

    r1139 r1185  
    1 from evolalg.base.frams_step import FramsStep
    2 from evolalg.base.individual import Individual
     1from evolalg_steps.base.frams_step import FramsStep
     2from evolalg_steps.base.individual import Individual
    33
    44
  • framspy/evolalg_steps/repair/const.py

    r1139 r1185  
    11import copy
    22
    3 from evolalg.repair.repair import Repair
     3from evolalg_steps.repair.repair import Repair
    44
    55
  • framspy/evolalg_steps/repair/halloffame_repair.py

    r1139 r1185  
    22import random
    33
    4 from evolalg.repair import Repair
     4from evolalg_steps.repair import Repair
    55
    66
  • framspy/evolalg_steps/repair/multistep.py

    r1139 r1185  
    1 from evolalg.repair.repair import Repair
     1from evolalg_steps.repair.repair import Repair
    22import copy
    33
  • framspy/evolalg_steps/repair/mutate.py

    r1139 r1185  
    22import copy
    33
    4 from evolalg.repair.repair import Repair
     4from evolalg_steps.repair.repair import Repair
    55
    66
  • framspy/evolalg_steps/repair/remove/field.py

    r1139 r1185  
    1 from evolalg.repair.remove.remove import Remove
     1from evolalg_steps.repair.remove.remove import Remove
    22
    33
  • framspy/evolalg_steps/repair/remove/function.py

    r1139 r1185  
     1from evolalg_steps.repair.remove.remove import Remove
    12
    2 
    3 from evolalg.repair.remove.remove import Remove
    43class LambdaRemove(Remove):
    54    def __init__(self, func, *args, **kwargs):
  • framspy/evolalg_steps/repair/remove/remove.py

    r1139 r1185  
    11from abc import abstractmethod
    2 from evolalg.base.step import Step
     2from evolalg_steps.base.step import Step
    33
    44
  • framspy/evolalg_steps/repair/repair.py

    r1139 r1185  
    22from collections import Iterable
    33
    4 from evolalg.base.step import Step
     4from evolalg_steps.base.step import Step
    55
    66
  • framspy/evolalg_steps/selection/identity.py

    r1139 r1185  
    11import copy
    22
    3 from evolalg.base.step import Step
    4 from evolalg.selection.selection import Selection
     3from evolalg_steps.base.step import Step
     4from evolalg_steps.selection.selection import Selection
    55
    66
  • framspy/evolalg_steps/selection/nsga2.py

    r1148 r1185  
    1 from evolalg.selection.selection import Selection
     1from evolalg_steps.selection.selection import Selection
    22from deap import tools
    33import copy
  • framspy/evolalg_steps/selection/selection.py

    r1139 r1185  
    11from abc import abstractmethod
    22
    3 from evolalg.base.step import Step
     3from evolalg_steps.base.step import Step
    44import copy
    55
  • framspy/evolalg_steps/selection/tournament.py

    r1139 r1185  
    1 from evolalg.base.individual import Individual
     1from evolalg_steps.base.individual import Individual
    22from typing import List
    33import random
    44
    5 from evolalg.base.step import Step
    6 from evolalg.selection.selection import Selection
     5from evolalg_steps.base.step import Step
     6from evolalg_steps.selection.selection import Selection
    77
    88
  • framspy/evolalg_steps/statistics/halloffame_stats.py

    r1139 r1185  
    1 from evolalg.statistics.halloffame_custom import HallOfFameCustom
    2 from evolalg.statistics.statistics import Statistics
     1from evolalg_steps.statistics.halloffame_custom import HallOfFameCustom
     2from evolalg_steps.statistics.statistics import Statistics
    33
    44
  • framspy/evolalg_steps/statistics/multistatistics_deap.py

    r1147 r1185  
    11from deap import tools
    22
    3 from evolalg.statistics.statistics import Statistics
     3from evolalg_steps.statistics.statistics import Statistics
    44
    55
  • framspy/evolalg_steps/statistics/statistics.py

    r1139 r1185  
    11from abc import abstractmethod
    22
    3 from evolalg.base.step import Step
     3from evolalg_steps.base.step import Step
    44
    55
  • framspy/evolalg_steps/statistics/statistics_deap.py

    r1146 r1185  
    11from deap import tools
    22
    3 from evolalg.statistics.statistics import Statistics
     3from evolalg_steps.statistics.statistics import Statistics
    44
    55
  • framspy/evolalg_steps/utils/name_propagation.py

    r1139 r1185  
    11from typing import Iterable, Union, List
    22
    3 from evolalg.base.step import Step
     3from evolalg_steps.base.step import Step
    44import copy
    55
  • framspy/evolalg_steps/utils/population_save.py

    r1139 r1185  
    1 from evolalg.base.step import Step
     1from evolalg_steps.base.step import Step
    22import os
    33from framsfiles import writer as framswriter
  • framspy/evolalg_steps/utils/stable_generation.py

    r1113 r1185  
    11from collections import Iterable
    22
    3 from evolalg.base.step import Step
     3from evolalg_steps.base.step import Step
    44import copy
    55
    6 from evolalg.base.union_step import UnionStep
     6from evolalg_steps.base.union_step import UnionStep
    77
    88
  • framspy/run-evolalg_steps-examples.cmd

    r1184 r1185  
    99
    1010rem simple one-criterion evolution from minimalistic example source (examples.standard)
    11 python -m evolalg.examples.standard          -path %DIR_WITH_FRAMS_LIBRARY%   -opt numneurons
     11python -m evolalg_steps.examples.standard          -path %DIR_WITH_FRAMS_LIBRARY%   -opt numneurons
    1212
    1313
    1414rem as above but "chaining" .sim files, subsequent files overwrite selected parameters
    15 python -m evolalg.examples.standard          -path %DIR_WITH_FRAMS_LIBRARY%   -sim eval-allcriteria.sim;deterministic.sim;sample-period-longest.sim    -opt velocity
     15python -m evolalg_steps.examples.standard          -path %DIR_WITH_FRAMS_LIBRARY%   -sim eval-allcriteria.sim;deterministic.sim;sample-period-longest.sim    -opt velocity
    1616
    1717
    1818rem simple one-criterion evolution but more options available in examples.niching_novelty, here: hard limit on the number of Parts and debugging messages
    19 python -m evolalg.examples.niching_novelty   -path %DIR_WITH_FRAMS_LIBRARY%   -opt velocity   -max_numparts 6   -debug
     19python -m evolalg_steps.examples.niching_novelty   -path %DIR_WITH_FRAMS_LIBRARY%   -opt velocity   -max_numparts 6   -debug
    2020
    2121
    2222rem "local" niching
    23 python -m evolalg.examples.niching_novelty   -path %DIR_WITH_FRAMS_LIBRARY%   -opt vertpos    -fit knn_niching  -knn 3    -max_numjoints 8 -popsize 10 -generations 30
     23python -m evolalg_steps.examples.niching_novelty   -path %DIR_WITH_FRAMS_LIBRARY%   -opt vertpos    -fit knn_niching  -knn 3    -max_numjoints 8 -popsize 10 -generations 30
    2424
    2525
    2626rem two criteria, '-dissim ...' can also be used to include dissimilarity as one of the criteria
    27 python -m evolalg.examples.multicriteria     -path %DIR_WITH_FRAMS_LIBRARY%   -popsize 40 -generations 10 -opt velocity,vertpos
     27python -m evolalg_steps.examples.multicriteria     -path %DIR_WITH_FRAMS_LIBRARY%   -popsize 40 -generations 10 -opt velocity,vertpos
Note: See TracChangeset for help on using the changeset viewer.