Development into master

.gitignore

@@ -140,4 +140,4 @@ dmypy.json
 
 # Cython debug symbols
 cython_debug/
-/ci_group/revolve2/ci_group/morphological_novelty_metric/_calculate_novelty.c
+/standards/revolve2/standards/morphological_novelty_metric/_calculate_novelty.c

docs/source/installation/index.rst

@@ -70,8 +70,8 @@ Each package can be installed using: ::
      - Description
      - requires
      -
-   * - ci_group
-     - Computational Intelligence Group experimentation tools and standards.
+   * - standards
+     - Standard tools, parameters, terrains, robots and more for simulations and experiments.
      - :code:`modular_robot_simulation`
      - **!**
    * - experimentation

examples/1_simulator_basics/1a_simulate_single_robot/main.py

@@ -2,9 +2,6 @@
 
 from pyrr import Vector3
 
-from revolve2.ci_group import terrains
-from revolve2.ci_group.interactive_objects import Ball
-from revolve2.ci_group.simulation_parameters import make_standard_batch_parameters
 from revolve2.experimentation.logging import setup_logging
 from revolve2.experimentation.rng import make_rng_time_seed
 from revolve2.modular_robot import ModularRobot
@@ -14,6 +11,9 @@
 from revolve2.modular_robot_simulation import ModularRobotScene, simulate_scenes
 from revolve2.simulation.scene import Pose
 from revolve2.simulators.mujoco_simulator import LocalSimulator
+from revolve2.standards import terrains
+from revolve2.standards.interactive_objects import Ball
+from revolve2.standards.simulation_parameters import make_standard_batch_parameters
 
 
 def make_body() -> BodyV2:
@@ -27,6 +27,7 @@ def make_body() -> BodyV2:
     # From here, other modular can be attached.
     # Modules can be attached in a rotated fashion.
     # This can be any angle, although the original design takes into account only multiples of 90 degrees.
+    # You should explore the "standards" module as it contains lots of preimplemented elements you can use!
     body = BodyV2()
     body.core_v2.left_face.bottom = ActiveHingeV2(RightAngles.DEG_0)
     body.core_v2.left_face.bottom.attachment = ActiveHingeV2(RightAngles.DEG_0)

examples/1_simulator_basics/1b_custom_terrain/README.md

@@ -1,5 +1,5 @@
 In this example you create a custom terrain to put a modular robot in.
-Other examples for possible terrains can be found in `ci_group.terrains`
+Other examples for possible terrains can be found in `standards.terrains`
 
 Make sure you understand simulation, for example through the example `1a_simulate_single_robot`.
 

examples/1_simulator_basics/1b_custom_terrain/main.py

@@ -4,8 +4,6 @@
 
 from pyrr import Quaternion, Vector3
 
-from revolve2.ci_group.modular_robots_v2 import gecko_v2
-from revolve2.ci_group.simulation_parameters import make_standard_batch_parameters
 from revolve2.experimentation.logging import setup_logging
 from revolve2.experimentation.rng import make_rng_time_seed
 from revolve2.modular_robot import ModularRobot
@@ -20,6 +18,8 @@
 from revolve2.simulation.scene.geometry.textures import MapType
 from revolve2.simulators.mujoco_simulator import LocalSimulator
 from revolve2.simulators.mujoco_simulator.textures import Checker, Flat, Gradient
+from revolve2.standards.modular_robots_v2 import gecko_v2
+from revolve2.standards.simulation_parameters import make_standard_batch_parameters
 
 
 def make_custom_terrain() -> Terrain:

examples/2_modular_robot_basics/2a_custom_brain/main.py

@@ -1,7 +1,5 @@
 """Main script for the example."""
 
-from revolve2.ci_group import terrains
-from revolve2.ci_group.simulation_parameters import make_standard_batch_parameters
 from revolve2.experimentation.logging import setup_logging
 from revolve2.modular_robot import ModularRobot, ModularRobotControlInterface
 from revolve2.modular_robot.body import RightAngles
@@ -10,6 +8,8 @@
 from revolve2.modular_robot.sensor_state import ModularRobotSensorState
 from revolve2.modular_robot_simulation import ModularRobotScene, simulate_scenes
 from revolve2.simulators.mujoco_simulator import LocalSimulator
