diff --git a/setup.cfg b/setup.cfg index bdaaf520a7727c15f566af985eeee8056d2375ba..b39e551588c874b3459bfc3dc36e106e805b06b6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -9,6 +9,14 @@ url = https://gitlab.inria.fr/twintz/non-holo-mpc zip_safe = False include_package_data = True packages = find: +install_requires = + numpy >= 1.21.2 + scipy >= 1.7.1 + jax == 0.2.20 + jaxlib == 0.1.71 + PyYAML >= 5.4.1 + scikit-fmm >= 2021.7.8 + opencv-python >= 4.6.0.66 python_requires = >=3.8 scripts = demo.py diff --git a/setup.py b/setup.py index e7cbe912bb098a62d9ba3c30365f3caa6a30e5d9..cca74f4c50261efb2e2ec67652889666d4150de1 100644 --- a/setup.py +++ b/setup.py @@ -11,4 +11,14 @@ import setuptools -setuptools.setup() +setuptools.setup( + install_requires=[ + 'numpy >= 1.21.2', + 'scipy >= 1.7.1', + 'jax == 0.2.20', + 'jaxlib == 0.1.71', + 'PyYAML >= 5.4.1', + 'scikit-fmm >= 2021.7.8', + 'opencv-python >= 4.6.0.66', + ] +) diff --git a/social_mpc/config/social_mpc.yaml b/social_mpc/config/social_mpc.yaml index c8c94a312b13bdbc9c111f17dc68b7f22f4f5a85..553357a2cd29ccef4d28bde12866ccd75bb0f62d 100644 --- a/social_mpc/config/social_mpc.yaml +++ b/social_mpc/config/social_mpc.yaml @@ -35,7 +35,7 @@ loss_coef: [[50, 50, 1, 0, 0, 0, 3], [0, 0, 0, 50, 50, 3, 3], [10, 10, 1, 50, 50 # cost_map parameters step_meshes: 5 # sampling every x cm # ssn model parameters -group_detection_stride: 0.6 +group_detection_stride: 0.5 # mpc preprocessing parameters waypoint_distance: 1.0 #1.2 orientation_distance_threshold: 0.5 diff --git a/social_mpc/controller.py b/social_mpc/controller.py index be887f9a4edd7e3912a14911ded4097a18a908bc..1f6e8dc3f7d1537a99b64c2630800851225d5d04 100644 --- a/social_mpc/controller.py +++ b/social_mpc/controller.py @@ -17,7 +17,6 @@ import atexit import time -import gym import numpy as np import yaml import pkg_resources diff --git a/social_mpc/ssn_model/social_spaces.py b/social_mpc/ssn_model/social_spaces.py index b2eeb3b1d4f47f83776cb330c6c4ef811183a250..c5274335821da0aea01e79e8e9102cb3903c655a 100644 --- a/social_mpc/ssn_model/social_spaces.py +++ b/social_mpc/ssn_model/social_spaces.py @@ -97,8 +97,8 @@ class SocialSpacesConfig(): return SocialSpacesConfig( default_hand_distance = 0.2, A_p = 1.0, - sigma_p_x = 0.45, - sigma_p_y = 0.45, + sigma_p_x = 0.2, # 0.45, + sigma_p_y = 0.2, # 0.45, alpha = np.pi / 2, fov_angle = 60 * np.pi / 180, f_v = 0.8, @@ -112,7 +112,7 @@ class SocialSpacesConfig(): w_2 = 1.0, T_dis = 3.6, T_ang = 10 * np.pi / 180, - f_g = 0.0, + f_g = -0.5, # 0.0, w_3 = 1.0, w_4 = 1.0, r_step = 0.1,