Rename pelvis to torso to sacrum

src/brim/__init__.py

@@ -31,7 +31,7 @@
 
     "SphericalLeftShoulder", "SphericalRightShoulder",
 
-    "FixedPelvisToTorso",
+    "FixedSacrum",
 
     "BicycleRider",
 
@@ -60,7 +60,7 @@
     SideLeanSeat,
 )
 from brim.rider import (
-    FixedPelvisToTorso,
+    FixedSacrum,
     PinElbowStickLeftArm,
     PinElbowStickRightArm,
     PinLeftHip,

src/brim/rider/__init__.py

@@ -5,7 +5,7 @@
 
     "Rider",
 
-    "HipBase", "LeftHipBase", "RightHipBase", "PelvisToTorsoBase",
+    "HipBase", "LeftHipBase", "RightHipBase", "SacrumBase",
     "LeftShoulderBase", "RightShoulderBase", "ShoulderBase",
 
     "PelvisBase", "PlanarPelvis",
@@ -22,7 +22,7 @@
 
     "TwoPinLegTorque", "TwoPinLegSpringDamper",
 
-    "FixedPelvisToTorso",
+    "FixedSacrum",
 
     "SphericalLeftHip", "SphericalRightHip", "PinLeftHip", "PinRightHip",
 
@@ -46,9 +46,9 @@
     HipBase,
     LeftHipBase,
     LeftShoulderBase,
-    PelvisToTorsoBase,
     RightHipBase,
     RightShoulderBase,
+    SacrumBase,
     ShoulderBase,
 )
 from brim.rider.connections import RiderLeanConnection
@@ -70,9 +70,9 @@
     TwoPinStickRightLeg,
 )
 from brim.rider.pelvis import PelvisBase, PlanarPelvis
-from brim.rider.pelvis_to_torso import FixedPelvisToTorso
 from brim.rider.rider import Rider
 from brim.rider.rider_lean import RiderLean