+from revolve2.standards import terrains
+from revolve2.standards.simulation_parameters import make_standard_batch_parameters
 
 
 def make_body() -> (

examples/2_modular_robot_basics/2b_brain_with_feedback/main.py

@@ -4,8 +4,6 @@
 
 from pyrr import Vector3
 
-from revolve2.ci_group import modular_robots_v2, terrains
-from revolve2.ci_group.simulation_parameters import make_standard_batch_parameters
 from revolve2.experimentation.logging import setup_logging
 from revolve2.modular_robot import ModularRobot, ModularRobotControlInterface
 from revolve2.modular_robot.body.base import ActiveHinge
@@ -14,6 +12,8 @@
 from revolve2.modular_robot.sensor_state import ModularRobotSensorState
 from revolve2.modular_robot_simulation import ModularRobotScene, simulate_scenes
 from revolve2.simulators.mujoco_simulator import LocalSimulator
+from revolve2.standards import modular_robots_v2, terrains
+from revolve2.standards.simulation_parameters import make_standard_batch_parameters
 
 
 class ANNBrainInstance(BrainInstance):

examples/3_experiment_foundations/3b_evaluate_single_robot/main.py

@@ -2,14 +2,14 @@
 
 import logging
 
-from revolve2.ci_group import fitness_functions, modular_robots_v2, terrains
-from revolve2.ci_group.simulation_parameters import make_standard_batch_parameters
 from revolve2.experimentation.logging import setup_logging
 from revolve2.experimentation.rng import make_rng_time_seed
 from revolve2.modular_robot import ModularRobot
 from revolve2.modular_robot.brain.cpg import BrainCpgNetworkNeighborRandom
 from revolve2.modular_robot_simulation import ModularRobotScene, simulate_scenes
 from revolve2.simulators.mujoco_simulator import LocalSimulator
+from revolve2.standards import fitness_functions, modular_robots_v2, terrains
+from revolve2.standards.simulation_parameters import make_standard_batch_parameters
 
 
 def main() -> None:

examples/3_experiment_foundations/3c_evaluate_multiple_isolated_robots/main.py

@@ -2,14 +2,14 @@
 
 import logging
 
-from revolve2.ci_group import fitness_functions, modular_robots_v1, terrains
-from revolve2.ci_group.simulation_parameters import make_standard_batch_parameters
 from revolve2.experimentation.logging import setup_logging
 from revolve2.experimentation.rng import make_rng_time_seed
 from revolve2.modular_robot import ModularRobot
 from revolve2.modular_robot.brain.cpg import BrainCpgNetworkNeighborRandom
 from revolve2.modular_robot_simulation import ModularRobotScene, simulate_scenes
 from revolve2.simulators.mujoco_simulator import LocalSimulator
+from revolve2.standards import fitness_functions, modular_robots_v1, terrains
+from revolve2.standards.simulation_parameters import make_standard_batch_parameters
 
 
 def main() -> None:

examples/3_experiment_foundations/3d_evaluate_multiple_interacting_robots/main.py

@@ -4,15 +4,15 @@
 
 from pyrr import Vector3
 
-from revolve2.ci_group import fitness_functions, modular_robots_v2, terrains
-from revolve2.ci_group.simulation_parameters import make_standard_batch_parameters
 from revolve2.experimentation.logging import setup_logging
 from revolve2.experimentation.rng import make_rng_time_seed
 from revolve2.modular_robot import ModularRobot
 from revolve2.modular_robot.brain.cpg import BrainCpgNetworkNeighborRandom
 from revolve2.modular_robot_simulation import ModularRobotScene, simulate_scenes
 from revolve2.simulation.scene import Pose
 from revolve2.simulators.mujoco_simulator import LocalSimulator
+from revolve2.standards import fitness_functions, modular_robots_v2, terrains
+from revolve2.standards.simulation_parameters import make_standard_batch_parameters
 
 
 def main() -> None:

examples/4_example_experiment_setups/4c_robot_bodybrain_ea/evaluator.py

@@ -2,15 +2,15 @@
 
 from genotype import Genotype
 
-from revolve2.ci_group import fitness_functions, terrains
-from revolve2.ci_group.simulation_parameters import make_standard_batch_parameters
 from revolve2.experimentation.evolution.abstract_elements import Evaluator as Eval
 from revolve2.modular_robot_simulation import (
     ModularRobotScene,
     Terrain,
     simulate_scenes,
 )
 from revolve2.simulators.mujoco_simulator import LocalSimulator
+from revolve2.standards import fitness_functions, terrains
+from revolve2.standards.simulation_parameters import make_standard_batch_parameters
 
 
 class Evaluator(Eval):

examples/4_example_experiment_setups/4c_robot_bodybrain_ea/genotype.py

@@ -7,9 +7,9 @@
 import multineat
 import numpy as np
 
-from revolve2.ci_group.genotypes.cppnwin.modular_robot import BrainGenotypeCpg
-from revolve2.ci_group.genotypes.cppnwin.modular_robot.v2 import BodyGenotypeV2
 from revolve2.modular_robot import ModularRobot
+from revolve2.standards.genotypes.cppnwin.modular_robot import BrainGenotypeCpg
+from revolve2.standards.genotypes.cppnwin.modular_robot.v2 import BodyGenotypeV2
 
 
 @dataclass

examples/4_example_experiment_setups/4d_robot_bodybrain_ea_database/database_components/_genotype.py

@@ -5,10 +5,10 @@
 import multineat
 import numpy as np
 
-from revolve2.ci_group.genotypes.cppnwin.modular_robot import BrainGenotypeCpgOrm
-from revolve2.ci_group.genotypes.cppnwin.modular_robot.v2 import BodyGenotypeOrmV2
 from revolve2.experimentation.database import HasId
 from revolve2.modular_robot import ModularRobot
+from revolve2.standards.genotypes.cppnwin.modular_robot import BrainGenotypeCpgOrm
+from revolve2.standards.genotypes.cppnwin.modular_robot.v2 import BodyGenotypeOrmV2
 
 from ._base import Base
 

examples/4_example_experiment_setups/4d_robot_bodybrain_ea_database/evaluator.py

@@ -2,15 +2,15 @@
 
 from database_components import Genotype
 
-from revolve2.ci_group import fitness_functions, terrains
-from revolve2.ci_group.simulation_parameters import make_standard_batch_parameters
 from revolve2.experimentation.evolution.abstract_elements import Evaluator as Eval
 from revolve2.modular_robot_simulation import (
     ModularRobotScene,
     Terrain,
     simulate_scenes,
 )
 from revolve2.simulators.mujoco_simulator import LocalSimulator
+from revolve2.standards import fitness_functions, terrains
+from revolve2.standards.simulation_parameters import make_standard_batch_parameters
 
 
 class Evaluator(Eval):

examples/4_example_experiment_setups/4e_robot_brain_cmaes/config.py

@@ -1,6 +1,6 @@
 """Configuration parameters for this example."""
 
-from revolve2.ci_group.modular_robots_v1 import gecko_v1
+from revolve2.standards.modular_robots_v1 import gecko_v1
 
 NUM_SIMULATORS = 8
 INITIAL_STD = 0.5

examples/4_example_experiment_setups/4e_robot_brain_cmaes/evaluator.py

@@ -5,8 +5,6 @@
 import numpy as np
 import numpy.typing as npt
 
-from revolve2.ci_group import fitness_functions, terrains
-from revolve2.ci_group.simulation_parameters import make_standard_batch_parameters
 from revolve2.modular_robot import ModularRobot
 from revolve2.modular_robot.body.base import ActiveHinge, Body
 from revolve2.modular_robot.brain.cpg import BrainCpgNetworkStatic, CpgNetworkStructure
@@ -16,6 +14,8 @@
     simulate_scenes,
 )
 from revolve2.simulators.mujoco_simulator import LocalSimulator
