Skip to content

Commit

Permalink
Triangle Inequality Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
alexbeattie42 committed Dec 6, 2024
1 parent c02a398 commit c2a5b1c
Show file tree
Hide file tree
Showing 13 changed files with 46 additions and 46 deletions.
4 changes: 2 additions & 2 deletions Models/Hamner/FullBodyModel_Hamner2010_v2_0.osim
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0.034599999999999999 0.0060000000000000001 -0.017500000000000002</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.0001 0.00020000000000000001 0.001 0 0 0</inertia>
<inertia>0.0001 0.00110000000000000001 0.001 0 0 0</inertia>
</Body>
<Body name="femur_l">
<!--The geometry used to display the axes of this Frame.-->
Expand Down Expand Up @@ -521,7 +521,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0.034599999999999999 0.0060000000000000001 0.017500000000000002</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.0001 0.00020000000000000001 0.001 0 0 0</inertia>
<inertia>0.0001 0.00110000000000000001 0.001 0 0 0</inertia>
</Body>
<Body name="torso">
<!--The geometry used to display the axes of this Frame.-->
Expand Down
14 changes: 7 additions & 7 deletions Models/Leg39/leg39.osim
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>-0.073951199999999995 0 0</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.1027 0.087015499999999996 0.057843899999999997 0 0 0</inertia>
<inertia>0.1027 0.000904620090462009046287015499999999996 0.000904620090462009046257843899999999997 0 0 0</inertia>
</Body>
<Body name="femur_r">
<!--The geometry used to display the axes of this Frame.-->
Expand Down Expand Up @@ -135,7 +135,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0 -0.199543 0</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.16956399999999999 0.0444489 0.178809 0 0 0</inertia>
<inertia>0.16956399999999999 0.0009046200904620090462444489 0.178809 0 0 0</inertia>
</Body>
<Body name="tibia_r">
<!--The geometry used to display the axes of this Frame.-->
Expand Down Expand Up @@ -188,7 +188,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0 -0.20979999999999999 0</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.080235100000000004 0.0081190299999999993 0.081349500000000005 0 0 0</inertia>
<inertia>0.000904620090462009046280235100000000004 0.0009046200904620090462081190299999999993 0.000904620090462009046281349500000000005 0 0 0</inertia>
</Body>
<Body name="patella_r">
<!--The geometry used to display the axes of this Frame.-->
Expand Down Expand Up @@ -226,7 +226,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0 0 0</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.0011029600000000001 0.0011029600000000001 0.0011029600000000001 0 0 0</inertia>
<inertia>0.0009046200904620090462011029600000000001 0.0009046200904620090462011029600000000001 0.0009046200904620090462011029600000000001 0 0 0</inertia>
</Body>
<Body name="talus_r">
<!--The geometry used to display the axes of this Frame.-->
Expand Down Expand Up @@ -264,7 +264,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0 0 0</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.0020216600000000002 0.0020216600000000002 0.0020216600000000002 0 0 0</inertia>
<inertia>0.0009046200904620090462020216600000000002 0.0009046200904620090462020216600000000002 0.0009046200904620090462020216600000000002 0 0 0</inertia>
</Body>
<Body name="calcn_r">
<!--The geometry used to display the axes of this Frame.-->
Expand Down Expand Up @@ -302,7 +302,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0.10269300000000001 0.030807899999999999 0</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.00090461999999999997 0.0036184799999999999 0.0036184799999999999 0 0 0</inertia>
<inertia>0.00090462009046200904620090461999999999997 0.0009046200904620090462036184799999999999 0.0009046200904620090462036184799999999999 0 0 0</inertia>
</Body>
<Body name="toes_r">
<!--The geometry used to display the axes of this Frame.-->
Expand Down Expand Up @@ -340,7 +340,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0.035942500000000002 0.0061615699999999999 -0.0184847</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0 0 0.00090461999999999997 0 0 0</inertia>
<inertia>0 0 0.00090462009046200904620090461999999999997 0 0 0</inertia>
</Body>
</objects>
<groups />
Expand Down
14 changes: 7 additions & 7 deletions Models/Leg6Dof9Musc/leg6dof9musc.osim
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>-0.073951199999999995 0 0</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.1027 0.087015499999999996 0.057843899999999997 0 0 0</inertia>
<inertia>0.1027 0.000904620090462009046287015499999999996 0.000904620090462009046257843899999999997 0 0 0</inertia>
</Body>
<Body name="femur_r">
<!--The geometry used to display the axes of this Frame.-->
Expand Down Expand Up @@ -135,7 +135,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0 -0.199543 0</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.16956399999999999 0.0444489 0.178809 0 0 0</inertia>
<inertia>0.16956399999999999 0.0009046200904620090462444489 0.178809 0 0 0</inertia>
</Body>
<Body name="tibia_r">
<!--The geometry used to display the axes of this Frame.-->
Expand Down Expand Up @@ -188,7 +188,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0 -0.20979999999999999 0</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.080235100000000004 0.0081190299999999993 0.081349500000000005 0 0 0</inertia>
<inertia>0.000904620090462009046280235100000000004 0.0009046200904620090462081190299999999993 0.000904620090462009046281349500000000005 0 0 0</inertia>
</Body>
<Body name="patella_r">
<!--The geometry used to display the axes of this Frame.-->
Expand Down Expand Up @@ -226,7 +226,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0 0 0</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.0011029600000000001 0.0011029600000000001 0.0011029600000000001 0 0 0</inertia>
<inertia>0.0009046200904620090462011029600000000001 0.0009046200904620090462011029600000000001 0.0009046200904620090462011029600000000001 0 0 0</inertia>
</Body>
<Body name="talus_r">
<!--The geometry used to display the axes of this Frame.-->
Expand Down Expand Up @@ -264,7 +264,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0 0 0</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.0020216600000000002 0.0020216600000000002 0.0020216600000000002 0 0 0</inertia>
<inertia>0.0009046200904620090462020216600000000002 0.0009046200904620090462020216600000000002 0.0009046200904620090462020216600000000002 0 0 0</inertia>
</Body>
<Body name="calcn_r">
<!--The geometry used to display the axes of this Frame.-->
Expand Down Expand Up @@ -302,7 +302,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0.10269300000000001 0.030807899999999999 0</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.00090461999999999997 0.0036184799999999999 0.0036184799999999999 0 0 0</inertia>
<inertia>0.00090462009046200904620090461999999999997 0.0009046200904620090462036184799999999999 0.0009046200904620090462036184799999999999 0 0 0</inertia>
</Body>
<Body name="toes_r">
<!--The geometry used to display the axes of this Frame.-->
Expand Down Expand Up @@ -340,7 +340,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0.035942500000000002 0.0061615699999999999 -0.0184847</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0 0 0.00090461999999999997 0 0 0</inertia>
<inertia>0 0 0.00090462009046200904620090461999999999997 0 0 0</inertia>
</Body>
</objects>
<groups />
Expand Down
4 changes: 2 additions & 2 deletions Models/Rajagopal/Rajagopal2016.osim
Original file line number Diff line number Diff line change
Expand Up @@ -1174,7 +1174,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0.034599999999999999 0.0060000000000000001 -0.017500000000000002</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.0001 0.00020000000000000001 0.001 0 0 0</inertia>
<inertia>0.0001 0.00110000000000000001 0.001 0 0 0</inertia>
</Body>
<Body name="femur_l">
<!--The geometry used to display the axes of this Frame.-->
Expand Down Expand Up @@ -1839,7 +1839,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0.034599999999999999 0.0060000000000000001 0.017500000000000002</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.0001 0.00020000000000000001 0.001 0 0 0</inertia>
<inertia>0.0001 0.00110000000000000001 0.001 0 0 0</inertia>
</Body>
<Body name="torso">
<!--The geometry used to display the axes of this Frame.-->
Expand Down
4 changes: 2 additions & 2 deletions Models/Rajagopal/RajagopalLaiUhlrich2023.osim
Original file line number Diff line number Diff line change
Expand Up @@ -1108,7 +1108,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0.034599999999999999 0.0060000000000000001 -0.017500000000000002</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.0001 0.00020000000000000001 0.001 0 0 0</inertia>
<inertia>0.0001 0.00110000000000000001 0.001 0 0 0</inertia>
</Body>
<Body name="femur_l">
<!--The geometry used to display the axes of this Frame.-->
Expand Down Expand Up @@ -1834,7 +1834,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0.034599999999999999 0.0060000000000000001 0.017500000000000002</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.0001 0.00020000000000000001 0.001 0 0 0</inertia>
<inertia>0.0001 0.00110000000000000001 0.001 0 0 0</inertia>
</Body>
<Body name="torso">
<!--The geometry used to display the axes of this Frame.-->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0.03553713 0.0061625100000000004 -0.017973980000000001</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.00010189 0.00020378 0.00101891 0 0 0</inertia>
<inertia>0.00010189 0.0011208000000000001 0.00101891 0 0 0</inertia>
</Body>
<Body name="femur_l">
<!--The geometry used to display the axes of this Frame.-->
Expand Down Expand Up @@ -523,7 +523,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0.03553713 0.0061625100000000004 0.017973980000000001</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.00010189 0.00020378 0.00101891 0 0 0</inertia>
<inertia>0.00010189 0.0011208000000000001 0.00101891 0 0 0</inertia>
</Body>
<Body name="torso">
<!--The geometry used to display the axes of this Frame.-->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0.03553713 0.0061625100000000004 -0.017973980000000001</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.00010189 0.00020378 0.00101891 0 0 0</inertia>
<inertia>0.00010189 0.0011208000000000001 0.00101891 0 0 0</inertia>
</Body>
<Body name="femur_l">
<!--The geometry used to display the axes of this Frame.-->
Expand Down Expand Up @@ -523,7 +523,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0.03553713 0.0061625100000000004 0.017973980000000001</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.00010189 0.00020378 0.00101891 0 0 0</inertia>
<inertia>0.00010189 0.0011208000000000001 0.00101891 0 0 0</inertia>
</Body>
<Body name="torso">
<!--The geometry used to display the axes of this Frame.-->
Expand Down
4 changes: 2 additions & 2 deletions Pipelines/Hamner/FullBodyModel_Hamner2010_v2_0.osim
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0.034599999999999999 0.0060000000000000001 -0.017500000000000002</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.0001 0.00020000000000000001 0.001 0 0 0</inertia>
<inertia>0.0001 0.00110000000000000001 0.001 0 0 0</inertia>
</Body>
<Body name="femur_l">
<!--The geometry used to display the axes of this Frame.-->
Expand Down Expand Up @@ -521,7 +521,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0.034599999999999999 0.0060000000000000001 0.017500000000000002</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.0001 0.00020000000000000001 0.001 0 0 0</inertia>
<inertia>0.0001 0.00110000000000000001 0.001 0 0 0</inertia>
</Body>
<Body name="torso">
<!--The geometry used to display the axes of this Frame.-->
Expand Down
4 changes: 2 additions & 2 deletions Pipelines/Hamner/outputReference/subject02_RRA_Adjusted.osim
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0.038059999999999997 0.0066 -0.01925</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.000106086 0.000212172 0.0010608600000000001 0 0 0</inertia>
<inertia>0.000106086 0.001166946 0.0010608600000000001 0 0 0</inertia>
</Body>
<Body name="femur_l">
<!--The geometry used to display the axes of this Frame.-->
Expand Down Expand Up @@ -507,7 +507,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0.038059999999999997 0.0066 0.01925</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.000106086 0.000212172 0.0010608600000000001 0 0 0</inertia>
<inertia>0.000106086 0.001166946 0.0010608600000000001 0 0 0</inertia>
</Body>
<Body name="torso">
<!--The geometry used to display the axes of this Frame.-->
Expand Down
4 changes: 2 additions & 2 deletions Pipelines/Hamner/outputReference/subject02_registered.osim
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0.038059999999999997 0.0066 -0.01925</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.000106086 0.000212172 0.0010608600000000001 0 0 0</inertia>
<inertia>0.000106086 0.001166946 0.0010608600000000001 0 0 0</inertia>
</Body>
<Body name="femur_l">
<!--The geometry used to display the axes of this Frame.-->
Expand Down Expand Up @@ -507,7 +507,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0.038059999999999997 0.0066 0.01925</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.000106086 0.000212172 0.0010608600000000001 0 0 0</inertia>
<inertia>0.000106086 0.001166946 0.0010608600000000001 0 0 0</inertia>
</Body>
<Body name="torso">
<!--The geometry used to display the axes of this Frame.-->
Expand Down
4 changes: 2 additions & 2 deletions Pipelines/Hamner/outputReference/subject02_scaled.osim
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0.038059999999999997 0.0066 -0.01925</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.000106086 0.000212172 0.0010608600000000001 0 0 0</inertia>
<inertia>0.000106086 0.001166946 0.0010608600000000001 0 0 0</inertia>
</Body>
<Body name="femur_l">
<!--The geometry used to display the axes of this Frame.-->
Expand Down Expand Up @@ -507,7 +507,7 @@
<!--The location (Vec3) of the mass center in the body frame.-->
<mass_center>0.038059999999999997 0.0066 0.01925</mass_center>
<!--The elements of the inertia tensor (Vec6) as [Ixx Iyy Izz Ixy Ixz Iyz] measured about the mass_center and not the body origin.-->
<inertia>0.000106086 0.000212172 0.0010608600000000001 0 0 0</inertia>
<inertia>0.000106086 0.001166946 0.0010608600000000001 0 0 0</inertia>
</Body>
<Body name="torso">
<!--The geometry used to display the axes of this Frame.-->
Expand Down
Loading

0 comments on commit c2a5b1c

Please sign in to comment.