+from brim.rider.sacrums import FixedSacrum
 from brim.rider.shoulder_joints import (
     SphericalLeftShoulder,
     SphericalRightShoulder,

src/brim/rider/base_connections.py

@@ -14,11 +14,11 @@
     with contextlib.suppress(ImportError):
         from brim.utilities.plotting import PlotModel
 
-__all__ = ["PelvisToTorsoBase", "ShoulderBase", "LeftShoulderBase", "RightShoulderBase",
+__all__ = ["SacrumBase", "ShoulderBase", "LeftShoulderBase", "RightShoulderBase",
            "HipBase", "LeftHipBase", "RightHipBase"]
 
 
-class PelvisToTorsoBase(ConnectionBase):
+class SacrumBase(ConnectionBase):
     """Base class for the connection between the pelvis and the torso."""
 
     required_models: tuple[ModelRequirement, ...] = (

src/brim/rider/rider.py

@@ -8,9 +8,9 @@
 from brim.rider.base_connections import (
     LeftHipBase,
     LeftShoulderBase,
-    PelvisToTorsoBase,
     RightHipBase,
     RightShoulderBase,
+    SacrumBase,
 )
 from brim.rider.legs import LeftLegBase, RightLegBase
 from brim.rider.pelvis import PelvisBase
@@ -31,7 +31,7 @@ class Rider(ModelBase):
         ModelRequirement("right_leg", RightLegBase, "Right leg of the rider.", False),
     )
     required_connections: tuple[ConnectionRequirement] = (
-        ConnectionRequirement("pelvis_to_torso", PelvisToTorsoBase,
+        ConnectionRequirement("sacrum", SacrumBase,
                               "Connection between the pelvis and the torso.", False),
         ConnectionRequirement("left_shoulder", LeftShoulderBase,
                               "Connection between the torso and the left arm.", False),
@@ -48,7 +48,7 @@ class Rider(ModelBase):
     right_arm: RightArmBase
     left_leg: LeftLegBase
     right_leg: RightLegBase
-    pelvis_to_torso: PelvisToTorsoBase
+    sacrum: SacrumBase
     left_shoulder: LeftShoulderBase
     right_shoulder: RightShoulderBase
     left_hip: LeftHipBase
@@ -57,9 +57,9 @@ class Rider(ModelBase):
     def _define_connections(self) -> None:
         """Define the connections."""
         super()._define_connections()
-        if self.pelvis_to_torso:
-            self.pelvis_to_torso.pelvis = self.pelvis
-            self.pelvis_to_torso.torso = self.torso
+        if self.sacrum:
+            self.sacrum.pelvis = self.pelvis
+            self.sacrum.torso = self.torso
         if self.left_shoulder:
             self.left_shoulder.torso = self.torso
             self.left_shoulder.arm = self.left_arm

src/brim/rider/pelvis_to_torso.py → src/brim/rider/sacrums.py

@@ -8,19 +8,19 @@
 from sympy.physics.mechanics import Vector, WeldJoint
 from sympy.physics.mechanics._system import System
 
-from brim.rider.base_connections import PelvisToTorsoBase
+from brim.rider.base_connections import SacrumBase
 
 with contextlib.suppress(ImportError):
     import numpy as np
 
     if TYPE_CHECKING:
         from bicycleparameters import Bicycle
 
-__all__ = ["FixedPelvisToTorso"]
+__all__ = ["FixedSacrum"]
 
 
-class FixedPelvisToTorso(PelvisToTorsoBase):
-    """Connection between the pelvis and the torso with a fixed connection."""
+class FixedSacrum(SacrumBase):
+    """Connection to fixate the torso to the pelvis."""
 
     @property
     def descriptions(self) -> dict[Any, str]:

tests/brim/test_bicycle_rider.py

@@ -18,7 +18,7 @@
     SideLeanSeat,
 )
 from brim.rider import (
-    FixedPelvisToTorso,
+    FixedSacrum,
     PinElbowStickLeftArm,
     PinElbowStickRightArm,
     PlanarPelvis,
@@ -64,7 +64,7 @@ def _rider_setup(self) -> None:
         self.rider.right_arm = PinElbowStickRightArm("right_arm")
         self.rider.left_leg = TwoPinStickLeftLeg("left_leg")
         self.rider.right_leg = TwoPinStickRightLeg("right_leg")
-        self.rider.pelvis_to_torso = FixedPelvisToTorso("pelvis_to_torso")
+        self.rider.sacrum = FixedSacrum("sacrum")
         self.rider.left_hip = SphericalLeftHip("left_hip")
         self.rider.right_hip = SphericalRightHip("right_hip")
         self.rider.left_shoulder = SphericalLeftShoulder("left_shoulder")

tests/rider/test_rider.py

@@ -2,7 +2,7 @@
 
 import pytest
 from brim.rider import (
-    FixedPelvisToTorso,
+    FixedSacrum,
     PinElbowStickLeftArm,
     PinElbowStickRightArm,
     PlanarPelvis,
@@ -27,7 +27,7 @@ def _setup(self) -> None:
         self.rider.right_arm = PinElbowStickRightArm("right_arm")
         self.rider.left_leg = TwoPinStickLeftLeg("left_leg")
         self.rider.right_leg = TwoPinStickRightLeg("right_leg")
-        self.rider.pelvis_to_torso = FixedPelvisToTorso("pelvis_to_torso")
+        self.rider.sacrum = FixedSacrum("sacrum")
         self.rider.left_hip = SphericalLeftHip("left_hip")
         self.rider.right_hip = SphericalRightHip("right_hip")
         self.rider.left_shoulder = SphericalLeftShoulder("left_shoulder")
@@ -40,7 +40,7 @@ def test_setup(self, _setup) -> None:
         assert self.rider.right_arm is not None
         assert self.rider.left_leg is not None
         assert self.rider.right_leg is not None
-        assert self.rider.pelvis_to_torso is not None
+        assert self.rider.sacrum is not None
         assert self.rider.left_hip is not None
         assert self.rider.right_hip is not None
         assert self.rider.left_shoulder is not None

tests/rider/test_pelvis_to_torso.py → tests/rider/test_sacrums.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
 import pytest
-from brim.rider.base_connections import PelvisToTorsoBase
+from brim.rider.base_connections import SacrumBase
 from brim.rider.pelvis import PlanarPelvis
-from brim.rider.pelvis_to_torso import FixedPelvisToTorso
+from brim.rider.sacrums import FixedSacrum
 from brim.rider.torso import PlanarTorso
 from brim.utilities.testing import _test_descriptions, create_model_of_connection
 from sympy import eye
@@ -14,22 +14,22 @@
     PlotConnection = None
 
 
-@pytest.mark.parametrize("pelvis_cls, torso_cls, pelvis_to_torso_cls", [
-    (PlanarPelvis, PlanarTorso, FixedPelvisToTorso),
+@pytest.mark.parametrize("pelvis_cls, torso_cls, sacrum_cls", [
+    (PlanarPelvis, PlanarTorso, FixedSacrum),
 ])
-class TestPelvisToTorsoBase:
+class TestSacrumBase:
     @pytest.fixture(autouse=True)
-    def _setup(self, pelvis_cls, torso_cls, pelvis_to_torso_cls) -> None:
-        self.model = create_model_of_connection(pelvis_to_torso_cls)("model")
+    def _setup(self, pelvis_cls, torso_cls, sacrum_cls) -> None:
+        self.model = create_model_of_connection(sacrum_cls)("model")
         self.model.pelvis = pelvis_cls("pelvis")
         self.model.torso = torso_cls("torso")
-        self.model.conn = pelvis_to_torso_cls("pelvis_to_torso")
+        self.model.conn = sacrum_cls("sacrum")
         self.pelvis, self.torso, self.conn = (
             self.model.pelvis, self.model.torso, self.model.conn)
         self.model.define_all()
 
     def test_types(self) -> None:
-        assert isinstance(self.conn, PelvisToTorsoBase)
+        assert isinstance(self.conn, SacrumBase)
 
     def test_descriptions(self) -> None:
         _test_descriptions(self.conn)
@@ -41,13 +41,13 @@ def test_plotting(self):
         assert plot_conn.children
 
 
-class TestFixedPelvisToTorso:
+class TestFixedSacrum:
     @pytest.fixture(autouse=True)
     def _setup(self) -> None:
-        self.model = create_model_of_connection(FixedPelvisToTorso)("model")
+        self.model = create_model_of_connection(FixedSacrum)("model")
         self.model.pelvis = PlanarPelvis("pelvis")
         self.model.torso = PlanarTorso("torso")
-        self.model.conn = FixedPelvisToTorso("pelvis_to_torso")
+        self.model.conn = FixedSacrum("sacrum")
         self.pelvis, self.torso, self.conn = (
             self.model.pelvis, self.model.torso, self.model.conn)
         self.model.define_connections()

tests/utilities/test_parametrize.py

@@ -17,8 +17,8 @@
 from brim.rider.hip_joints import SphericalLeftHip, SphericalRightHip
 from brim.rider.legs import TwoPinStickLeftLeg, TwoPinStickRightLeg
 from brim.rider.pelvis import PlanarPelvis
-from brim.rider.pelvis_to_torso import FixedPelvisToTorso
 from brim.rider.rider import Rider
+from brim.rider.sacrums import FixedSacrum
 from brim.rider.shoulder_joints import SphericalLeftShoulder, SphericalRightShoulder
 from brim.rider.torso import PlanarTorso
 from sympy import diag
@@ -93,7 +93,7 @@ def _setup_full_model(self) -> None:
         self.rider.right_arm = PinElbowStickRightArm("right_arm")
         self.rider.left_leg = TwoPinStickLeftLeg("left_leg")
         self.rider.right_leg = TwoPinStickRightLeg("right_leg")
-        self.rider.pelvis_to_torso = FixedPelvisToTorso("pelvis_to_torso")
+        self.rider.sacrum = FixedSacrum("sacrum")
         self.rider.left_hip = SphericalLeftHip("left_hip")
         self.rider.right_hip = SphericalRightHip("right_hip")
         self.rider.left_shoulder = SphericalLeftShoulder("left_shoulder")