+from revolve2.standards import fitness_functions, terrains
+from revolve2.standards.simulation_parameters import make_standard_batch_parameters
 
 
 class Evaluator:

examples/4_example_experiment_setups/4f_robot_brain_cmaes_database/config.py

@@ -1,6 +1,6 @@
 """Configuration parameters for this example."""
 
-from revolve2.ci_group.modular_robots_v2 import gecko_v2
+from revolve2.standards.modular_robots_v2 import gecko_v2
 
 DATABASE_FILE = "database.sqlite"
 NUM_REPETITIONS = 5

examples/4_example_experiment_setups/4f_robot_brain_cmaes_database/evaluator.py

@@ -5,8 +5,6 @@
 import numpy as np
 import numpy.typing as npt
 
-from revolve2.ci_group import fitness_functions, terrains
-from revolve2.ci_group.simulation_parameters import make_standard_batch_parameters
 from revolve2.modular_robot import ModularRobot
 from revolve2.modular_robot.body.base import ActiveHinge, Body
 from revolve2.modular_robot.brain.cpg import BrainCpgNetworkStatic, CpgNetworkStructure
@@ -16,6 +14,8 @@
     simulate_scenes,
 )
 from revolve2.simulators.mujoco_simulator import LocalSimulator
+from revolve2.standards import fitness_functions, terrains
+from revolve2.standards.simulation_parameters import make_standard_batch_parameters
 
 
 class Evaluator:

