Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Triangle Inequality Fix #183

Merged
merged 1 commit into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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