format

automl · Aug 10, 2023 · c1f4ebc · c1f4ebc
1 parent 65e0046
commit c1f4ebc
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 17 deletions.
diff --git a/carl/envs/gymnasium/carl_gymnasium_env.py b/carl/envs/gymnasium/carl_gymnasium_env.py
@@ -73,4 +73,4 @@ def __init__(
 
     def _update_context(self) -> None:
         for k, v in self.context.items():
-            setattr(self.env.unwrapped, k, v)
+            setattr(self.env.unwrapped, k, v)
diff --git a/carl/envs/gymnasium/classic_control/carl_acrobot.py b/carl/envs/gymnasium/classic_control/carl_acrobot.py
@@ -1,7 +1,9 @@
 from __future__ import annotations
+
 from typing import Optional
 
 import numpy as np
+
 from carl.context.context_space import ContextFeature, UniformFloatContextFeature
 from carl.envs.gymnasium.carl_gymnasium_env import CARLGymnasiumEnv
 
@@ -64,15 +66,36 @@ def get_context_features() -> dict[str, ContextFeature]:
                 "INITIAL_VELOCITY_UPPER", lower=-np.inf, upper=np.inf, default_value=0.1
             ),
         }
-    
+
     def reset(
         self,
         *,
         seed: Optional[int] = None,
         options: Optional[dict] = None,
     ):
         super().reset(seed=seed, options=options)
-        angles = self.env.np_random.uniform(low=self.context["INITIAL_ANGLE_LOWER"], high=self.context["INITIAL_ANGLE_UPPER"], size=(2,))
-        velocities = self.env.np_random.uniform(low=self.context["INITIAL_VELOCITY_LOWER"], high=self.context["INITIAL_VELOCITY_UPPER"], size=(2,))
+        angles = self.env.np_random.uniform(
+            low=self.context["INITIAL_ANGLE_LOWER"],
+            high=self.context["INITIAL_ANGLE_UPPER"],
+            size=(2,),
+        )
+        velocities = self.env.np_random.uniform(
+            low=self.context["INITIAL_VELOCITY_LOWER"],
+            high=self.context["INITIAL_VELOCITY_UPPER"],
+            size=(2,),
+        )
         self.env.unwrapped.state = np.concatenate([angles, velocities])
-        return np.array([np.cos(self.env.unwrapped.state[0]), np.sin(self.env.unwrapped.state[0]), np.cos(self.env.unwrapped.state[1]), np.sin(self.env.unwrapped.state[1]), self.env.unwrapped.state[2], self.env.unwrapped.state[3]], dtype=np.float32), {}
+        return (
+            np.array(
+                [
+                    np.cos(self.env.unwrapped.state[0]),
+                    np.sin(self.env.unwrapped.state[0]),
+                    np.cos(self.env.unwrapped.state[1]),
+                    np.sin(self.env.unwrapped.state[1]),
+                    self.env.unwrapped.state[2],
+                    self.env.unwrapped.state[3],
+                ],
+                dtype=np.float32,
+            ),
+            {},
+        )
diff --git a/carl/envs/gymnasium/classic_control/carl_cartpole.py b/carl/envs/gymnasium/classic_control/carl_cartpole.py
@@ -1,10 +1,11 @@
 from __future__ import annotations
+
 from typing import Optional
 
 import numpy as np
+
 from carl.context.context_space import ContextFeature, UniformFloatContextFeature
 from carl.envs.gymnasium.carl_gymnasium_env import CARLGymnasiumEnv
-from gymnasium.envs.classic_control import utils
 
 
 class CARLCartPole(CARLGymnasiumEnv):
@@ -38,13 +39,17 @@ def get_context_features() -> dict[str, ContextFeature]:
                 "initial_state_upper", lower=-np.inf, upper=np.inf, default_value=0.1
             ),
         }
-    
+
     def reset(
         self,
         *,
         seed: Optional[int] = None,
         options: Optional[dict] = None,
     ):
         super().reset(seed=seed, options=options)
