jaxsim 0.4.3.dev159__tar.gz → 0.4.3.dev169__tar.gz

{jaxsim-0.4.3.dev159 → jaxsim-0.4.3.dev169}/.pre-commit-config.yaml

@@ -8,7 +8,7 @@ default_language_version:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
     - id: check-ast
     - id: check-merge-conflict
@@ -17,7 +17,7 @@ repos:
     - id: trailing-whitespace
 
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 24.4.2
+    rev: 24.8.0
     hooks:
       - id: black
         args: ["--check", "--diff"]
@@ -29,7 +29,7 @@ repos:
         args: ["--check", "--diff"]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.1
+    rev: v0.6.9
     hooks:
       - id: ruff
 

{jaxsim-0.4.3.dev159 → jaxsim-0.4.3.dev169}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jaxsim
-Version: 0.4.3.dev159
+Version: 0.4.3.dev169
 Summary: A differentiable physics engine and multibody dynamics library for control and robot learning.
 Author-email: Diego Ferigo <dgferigo@gmail.com>
 Maintainer-email: Diego Ferigo <dgferigo@gmail.com>, Filippo Luca Ferretti <filippo.ferretti@iit.it>

{jaxsim-0.4.3.dev159 → jaxsim-0.4.3.dev169}/src/jaxsim/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.4.3.dev159'
-__version_tuple__ = version_tuple = (0, 4, 3, 'dev159')
+__version__ = version = '0.4.3.dev169'
+__version_tuple__ = version_tuple = (0, 4, 3, 'dev169')

{jaxsim-0.4.3.dev159 → jaxsim-0.4.3.dev169}/src/jaxsim/api/contact.py

@@ -6,9 +6,12 @@ import jax
 import jax.numpy as jnp
 
 import jaxsim.api as js
+import jaxsim.exceptions
 import jaxsim.terrain
 import jaxsim.typing as jtp
+from jaxsim import logging
 from jaxsim.math import Adjoint, Cross, Transform
+from jaxsim.rbda import contacts
 
 from .common import VelRepr
 
