Changeset 961


Ignore:
Timestamp:
06/26/20 01:32:15 (3 weeks ago)
Author:
Maciej Komosinski
Message:

Cosmetic

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • cpp/frams/genetics/fB/fB_oper.cpp

    r935 r961  
    248248                int rndid = rndUint(tokenized.size()); // select random letter from genotype
    249249                // increment/decrement character - when overflow happens, this method
    250                 // uses reflect method
     250                // uses the "reflect" approach
    251251                std::list<SString>::iterator it = tokenized.begin();
    252252                std::advance(it, rndid);
  • framspy/FramsticksCLI.py

    r956 r961  
    4545        CLI_INPUT_FILE = "genotypes.gen"
    4646
    47         _last_instance_id = count(0)  # "static" counter incremented when a new instance is created. Used for unique filenames
     47        _next_instance_id = count(0)  # "static" counter incremented when a new instance is created. Used for unique filenames
    4848
    4949
    5050        def __init__(self, framspath, framsexe):
    51                 self.id = next(FramsticksCLI._last_instance_id)
     51                self.id = next(FramsticksCLI._next_instance_id)
    5252                self.frams_path = framspath
    5353                self.frams_exe = framsexe if framsexe is not None else 'frams.exe' if os.name == "nt" else 'frams.linux'
  • framspy/FramsticksEvolution.py

    r949 r961  
    106106
    107107        print('Evolution with population size %d for %d generations, optimization criteria: %s' % (POPSIZE, GENERATIONS, OPTIMIZATION_CRITERIA))
    108         pop, log = algorithms.eaSimple(pop, toolbox, cxpb=0.2, mutpb=0.8, ngen=GENERATIONS, stats=stats, halloffame=hof, verbose=True)
     108        pop, log = algorithms.eaSimple(pop, toolbox, cxpb=0.2, mutpb=0.9, ngen=GENERATIONS, stats=stats, halloffame=hof, verbose=True)
    109109        print('Best individuals:')
    110110        for best in hof:
Note: See TracChangeset for help on using the changeset viewer.