File tree Expand file tree Collapse file tree 7 files changed +9
-10
lines changed Expand file tree Collapse file tree 7 files changed +9
-10
lines changed Original file line number Diff line number Diff line change @@ -13,7 +13,6 @@ This module provides a set of algorithms for rigid body dynamics.
13
13
crba
14
14
forward_kinematics
15
15
jacobian
16
- soft_contacts
17
16
utils
18
17
19
18
Articulated Body Algorithm
@@ -31,7 +30,7 @@ Collision Detection
31
30
Contact Models
32
31
~~~~~~~~~~~~~~
33
32
34
- .. automodule :: jaxsim.rbda.soft_contacts
33
+ .. automodule :: jaxsim.rbda.contacts.soft
35
34
:members:
36
35
37
36
Composite Rigid Body Algorithm
Original file line number Diff line number Diff line change 8
8
import jaxsim .api as js
9
9
import jaxsim .terrain
10
10
import jaxsim .typing as jtp
11
- from jaxsim .rbda .contacts .soft_contacts import SoftContacts , SoftContactsParams
11
+ from jaxsim .rbda .contacts .soft import SoftContacts , SoftContactsParams
12
12
13
13
from .common import VelRepr
14
14
@@ -246,7 +246,7 @@ def estimate_good_soft_contacts_parameters(
246
246
The user is encouraged to fine-tune the parameters based on the
247
247
specific application.
248
248
"""
249
- from jaxsim .rbda .contacts .soft_contacts import SoftContactsParams
249
+ from jaxsim .rbda .contacts .soft import SoftContactsParams
250
250
251
251
def estimate_model_height (model : js .model .JaxSimModel ) -> jtp .Float :
252
252
""""""
Original file line number Diff line number Diff line change 14
14
import jaxsim .rbda
15
15
import jaxsim .typing as jtp
16
16
from jaxsim .math import Quaternion
17
- from jaxsim .rbda .contacts .soft_contacts import SoftContacts
17
+ from jaxsim .rbda .contacts .soft import SoftContacts
18
18
from jaxsim .utils import Mutability
19
19
from jaxsim .utils .tracing import not_tracing
20
20
Original file line number Diff line number Diff line change @@ -114,7 +114,7 @@ def build_from_model_description(
114
114
"""
115
115
116
116
import jaxsim .parsers .rod
117
- from jaxsim .rbda .contacts .soft_contacts import SoftContacts
117
+ from jaxsim .rbda .contacts .soft import SoftContacts
118
118
119
119
# Parse the input resource (either a path to file or a string with the URDF/SDF)
120
120
# and build the -intermediate- model description
@@ -171,7 +171,7 @@ def build(
171
171
Returns:
172
172
The built Model object.
173
173
"""
174
- from jaxsim .rbda .contacts .soft_contacts import SoftContacts
174
+ from jaxsim .rbda .contacts .soft import SoftContacts
175
175
176
176
# Set the model name (if not provided, use the one from the model description)
177
177
model_name = model_name if model_name is not None else model_description .name
Original file line number Diff line number Diff line change 6
6
import jaxsim .api as js
7
7
import jaxsim .typing as jtp
8
8
from jaxsim .rbda import ContactsState
9
- from jaxsim .rbda .contacts .soft_contacts import SoftContacts , SoftContactsState
9
+ from jaxsim .rbda .contacts .soft import SoftContacts , SoftContactsState
10
10
from jaxsim .utils import JaxsimDataclass
11
11
12
12
# =============================================================================
Original file line number Diff line number Diff line change 8
8
import jaxsim .rbda
9
9
import jaxsim .typing as jtp
10
10
from jaxsim import VelRepr
11
- from jaxsim .rbda .contacts .soft_contacts import SoftContacts , SoftContactsParams
11
+ from jaxsim .rbda .contacts .soft import SoftContacts , SoftContactsParams
12
12
13
13
# All JaxSim algorithms, excluding the variable-step integrators, should support
14
14
# being automatically differentiated until second order, both in FWD and REV modes.
Original file line number Diff line number Diff line change 6
6
import jaxsim .integrators
7
7
import jaxsim .rbda
8
8
from jaxsim import VelRepr
9
- from jaxsim .rbda .contacts .soft_contacts import SoftContactsParams
9
+ from jaxsim .rbda .contacts .soft import SoftContactsParams
10
10
11
11
12
12
def test_box_with_external_forces (
You can’t perform that action at this time.
0 commit comments