Merge branch 'main' into improved_linting

Author: Federico-PizarroBejarano

pyproject.toml

@@ -8,12 +8,12 @@ license = "MIT"
 [tool.poetry.dependencies]
 python = "^3.10"
 matplotlib = "^3.5.1"
-Pillow = "^9.0.0"
 munch = "^2.5.0"
 PyYAML = "^6.0"
 imageio = "^2.14.1"
 dict-deep = "^4.1.2"
 scikit-optimize = "^0.9.0"
+scikit-learn = "^1.3.0"
 gymnasium = "^0.28"
 torch = "^1.10.2"
 gpytorch = "^1.6.0"

safe_control_gym/controllers/mpc/gp_mpc.py

@@ -713,7 +713,7 @@ def learn(self,
                                                  self.train_iterations + validation_iterations,
                                                  random_state=self.seed)
             input_samples = np.array(input_samples)  # not being used currently
-            seeds = self.env.np_random.randint(0, 99999, size=self.train_iterations + validation_iterations)
+            seeds = self.env.np_random.integers(0, 99999, size=self.train_iterations + validation_iterations)
             for i in range(self.train_iterations + validation_iterations):
                 # For random initial state training.
                 # init_state = init_state_samples[i,:]

safe_control_gym/envs/disturbances.py

@@ -100,7 +100,7 @@ def reset(self,
               env
               ):
         if self.step_offset is None:
-            self.current_step_offset = self.np_random.randint(self.max_step)
+            self.current_step_offset = self.np_random.integers(self.max_step)
         else:
             self.current_step_offset = self.step_offset
         self.current_peak_step = int(self.current_step_offset + self.duration / 2)
@@ -146,7 +146,7 @@ def reset(self,
               env
               ):
         if self.step_offset is None:
-            self.current_step_offset = self.np_random.randint(self.max_step)
+            self.current_step_offset = self.np_random.integers(self.max_step)
         else:
             self.current_step_offset = self.step_offset
 

setup.py

@@ -4,12 +4,12 @@
       version='2.0.0',
       install_requires=[
           'matplotlib',
-          'Pillow',
           'munch',
           'pyyaml',
           'imageio',
           'dict-deep',
           'scikit-optimize',
+          'scikit-learn',
           'gymnasium',
           'torch',
           'gpytorch',