Skip to content

Commit

Permalink
Names change
Browse files Browse the repository at this point in the history
  • Loading branch information
yardenas committed Oct 4, 2024
1 parent 2f13ad2 commit 3d51a45
Show file tree
Hide file tree
Showing 2,848 changed files with 142 additions and 143 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ repos:
additional_dependencies:
- "numpy"
- "types-tabulate"
exclude: "safe_opax/benchmark_suites/humanoid_bench/.*"
exclude: "actsafe/benchmark_suites/humanoid_bench/.*"
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
from omegaconf import DictConfig

from safe_opax.benchmark_suites.dm_control import ENVIRONMENTS as dm_control_envs
from safe_opax.benchmark_suites.utils import get_domain_and_task
from safe_opax.rl.types import EnvironmentFactory
from actsafe.benchmark_suites.dm_control import ENVIRONMENTS as dm_control_envs
from actsafe.benchmark_suites.utils import get_domain_and_task
from actsafe.rl.types import EnvironmentFactory


def make(cfg: DictConfig) -> EnvironmentFactory:
assert len(cfg.environment.keys()) == 1
domain_name, task_config = get_domain_and_task(cfg)
if "task" in task_config and (domain_name, task_config.task) in dm_control_envs:
from safe_opax.benchmark_suites.dm_control import make
from actsafe.benchmark_suites.dm_control import make

make_env = make(cfg)
elif domain_name == "safe_adaptation_gym":
from safe_opax.benchmark_suites.safe_adaptation_gym import make
from actsafe.benchmark_suites.safe_adaptation_gym import make

make_env = make(cfg)
elif domain_name == "humanoid_bench":
from safe_opax.benchmark_suites.humanoid_bench import make
from actsafe.benchmark_suites.humanoid_bench import make

make_env = make(cfg)
else:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
from dm_control.utils.rewards import tolerance
import numpy as np
from omegaconf import DictConfig
from safe_opax.benchmark_suites.utils import get_domain_and_task
from actsafe.benchmark_suites.utils import get_domain_and_task

from safe_opax.rl.types import EnvironmentFactory
from safe_opax.rl.wrappers import ImageObservation
from actsafe.rl.types import EnvironmentFactory
from actsafe.rl.wrappers import ImageObservation


# From:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
from omegaconf import DictConfig
from gymnasium.spaces import Box

from safe_opax.benchmark_suites.utils import get_domain_and_task
from safe_opax.rl.types import EnvironmentFactory
from safe_opax.rl.wrappers import ImageObservation
from actsafe.benchmark_suites.utils import get_domain_and_task
from actsafe.rl.types import EnvironmentFactory
from actsafe.rl.wrappers import ImageObservation

class ConstraintWrapper(RewardWrapper):
def __init__(self, env):
Expand Down
Loading

0 comments on commit 3d51a45

Please sign in to comment.