-        self.env.unwrapped.state = self.env.np_random.uniform(low=self.context["initial_state_lower"], high=self.context["initial_state_upper"], size=(4,))
-        return np.array(self.env.unwrapped.state, dtype=np.float32), {}
+        self.env.unwrapped.state = self.env.np_random.uniform(
+            low=self.context["initial_state_lower"],
+            high=self.context["initial_state_upper"],
+            size=(4,),
+        )
+        return np.array(self.env.unwrapped.state, dtype=np.float32), {}
diff --git a/carl/envs/gymnasium/classic_control/carl_mountaincar.py b/carl/envs/gymnasium/classic_control/carl_mountaincar.py
@@ -1,7 +1,9 @@
 from __future__ import annotations
 
-import numpy as np
 from typing import Optional
+
+import numpy as np
+
 from carl.context.context_space import ContextFeature, UniformFloatContextFeature
 from carl.envs.gymnasium.carl_gymnasium_env import CARLGymnasiumEnv
 
@@ -46,15 +48,21 @@ def get_context_features() -> dict[str, ContextFeature]:
                 "max_velocity_start", lower=-np.inf, upper=np.inf, default_value=0
             ),
         }
-    
+
     def reset(
         self,
         *,
         seed: Optional[int] = None,
         options: Optional[dict] = None,
     ):
         super().reset(seed=seed, options=options)
-        position = self.env.np_random.uniform(low=self.context["min_position_start"], high=self.context["max_position_start"])
-        velocity = self.env.np_random.uniform(low=self.context["min_velocity_start"], high=self.context["max_velocity_start"])
+        position = self.env.np_random.uniform(
+            low=self.context["min_position_start"],
+            high=self.context["max_position_start"],
+        )
+        velocity = self.env.np_random.uniform(
+            low=self.context["min_velocity_start"],
+            high=self.context["max_velocity_start"],
+        )
         self.env.unwrapped.state = np.array([position, velocity])
         return np.array(self.env.unwrapped.state, dtype=np.float32), {}
diff --git a/carl/envs/gymnasium/classic_control/carl_mountaincarcontinuous.py b/carl/envs/gymnasium/classic_control/carl_mountaincarcontinuous.py
@@ -1,7 +1,9 @@
 from __future__ import annotations
 
-import numpy as np
 from typing import Optional
+
+import numpy as np
+
 from carl.context.context_space import ContextFeature, UniformFloatContextFeature
 from carl.envs.gymnasium.carl_gymnasium_env import CARLGymnasiumEnv
 
@@ -43,15 +45,21 @@ def get_context_features() -> dict[str, ContextFeature]:
                 "max_velocity_start", lower=-np.inf, upper=np.inf, default_value=0
             ),
         }
-    
+
     def reset(
         self,
         *,
         seed: Optional[int] = None,
         options: Optional[dict] = None,
     ):
         super().reset(seed=seed, options=options)
-        position = self.env.np_random.uniform(low=self.context["min_position_start"], high=self.context["max_position_start"])
-        velocity = self.env.np_random.uniform(low=self.context["min_velocity_start"], high=self.context["max_velocity_start"])
+        position = self.env.np_random.uniform(
+            low=self.context["min_position_start"],
+            high=self.context["max_position_start"],
+        )
+        velocity = self.env.np_random.uniform(
+            low=self.context["min_velocity_start"],
+            high=self.context["max_velocity_start"],
+        )
         self.env.unwrapped.state = np.array([position, velocity])
         return np.array(self.env.unwrapped.state, dtype=np.float32), {}
diff --git a/carl/envs/gymnasium/classic_control/carl_pendulum.py b/carl/envs/gymnasium/classic_control/carl_pendulum.py
@@ -1,7 +1,9 @@
 from __future__ import annotations
 
 from typing import Optional
+
 import numpy as np
+
 from carl.context.context_space import ContextFeature, UniformFloatContextFeature
 from carl.envs.gymnasium.carl_gymnasium_env import CARLGymnasiumEnv