Changeset 961 for framspy

Timestamp:

06/26/20 01:32:15 (5 years ago)

Author:

Maciej Komosinski

Message:

Cosmetic

Location:

framspy

Files:

• FramsticksCLI.py (modified) (1 diff)
• FramsticksEvolution.py (modified) (1 diff)

framspy/FramsticksCLI.py

@@ -45 +45 @@
         CLI_INPUT_FILE = "genotypes.gen"
 
-        _last_instance_id = count(0)  # "static" counter incremented when a new instance is created. Used for unique filenames
+        _next_instance_id = count(0)  # "static" counter incremented when a new instance is created. Used for unique filenames
 
 
         def __init__(self, framspath, framsexe):
-                self.id = next(FramsticksCLI._last_instance_id)
+                self.id = next(FramsticksCLI._next_instance_id)
                 self.frams_path = framspath
                 self.frams_exe = framsexe if framsexe is not None else 'frams.exe' if os.name == "nt" else 'frams.linux'

framspy/FramsticksEvolution.py

@@ -106 +106 @@
 
         print('Evolution with population size %d for %d generations, optimization criteria: %s' % (POPSIZE, GENERATIONS, OPTIMIZATION_CRITERIA))
-        pop, log = algorithms.eaSimple(pop, toolbox, cxpb=0.2, mutpb=0.8, ngen=GENERATIONS, stats=stats, halloffame=hof, verbose=True)
+        pop, log = algorithms.eaSimple(pop, toolbox, cxpb=0.2, mutpb=0.9, ngen=GENERATIONS, stats=stats, halloffame=hof, verbose=True)
         print('Best individuals:')
         for best in hof: