cleanup program arguments part 3

fixes in the code: argument variables where read but not used, they are now removed
ci-group · Aug 7, 2019 · a5427a3 · a5427a3
1 parent e3e69af
commit a5427a3
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 12 deletions.
diff --git a/experiments/examples/manager_pop.py b/experiments/examples/manager_pop.py
@@ -76,7 +76,6 @@ async def run():
         offspring_size=offspring_size,
         experiment_name=settings.experiment_name,
         experiment_management=experiment_management,
-        measure_individuals=settings.measure_individuals,
     )
 
     n_cores = settings.n_cores

diff --git a/experiments/examples/watch_best_robots.py b/experiments/examples/watch_best_robots.py
@@ -58,7 +58,6 @@ async def run():
         offspring_size=50,
         experiment_name=settings.experiment_name,
         experiment_management=experiment_management,
-        measure_individuals=settings.measure_individuals,
     )
 
     settings = parser.parse_args()

diff --git a/experiments/karines_experiments/manager_pop.py b/experiments/karines_experiments/manager_pop.py
@@ -81,7 +81,6 @@ def fitness_function(robot_manager, robot):
         offspring_size=offspring_size,
         experiment_name=settings.experiment_name,
         experiment_management=experiment_management,
-        measure_individuals=settings.measure_individuals,
     )
 
     settings = parser.parse_args()

diff --git a/experiments/karines_experiments/manager_pop_lava.py b/experiments/karines_experiments/manager_pop_lava.py
@@ -81,7 +81,6 @@ def fitness_function(robot_manager, robot):
         offspring_size=offspring_size,
         experiment_name=settings.experiment_name,
         experiment_management=experiment_management,
-        measure_individuals=settings.measure_individuals,
     )
 
     settings = parser.parse_args()

diff --git a/experiments/karines_experiments/watch_best_robots.py b/experiments/karines_experiments/watch_best_robots.py
@@ -57,7 +57,6 @@ async def run():
         offspring_size=50,
         experiment_name=settings.experiment_name,
         experiment_management=experiment_management,
-        measure_individuals=settings.measure_individuals,
     )
 
     settings = parser.parse_args()

diff --git a/pyrevolve/config.py b/pyrevolve/config.py
@@ -207,8 +207,5 @@ def make_revolve_config(conf):
     """
     conf.enable_wheel_parts = False
 
-    conf.brain_conf = {
-        'learner': conf.learner,
-        'genome': conf.genome,
-    }
+    conf.brain_conf = {}
     return conf
diff --git a/pyrevolve/evolution/population.py b/pyrevolve/evolution/population.py
@@ -26,7 +26,6 @@ def __init__(self,
                  evaluation_time,
                  experiment_name,
                  experiment_management,
-                 measure_individuals,
                  offspring_size=None,
                  next_robot_id=1):
         """
@@ -45,7 +44,6 @@ def __init__(self,
         :param evaluation_time: duration of an experiment
         :param experiment_name: name for the folder of the current experiment
         :param experiment_management: object with methods for managing the current experiment
-        :param measure_individuals: weather or not to perform  phenotypic measurements
         :param offspring_size (optional): size of offspring (for steady state)
         """
         self.population_size = population_size
@@ -63,7 +61,6 @@ def __init__(self,
         self.evaluation_time = evaluation_time
         self.experiment_name = experiment_name
         self.experiment_management = experiment_management
-        self.measure_individuals = measure_individuals
         self.offspring_size = offspring_size
         self.next_robot_id = next_robot_id