Skip to content

Commit 13492b0

Browse files
andresgr96Andrestckarenchiang
committed
Ci-group package renaming (#569)
* renamed ci-group folder, updated docs and first example * Fix texture type bug: the texture/type attribute expects a string, not an integer * Reformat the strings with double quotes * Fix the format * Remove the unused method --------- Co-authored-by: Andres <andresgarciar96@gmail..com> Co-authored-by: Ting-Chia Chiang <t.chiang@vu.nl>
1 parent 7e87114 commit 13492b0

File tree

64 files changed

+51
-50
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+51
-50
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,4 +140,4 @@ dmypy.json
140140

141141
# Cython debug symbols
142142
cython_debug/
143-
/ci_group/revolve2/ci_group/morphological_novelty_metric/_calculate_novelty.c
143+
/standards/revolve2/standards/morphological_novelty_metric/_calculate_novelty.c

docs/source/installation/index.rst

Lines changed: 2 additions & 2 deletions

examples/1_simulator_basics/1a_simulate_single_robot/main.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
from pyrr import Vector3
44

5-
from revolve2.ci_group import terrains
6-
from revolve2.ci_group.interactive_objects import Ball
7-
from revolve2.ci_group.simulation_parameters import make_standard_batch_parameters
85
from revolve2.experimentation.logging import setup_logging
96
from revolve2.experimentation.rng import make_rng_time_seed
107
from revolve2.modular_robot import ModularRobot
@@ -14,6 +11,9 @@
1411
from revolve2.modular_robot_simulation import ModularRobotScene, simulate_scenes
1512
from revolve2.simulation.scene import Pose
1613
from revolve2.simulators.mujoco_simulator import LocalSimulator
14+
from revolve2.standards import terrains
15+
from revolve2.standards.interactive_objects import Ball
16+
from revolve2.standards.simulation_parameters import make_standard_batch_parameters
1717

1818

1919
def make_body() -> BodyV2:
@@ -27,6 +27,7 @@ def make_body() -> BodyV2:
2727
# From here, other modular can be attached.
2828
# Modules can be attached in a rotated fashion.
2929
# This can be any angle, although the original design takes into account only multiples of 90 degrees.
30+
# You should explore the "standards" module as it contains lots of preimplemented elements you can use!
3031
body = BodyV2()
3132
body.core_v2.left_face.bottom = ActiveHingeV2(RightAngles.DEG_0)
3233
body.core_v2.left_face.bottom.attachment = ActiveHingeV2(RightAngles.DEG_0)

examples/1_simulator_basics/1b_custom_terrain/README.md

Lines changed: 1 addition & 1 deletion

examples/1_simulator_basics/1b_custom_terrain/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
from pyrr import Quaternion, Vector3
66

7-
from revolve2.ci_group.modular_robots_v2 import gecko_v2
8-
from revolve2.ci_group.simulation_parameters import make_standard_batch_parameters
97
from revolve2.experimentation.logging import setup_logging
108
from revolve2.experimentation.rng import make_rng_time_seed
119
from revolve2.modular_robot import ModularRobot
@@ -20,6 +18,8 @@
2018
from revolve2.simulation.scene.geometry.textures import MapType
2119
from revolve2.simulators.mujoco_simulator import LocalSimulator
2220
from revolve2.simulators.mujoco_simulator.textures import Checker, Flat, Gradient
21+
from revolve2.standards.modular_robots_v2 import gecko_v2
22+
from revolve2.standards.simulation_parameters import make_standard_batch_parameters
2323

2424

2525
def make_custom_terrain() -> Terrain:

examples/2_modular_robot_basics/2a_custom_brain/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
"""Main script for the example."""
22

3-
from revolve2.ci_group import terrains
4-
from revolve2.ci_group.simulation_parameters import make_standard_batch_parameters
53
from revolve2.experimentation.logging import setup_logging
64
from revolve2.modular_robot import ModularRobot, ModularRobotControlInterface
75
from revolve2.modular_robot.body import RightAngles
@@ -10,6 +8,8 @@
108
from revolve2.modular_robot.sensor_state import ModularRobotSensorState
119
from revolve2.modular_robot_simulation import ModularRobotScene, simulate_scenes
1210
from revolve2.simulators.mujoco_simulator import LocalSimulator
11+
from revolve2.standards import terrains
12+
from revolve2.standards.simulation_parameters import make_standard_batch_parameters
1313

1414

1515
def make_body() -> (

examples/2_modular_robot_basics/2b_brain_with_feedback/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
from pyrr import Vector3
66

7-
from revolve2.ci_group import modular_robots_v2, terrains
8-
from revolve2.ci_group.simulation_parameters import make_standard_batch_parameters
97
from revolve2.experimentation.logging import setup_logging
108
from revolve2.modular_robot import ModularRobot, ModularRobotControlInterface
119
from revolve2.modular_robot.body.base import ActiveHinge
@@ -14,6 +12,8 @@
1412
from revolve2.modular_robot.sensor_state import ModularRobotSensorState
1513
from revolve2.modular_robot_simulation import ModularRobotScene, simulate_scenes
1614
from revolve2.simulators.mujoco_simulator import LocalSimulator
15+
from revolve2.standards import modular_robots_v2, terrains
16+
from revolve2.standards.simulation_parameters import make_standard_batch_parameters
1717

1818

1919
class ANNBrainInstance(BrainInstance):

examples/3_experiment_foundations/3b_evaluate_single_robot/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
import logging
44

5-
from revolve2.ci_group import fitness_functions, modular_robots_v2, terrains
6-
from revolve2.ci_group.simulation_parameters import make_standard_batch_parameters
75
from revolve2.experimentation.logging import setup_logging
86
from revolve2.experimentation.rng import make_rng_time_seed
97
from revolve2.modular_robot import ModularRobot
108
from revolve2.modular_robot.brain.cpg import BrainCpgNetworkNeighborRandom
119
from revolve2.modular_robot_simulation import ModularRobotScene, simulate_scenes
1210
from revolve2.simulators.mujoco_simulator import LocalSimulator
11+
from revolve2.standards import fitness_functions, modular_robots_v2, terrains
12+
from revolve2.standards.simulation_parameters import make_standard_batch_parameters
1313

1414

1515
def main() -> None:

examples/3_experiment_foundations/3c_evaluate_multiple_isolated_robots/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
import logging
44

5-
from revolve2.ci_group import fitness_functions, modular_robots_v1, terrains
6-
from revolve2.ci_group.simulation_parameters import make_standard_batch_parameters
75
from revolve2.experimentation.logging import setup_logging
86
from revolve2.experimentation.rng import make_rng_time_seed
97
from revolve2.modular_robot import ModularRobot
108
from revolve2.modular_robot.brain.cpg import BrainCpgNetworkNeighborRandom
119
from revolve2.modular_robot_simulation import ModularRobotScene, simulate_scenes
1210
from revolve2.simulators.mujoco_simulator import LocalSimulator
11+
from revolve2.standards import fitness_functions, modular_robots_v1, terrains
12+
from revolve2.standards.simulation_parameters import make_standard_batch_parameters
1313

1414

1515
def main() -> None:

examples/3_experiment_foundations/3d_evaluate_multiple_interacting_robots/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
from pyrr import Vector3
66

7-
from revolve2.ci_group import fitness_functions, modular_robots_v2, terrains
8-
from revolve2.ci_group.simulation_parameters import make_standard_batch_parameters
97
from revolve2.experimentation.logging import setup_logging
108
from revolve2.experimentation.rng import make_rng_time_seed
119
from revolve2.modular_robot import ModularRobot
1210
from revolve2.modular_robot.brain.cpg import BrainCpgNetworkNeighborRandom
1311
from revolve2.modular_robot_simulation import ModularRobotScene, simulate_scenes
1412
from revolve2.simulation.scene import Pose
1513
from revolve2.simulators.mujoco_simulator import LocalSimulator
14+
from revolve2.standards import fitness_functions, modular_robots_v2, terrains
15+
from revolve2.standards.simulation_parameters import make_standard_batch_parameters
1616

1717

1818
def main() -> None:

0 commit comments

Comments
 (0)