examples/5_physical_modular_robots/5b_compare_simulated_and_physical_robot/main_simulation.py

@@ -1,10 +1,10 @@
 """Simulate the modular robot for comparison with the physical counterpart."""
 
-from revolve2.ci_group import terrains
-from revolve2.ci_group.modular_robots_v2 import gecko_v2
-from revolve2.ci_group.simulation_parameters import make_standard_batch_parameters
 from revolve2.modular_robot_simulation import test_robot
 from revolve2.simulators.mujoco_simulator import LocalSimulator
+from revolve2.standards import terrains
+from revolve2.standards.modular_robots_v2 import gecko_v2
+from revolve2.standards.simulation_parameters import make_standard_batch_parameters
 
 
 def main() -> None:

experimentation/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "revolve2-experimentation"
-version = "1.2.1"
+version = "1.2.2"
 description = "Revolve2: Tools for experimentation."
 readme = "../README.md"
 authors = [

modular_robot/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "revolve2-modular-robot"
-version = "1.2.1"
+version = "1.2.2"
 description = "Revolve2: Everything for defining modular robots."
 readme = "../README.md"
 authors = [

modular_robot_physical/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "revolve2-modular-robot-physical"
-version = "1.2.1"
+version = "1.2.2"
 description = "Revolve2: Everything for physical modular robot control. This package is intended to be installed on the modular robot hardware."
 readme = "../README.md"
 authors = [
@@ -27,7 +27,7 @@ packages = [{ include = "revolve2" }]
 
 [tool.poetry.dependencies]
 python = "^3.10,<3.12"
-revolve2-modular-robot = "1.2.1"
+revolve2-modular-robot = "1.2.2"
 pyrr = "^0.10.3"
 typed-argparse = "^0.3.1"
 pycapnp = { version = "^2.0.0b2" }

modular_robot_simulation/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "revolve2-modular-robot-simulation"
-version = "1.2.1"
+version = "1.2.2"
 description = "Revolve2: Functionality to define scenes with modular robots in a terrain and simulate them."
 readme = "../README.md"
 authors = [
@@ -27,8 +27,8 @@ packages = [{ include = "revolve2" }]
 
 [tool.poetry.dependencies]
 python = "^3.10,<3.12"
-revolve2-modular-robot = "1.2.1"
-revolve2-simulation = "1.2.1"
+revolve2-modular-robot = "1.2.2"
+revolve2-simulation = "1.2.2"
 
 [tool.poetry.extras]
 dev = []

project.yml

@@ -8,7 +8,7 @@ platform_independent_packages:
   - simulation
   - simulators/mujoco_simulator
 platform_dependent_packages:
-  - ci_group
+  - standards
 examples:
   - 1_simulator_basics/1a_simulate_single_robot
   - 1_simulator_basics/1b_custom_terrain

requirements_dev.txt

@@ -1,6 +1,6 @@
 # Installs all Revolve2 packages in editable mode as well as development tools and their requirements.
 
--e ci_group[dev]
+-e standards[dev]
 -e simulators/mujoco_simulator[dev]
 -e experimentation[dev]
 -e modular_robot_simulation[dev]

requirements_editable.txt

@@ -1,6 +1,6 @@
 # Installs all Revolve2 packages in editable mode as well as all example requirements.
 
--e ci_group[dev]
+-e standards[dev]
 -e simulators/mujoco_simulator[dev]
 -e experimentation[dev]
 -e modular_robot_simulation[dev]

simulation/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "revolve2-simulation"
-version = "1.2.1"
+version = "1.2.2"
 description = "Revolve2: Physics simulation abstraction layer."
 readme = "../README.md"
 authors = [

simulation/revolve2/simulation/scene/geometry/textures/_map_type.py

@@ -1,4 +1,4 @@
-from enum import Enum, auto
+from enum import Enum
 
 
 class MapType(Enum):
@@ -10,6 +10,6 @@ class MapType(Enum):
     - "SKYBOX": Like "cube" but maps onto the inside of an object.
     """
 
-    MAP2D = auto()
-    CUBE = auto()
-    SKYBOX = auto()
+    MAP2D = "2d"
+    CUBE = "cube"
+    SKYBOX = "skybox"