Skip to content

Commit 076393f

Browse files
Minor cleanup
1 parent 7c43d8a commit 076393f

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

experiments/mpsc/config_overrides/mpsc_acados_quadrotor_2D_attitude.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
safety_filter: nl_mpsc
1+
safety_filter: mpsc_acados
22
sf_config:
33
# LQR controller parameters
44
q_mpc: [18, 0.1, 18, 0.5, 0.5, 0.0001]

safe_control_gym/controllers/ppo/ppo.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ def __init__(self,
4545
self.sf_penalty = 1
4646
self.use_safe_reset = False
4747
super().__init__(env_func, training, checkpoint_path, output_dir, use_gpu, seed, **kwargs)
48+
4849
# Task.
4950
if self.training:
5051
# Training and testing.
@@ -237,14 +238,15 @@ def run(self,
237238
action = self.select_action(obs=obs, info=info)
238239

239240
# Adding safety filter
240-
success = False
241-
physical_action = env.denormalize_action(action)
242-
unextended_obs = np.squeeze(true_obs)[:env.symbolic.nx]
243-
certified_action, success = self.safety_filter.certify_action(unextended_obs, physical_action, info)
244-
if success:
245-
action = env.normalize_action(certified_action)
246-
else:
247-
self.safety_filter.ocp_solver.reset()
241+
if self.safety_filter is not None:
242+
success = False
243+
physical_action = env.denormalize_action(action)
244+
unextended_obs = np.squeeze(true_obs)[:env.symbolic.nx]
245+
certified_action, success = self.safety_filter.certify_action(unextended_obs, physical_action, info)
246+
if success:
247+
action = env.normalize_action(certified_action)
248+
else:
249+
self.safety_filter.ocp_solver.reset()
248250

249251
action = np.atleast_2d(np.squeeze([action]))
250252
obs, rew, done, info = env.step(action)

0 commit comments

Comments
 (0)