Changeset 1129

Timestamp:

04/11/21 03:27:06 (4 years ago)

Author:

Maciej Komosinski

Message:

Introduced tournament size as a command-line parameter

Location:

framspy/evolalg/examples

Files:

• niching_novelty.py (modified) (2 diffs)
• standard.py (modified) (2 diffs)

framspy/evolalg/examples/niching_novelty.py

@@ -65 +65 @@
     parser.add_argument('-fit', required=False, default=Fitness.raw, type=Fitness,
                         help=' Fitness criteria DEFAULT = raw', choices=list(Fitness))
-    parser.add_argument('-popsize', type=int, default=50, help="Size of population, default 50.")
+    parser.add_argument('-popsize', type=int, default=50, help="Population size, default 50.")
     parser.add_argument('-generations', type=int, default=5, help="Number of generations, default 5.")
-    parser.add_argument('-num_parts', type=int, default=None, help="Maximum number of parts. Default None")
+    parser.add_argument('-tournament', type=int, default=5, help="Tournament size, default 5.")
+    parser.add_argument('-num_parts', type=int, default=None, help="Maximum number of Parts. Default: no limit")
     parser.add_argument('-checkpoint_path', required=False, default=None, help="Path to the checkpoint file")
     parser.add_argument('-checkpoint_interval', required=False, type=int, default=100, help="Checkpoint interval")
@@ -117 +118 @@
 
     # Selection procedure
-    selection = TournamentSelection(5,
+    selection = TournamentSelection(parsed_args.tournament,
                                     copy=True)  # 'fitness' by default, the targeted attribute can be changed, e.g. fit_attr="fitness_raw"
 

framspy/evolalg/examples/standard.py

@@ -41 +41 @@
                         help='Genetic format for the demo run, for example 4, 9, or B. If not given, f1 is assumed.')
 
-    parser.add_argument("-popsize", type=int, default=50, help="Size of population, default 50.")
+    parser.add_argument("-popsize", type=int, default=50, help="Population size, default 50.")
     parser.add_argument('-generations', type=int, default=5, help="Number of generations, default 5.")
+    parser.add_argument('-tournament', type=int, default=5, help="Tournament size, default 5.")
     return parser.parse_args()
 
@@ -78 +79 @@
                    statistics_union]
 
-    selection = TournamentSelection(5, copy=True, fit_attr="fitness")
+    selection = TournamentSelection(parsed_args.tournament, copy=True, fit_attr="fitness")
 
     new_generation_steps = [