Skip to content

Commit a7bd1d1

Browse files
authored
chore(eagerx): bump version eagerx to 0.1.10 (#244)
Co-authored-by: Jelle Luijkx <[email protected]>
1 parent 3a08d24 commit a7bd1d1

File tree

4 files changed

+18
-16
lines changed

4 files changed

+18
-16
lines changed

Diff for: projects/control/eagerx/demos/demo_classifier.py

+9-7
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
# limitations under the License.
1515

1616
import argparse
17+
import os
1718

1819
# EAGERx imports
1920
from eagerx import Object, Bridge, Node, initialize, log
@@ -34,14 +35,15 @@ def example_classifier(name, eps, eval_eps, device, render=False):
3435
"GymObject",
3536
"pendulum",
3637
sensors=["image", "observation", "reward", "done"],
37-
gym_env_id="Pendulum-v0",
38-
gym_rate=20,
39-
gym_always_render=True,
38+
env_id="Pendulum-v0",
39+
rate=20,
40+
always_render=True,
4041
render_shape=[28, 28],
4142
)
4243

4344
# Define PID controller & classifier
44-
classifier = Node.make("Classifier", "classifier", rate=20, cam_rate=20, data="../data/with_actions.h5")
45+
dir_path = os.path.dirname(os.path.realpath(__file__))
46+
classifier = Node.make("Classifier", "classifier", rate=20, cam_rate=20, data=dir_path + "/../data/with_actions.h5")
4547
pid = Node.make("PidController", "pid", rate=20, gains=[8, 1, 0], y_range=[-4, 4])
4648

4749
# Define graph (agnostic) & connect nodes
@@ -63,9 +65,9 @@ def example_classifier(name, eps, eval_eps, device, render=False):
6365
bridge = Bridge.make("GymBridge", rate=20)
6466

6567
# Initialize Environment (agnostic graph + bridge)
66-
env = eagerx_gym.EagerGym(name=name, rate=20, graph=graph, bridge=bridge)
68+
env = eagerx_gym.EagerxGym(name=name, rate=20, graph=graph, bridge=bridge)
6769
if render:
68-
env.render(mode='human')
70+
env.render(mode="human")
6971

7072
# Initialize and train stable-baselines model
7173
model = sb.SAC("MlpPolicy", env, verbose=1, device=device)
@@ -87,7 +89,7 @@ def example_classifier(name, eps, eval_eps, device, render=False):
8789
parser.add_argument("--name", help="Name of the environment", type=str, default="example")
8890
parser.add_argument("--eps", help="Number of training episodes", type=int, default=200)
8991
parser.add_argument("--eval_eps", help="Number of evaluation episodes", type=int, default=20)
90-
parser.add_argument("--render", help="Toggle rendering", action='store_true')
92+
parser.add_argument("--render", help="Toggle rendering", action="store_true")
9193

9294
args = parser.parse_args()
9395

Diff for: projects/control/eagerx/demos/demo_full_state.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def example_full_state(name, eps, eval_eps, device, render=False):
3333
sensors = ["observation", "reward", "done"]
3434
if render:
3535
sensors.append("image")
36-
pendulum = Object.make("GymObject", "pendulum", sensors=sensors, gym_env_id="Pendulum-v0", gym_rate=20)
36+
pendulum = Object.make("GymObject", "pendulum", sensors=sensors, env_id="Pendulum-v0", rate=20)
3737

3838
# Define graph (agnostic) & connect nodes
3939
graph = Graph.create(objects=[pendulum])
@@ -48,9 +48,9 @@ def example_full_state(name, eps, eval_eps, device, render=False):
4848
bridge = Bridge.make("GymBridge", rate=20)
4949

5050
# Initialize Environment (agnostic graph + bridge)
51-
env = eagerx_gym.EagerGym(name=name, rate=20, graph=graph, bridge=bridge)
51+
env = eagerx_gym.EagerxGym(name=name, rate=20, graph=graph, bridge=bridge)
5252
if render:
53-
env.render(mode='human')
53+
env.render(mode="human")
5454

5555
# Initialize and train stable-baselines model
5656
model = sb.SAC("MlpPolicy", env, verbose=1, device=device)
@@ -71,7 +71,7 @@ def example_full_state(name, eps, eval_eps, device, render=False):
7171
parser.add_argument("--name", help="Name of the environment", type=str, default="example")
7272
parser.add_argument("--eps", help="Number of training episodes", type=int, default=200)
7373
parser.add_argument("--eval_eps", help="Number of evaluation episodes", type=int, default=20)
74-
parser.add_argument("--render", help="Toggle rendering", action='store_true')
74+
parser.add_argument("--render", help="Toggle rendering", action="store_true")
7575

7676
args = parser.parse_args()
7777

Diff for: projects/control/eagerx/demos/demo_pid.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def example_pid_only(name, eps, eval_eps, device, render=False):
3333
sensors = ["observation", "reward", "done"]
3434
if render:
3535
sensors.append("image")
36-
pendulum = Object.make("GymObject", "pendulum", sensors=sensors, gym_env_id="Pendulum-v0", gym_rate=20)
36+
pendulum = Object.make("GymObject", "pendulum", sensors=sensors, env_id="Pendulum-v0", rate=20)
3737

3838
# Define PID controller & classifier
3939
pid = Node.make("PidController", "pid", rate=20, gains=[8, 1, 0], y_range=[-4, 4])
@@ -54,9 +54,9 @@ def example_pid_only(name, eps, eval_eps, device, render=False):
5454
bridge = Bridge.make("GymBridge", rate=20)
5555

5656
# Initialize Environment (agnostic graph + bridge)
57-
env = eagerx_gym.EagerGym(name=name, rate=20, graph=graph, bridge=bridge)
57+
env = eagerx_gym.EagerxGym(name=name, rate=20, graph=graph, bridge=bridge)
5858
if render:
59-
env.render(mode='human')
59+
env.render(mode="human")
6060

6161
# Initialize and train stable-baselines model
6262
model = sb.SAC("MlpPolicy", env, verbose=1, device=device)
@@ -77,7 +77,7 @@ def example_pid_only(name, eps, eval_eps, device, render=False):
7777
parser.add_argument("--name", help="Name of the environment", type=str, default="example")
7878
parser.add_argument("--eps", help="Number of training episodes", type=int, default=200)
7979
parser.add_argument("--eval_eps", help="Number of evaluation episodes", type=int, default=20)
80-
parser.add_argument("--render", help="Toggle rendering", action='store_true')
80+
parser.add_argument("--render", help="Toggle rendering", action="store_true")
8181

8282
args = parser.parse_args()
8383

Diff for: projects/control/eagerx/dependencies.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[runtime]
2-
python=eagerx-examples==0.1.3
2+
python=eagerx-examples==0.1.5

0 commit comments

Comments
 (0)