@@ -156,14 +159,11 @@ def collidable_point_dynamics(
         Instead, the 6D forces are returned in the active representation.
     """
 
-    # Import privately the contacts classes.
-    from jaxsim.rbda.contacts import RelaxedRigidContacts, RigidContacts, SoftContacts
-
     # Build the soft contact model.
     match model.contact_model:
 
-        case SoftContacts():
-            assert isinstance(model.contact_model, SoftContacts)
+        case contacts.SoftContacts():
+            assert isinstance(model.contact_model, contacts.SoftContacts)
 
             # Compute the 6D force expressed in the inertial frame and applied to each
             # collidable point, and the corresponding material deformation rate.
@@ -178,8 +178,8 @@ def collidable_point_dynamics(
             # of the ODE system. We need to pass its dynamics to the integrator.
             aux_data = dict(m_dot=CW_ṁ)
 
-        case RigidContacts():
-            assert isinstance(model.contact_model, RigidContacts)
+        case contacts.RigidContacts():
+            assert isinstance(model.contact_model, contacts.RigidContacts)
 
             # Compute the 6D force expressed in the inertial frame and applied to each
             # collidable point.
@@ -192,8 +192,8 @@ def collidable_point_dynamics(
 
             aux_data = dict()
 
-        case RelaxedRigidContacts():
-            assert isinstance(model.contact_model, RelaxedRigidContacts)
+        case contacts.RelaxedRigidContacts():
+            assert isinstance(model.contact_model, contacts.RelaxedRigidContacts)
 
             # Compute the 6D force expressed in the inertial frame and applied to each
             # collidable point.
@@ -206,6 +206,31 @@ def collidable_point_dynamics(
 
             aux_data = dict()
 
+        case contacts.ViscoElasticContacts():
+            assert isinstance(model.contact_model, contacts.ViscoElasticContacts)
+
+            # It is not yet clear how to pass the time step to this stage.
+            # A possibility is to restrict the integrator to only forward Euler
+            # and store the Δt inside the model.
+            module = jaxsim.rbda.contacts.visco_elastic.step.__module__
+            name = jaxsim.rbda.contacts.visco_elastic.step.__name__
+            msg = "You need to use the custom '{}.{}' function with this contact model."
+            jaxsim.exceptions.raise_runtime_error_if(
+                condition=True, msg=msg.format(module, name)
+            )
+
+            # Compute the 6D force expressed in the inertial frame and applied to each
+            # collidable point.
+            W_f_Ci, (W_f̿_Ci, m_tf) = model.contact_model.compute_contact_forces(
+                model=model,
+                data=data,
+                dt=None,  # TODO
+                link_forces=link_forces,
+                joint_force_references=joint_force_references,
+            )
+
+            aux_data = dict(W_f_avg2_C=W_f̿_Ci, m_tf=m_tf)
+
         case _:
             raise ValueError(f"Invalid contact model {model.contact_model}")
 
@@ -278,7 +303,6 @@ def in_contact(
     return links_in_contact
 
 
-@jax.jit
 def estimate_good_soft_contacts_parameters(
     model: js.model.JaxSimModel,
     *,
@@ -287,9 +311,15 @@ def estimate_good_soft_contacts_parameters(
     number_of_active_collidable_points_steady_state: jtp.IntLike = 1,
     damping_ratio: jtp.FloatLike = 1.0,
     max_penetration: jtp.FloatLike | None = None,
-) -> jaxsim.rbda.contacts.SoftContactsParams:
+    **kwargs,
+) -> (
+    jaxsim.rbda.contacts.RelaxedRigidContactsParams
+    | jaxsim.rbda.contacts.RigidContactsParams
+    | jaxsim.rbda.contacts.SoftContactsParams
+    | jaxsim.rbda.contacts.ViscoElasticContactsParams
+):
     """
-    Estimate good soft contacts parameters for the given model.
+    Estimate good parameters for soft-like contact models.
 
     Args:
         model: The model to consider.
@@ -313,7 +343,10 @@ def estimate_good_soft_contacts_parameters(
     """
 
     def estimate_model_height(model: js.model.JaxSimModel) -> jtp.Float:
-        """"""
+        """
+        Displacement between the CoM and the lowest collidable point using zero
+        joint positions.
+        """
 
         zero_data = js.data.JaxSimModelData.build(
             model=model,
@@ -338,21 +371,39 @@ def estimate_good_soft_contacts_parameters(
 
     match model.contact_model:
 
-        case jaxsim.rbda.contacts.SoftContacts():
-            assert isinstance(model.contact_model, jaxsim.rbda.contacts.SoftContacts)
+        case contacts.SoftContacts():
+            assert isinstance(model.contact_model, contacts.SoftContacts)
+
+            parameters = contacts.SoftContactsParams.build_default_from_jaxsim_model(
+                model=model,
+                standard_gravity=standard_gravity,
+                static_friction_coefficient=static_friction_coefficient,
+                max_penetration=max_δ,
+                number_of_active_collidable_points_steady_state=nc,
+                damping_ratio=damping_ratio,
+                p=model.contact_model.parameters.p,
+                q=model.contact_model.parameters.q,
+            )
+
+        case contacts.ViscoElasticContacts():
+            assert isinstance(model.contact_model, contacts.ViscoElasticContacts)
 
             parameters = (
-                jaxsim.rbda.contacts.SoftContactsParams.build_default_from_jaxsim_model(
+                contacts.ViscoElasticContactsParams.build_default_from_jaxsim_model(
                     model=model,
                     standard_gravity=standard_gravity,
                     static_friction_coefficient=static_friction_coefficient,
                     max_penetration=max_δ,
                     number_of_active_collidable_points_steady_state=nc,
                     damping_ratio=damping_ratio,
+                    p=model.contact_model.parameters.p,
+                    q=model.contact_model.parameters.q,
+                    **kwargs,
                 )
             )
 
         case _:
+            logging.warning("The active contact model is not soft-like, no-op.")
             parameters = model.contact_model.parameters
 
     return parameters

{jaxsim-0.4.3.dev159 → jaxsim-0.4.3.dev169}/src/jaxsim/api/data.py

@@ -233,7 +233,11 @@ class JaxSimModelData(common.ModelDataWithVelocityRepresentation):
 
         if contacts_params is None:
 
-            if isinstance(model.contact_model, jaxsim.rbda.contacts.SoftContacts):
+            if isinstance(
+                model.contact_model,
+                jaxsim.rbda.contacts.SoftContacts
+                | jaxsim.rbda.contacts.ViscoElasticContacts,
+            ):
                 contacts_params = js.contact.estimate_good_soft_contacts_parameters(
                     model=model, standard_gravity=standard_gravity
                 )

{jaxsim-0.4.3.dev159 → jaxsim-0.4.3.dev169}/src/jaxsim/api/kin_dyn_parameters.py

@@ -5,6 +5,8 @@ import dataclasses
 import jax.lax
 import jax.numpy as jnp
 import jax_dataclasses
+import numpy as np
+import numpy.typing as npt
 from jax_dataclasses import Static
 
 import jaxsim.typing as jtp
@@ -753,6 +755,13 @@ class ContactParameters(JaxsimDataclass):
 
     point: jtp.Matrix = dataclasses.field(default_factory=lambda: jnp.array([]))
 
+    enabled: Static[tuple[bool, ...]] = dataclasses.field(default_factory=tuple)
+
+    @property
+    def indices_of_enabled_collidable_points(self) -> npt.NDArray:
+
+        return np.where(np.array(self.enabled))[0]
+
     @staticmethod
     def build_from(model_description: ModelDescription) -> ContactParameters:
         """
@@ -785,7 +794,11 @@ class ContactParameters(JaxsimDataclass):
         )
 
         # Build the ContactParameters object.
-        cp = ContactParameters(point=points, body=link_index_of_points)
+        cp = ContactParameters(
+            point=points,
+            body=link_index_of_points,
+            enabled=tuple(True for _ in link_index_of_points),
+        )
 
         assert cp.point.shape[1] == 3, cp.point.shape[1]
         assert cp.point.shape[0] == len(cp.body), cp.point.shape[0]

{jaxsim-0.4.3.dev159 → jaxsim-0.4.3.dev169}/src/jaxsim/api/ode.py

@@ -8,6 +8,7 @@ import jaxsim.rbda
 import jaxsim.typing as jtp
 from jaxsim.integrators import Time
 from jaxsim.math import Quaternion
+from jaxsim.rbda import contacts
 
 from .common import VelRepr
 from .ode_data import ODEState
@@ -371,8 +372,6 @@ def system_dynamics(
         by the system dynamics evaluation.
     """
 
-    from jaxsim.rbda.contacts import RelaxedRigidContacts, RigidContacts, SoftContacts
-
     # Compute the accelerations and the material deformation rate.
     W_v̇_WB, s̈, aux_dict = system_velocity_dynamics(
         model=model,
@@ -387,10 +386,18 @@ def system_dynamics(
 
     match model.contact_model:
 
-        case SoftContacts():
+        case contacts.SoftContacts():
             extended_ode_state["tangential_deformation"] = aux_dict["m_dot"]
 
-        case RigidContacts() | RelaxedRigidContacts():
+        case contacts.ViscoElasticContacts():
+
+            extended_ode_state["contacts_state"] = {
+                "tangential_deformation": jnp.zeros_like(
+                    data.state.extended["tangential_deformation"]
+                )
+            }
+
+        case contacts.RigidContacts() | contacts.RelaxedRigidContacts():
             pass
 
         case _:

{jaxsim-0.4.3.dev159 → jaxsim-0.4.3.dev169}/src/jaxsim/rbda/contacts/__init__.py

@@ -1,5 +1,6 @@
-from . import relaxed_rigid, rigid, soft
+from . import relaxed_rigid, rigid, soft, visco_elastic
 from .common import ContactModel, ContactsParams
 from .relaxed_rigid import RelaxedRigidContacts, RelaxedRigidContactsParams
 from .rigid import RigidContacts, RigidContactsParams
 from .soft import SoftContacts, SoftContactsParams
+from .visco_elastic import ViscoElasticContacts, ViscoElasticContactsParams