Skip to content

Commit d3b7d38

Browse files
committed
Rename soft_contacts module to soft
1 parent 9675c49 commit d3b7d38

File tree

7 files changed

+9
-10
lines changed

7 files changed

+9
-10
lines changed

docs/modules/rbda.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ This module provides a set of algorithms for rigid body dynamics.
1313
crba
1414
forward_kinematics
1515
jacobian
16-
soft_contacts
1716
utils
1817

1918
Articulated Body Algorithm
@@ -31,7 +30,7 @@ Collision Detection
3130
Contact Models
3231
~~~~~~~~~~~~~~
3332

34-
.. automodule:: jaxsim.rbda.soft_contacts
33+
.. automodule:: jaxsim.rbda.contacts.soft
3534
:members:
3635

3736
Composite Rigid Body Algorithm

src/jaxsim/api/contact.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import jaxsim.api as js
99
import jaxsim.terrain
1010
import jaxsim.typing as jtp
11-
from jaxsim.rbda.contacts.soft_contacts import SoftContacts, SoftContactsParams
11+
from jaxsim.rbda.contacts.soft import SoftContacts, SoftContactsParams
1212

1313
from .common import VelRepr
1414

@@ -246,7 +246,7 @@ def estimate_good_soft_contacts_parameters(
246246
The user is encouraged to fine-tune the parameters based on the
247247
specific application.
248248
"""
249-
from jaxsim.rbda.contacts.soft_contacts import SoftContactsParams
249+
from jaxsim.rbda.contacts.soft import SoftContactsParams
250250

251251
def estimate_model_height(model: js.model.JaxSimModel) -> jtp.Float:
252252
""""""

src/jaxsim/api/data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import jaxsim.rbda
1515
import jaxsim.typing as jtp
1616
from jaxsim.math import Quaternion
17-
from jaxsim.rbda.contacts.soft_contacts import SoftContacts
17+
from jaxsim.rbda.contacts.soft import SoftContacts
1818
from jaxsim.utils import Mutability
1919
from jaxsim.utils.tracing import not_tracing
2020

src/jaxsim/api/model.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ def build_from_model_description(
114114
"""
115115

116116
import jaxsim.parsers.rod
117-
from jaxsim.rbda.contacts.soft_contacts import SoftContacts
117+
from jaxsim.rbda.contacts.soft import SoftContacts
118118

119119
# Parse the input resource (either a path to file or a string with the URDF/SDF)
120120
# and build the -intermediate- model description
@@ -171,7 +171,7 @@ def build(
171171
Returns:
172172
The built Model object.
173173
"""
174-
from jaxsim.rbda.contacts.soft_contacts import SoftContacts
174+
from jaxsim.rbda.contacts.soft import SoftContacts
175175

176176
# Set the model name (if not provided, use the one from the model description)
177177
model_name = model_name if model_name is not None else model_description.name

src/jaxsim/api/ode_data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import jaxsim.api as js
77
import jaxsim.typing as jtp
88
from jaxsim.rbda import ContactsState
9-
from jaxsim.rbda.contacts.soft_contacts import SoftContacts, SoftContactsState
9+
from jaxsim.rbda.contacts.soft import SoftContacts, SoftContactsState
1010
from jaxsim.utils import JaxsimDataclass
1111

1212
# =============================================================================

tests/test_automatic_differentiation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import jaxsim.rbda
99
import jaxsim.typing as jtp
1010
from jaxsim import VelRepr
11-
from jaxsim.rbda.contacts.soft_contacts import SoftContacts, SoftContactsParams
11+
from jaxsim.rbda.contacts.soft import SoftContacts, SoftContactsParams
1212

1313
# All JaxSim algorithms, excluding the variable-step integrators, should support
1414
# being automatically differentiated until second order, both in FWD and REV modes.

tests/test_simulations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import jaxsim.integrators
77
import jaxsim.rbda
88
from jaxsim import VelRepr
9-
from jaxsim.rbda.contacts.soft_contacts import SoftContactsParams
9+
from jaxsim.rbda.contacts.soft import SoftContactsParams
1010

1111

1212
def test_box_with_external_forces(

0 commit comments

Comments
 (0)