Skip to content

Commit c7ad372

Browse files
RobSalatiRobSalati
authored
Merge pull request #9 from rcnl-org/candidate
v1.5.0
2 parents 81063be + 10213c7 commit c7ad372

File tree

93 files changed

+5935
-1781
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+5935
-1781
lines changed

Step-1-Joint-Model-Personalization/CompletedSettingsFiles/JMPSettingsV1.xml renamed to Step-1-Joint-Model-Personalization/CompletedSettingsFiles/JMPSettingsSequential.xml

Lines changed: 13 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
1-
<NMSMPipelineDocument Version="1.4.0">
1+
<NMSMPipelineDocument Version="1.5.0">
22
<JointModelPersonalizationTool name="default">
33
<!--Directory for input files.-->
44
<input_directory>.</input_directory>
55
<!--Name of file containing input model, if using the application this has no effect as current model is used.-->
66
<input_model_file>UF_Subject_3_Scaled.osim</input_model_file>
77
<!--Name of file containing output model after tool executaion.-->
8-
<output_model_file>UF_Subject_3_Scaled_JMPV1.osim</output_model_file>
8+
<output_model_file>UF_Subject_3_Scaled_Sequential.osim</output_model_file>
99
<!--The accuracy to compare against, depends on model/data units (0.01 == 1cm for data in units meters).-->
10-
<allowable_error>0.005</allowable_error>
10+
<allowable_error>0.01</allowable_error>
1111
<!--List of tasks to be completed by the tool, each Task is a separate optimization.-->
1212
<JMPTaskList>
1313
<JMPTask name="Scale Hips">
1414
<!--Indicate whether the task is enabled or not.-->
1515
<is_enabled>true</is_enabled>
1616
<!--Name of marker file with required data for this JointPersonalizationTask.-->
17-
<marker_file_name>MarkerFiles\GaitTrial_markers.trc</marker_file_name>
17+
<marker_file_name>MarkerFiles\BothHips_markers.trc</marker_file_name>
1818
<!--Order of the tasks to be completed-->
1919
<index>1</index>
2020
<!--Time range from marker file to be used to optimize joint personalization.-->
21-
<time_range>0 1.07</time_range>
22-
<marker_names>R_Thigh_Lateral R_Thigh_Superior R_Thigh_Inferior R_Asis L_Asis Sacral</marker_names>
21+
<time_range>0 10.41</time_range>
22+
<marker_names>R_Thigh_Lateral R_Thigh_Superior R_Thigh_Inferior L_Thigh_Lateral L_Thigh_Superior L_Thigh_Inferior R_Asis L_Asis Sacral</marker_names>
2323
<!--Bodies that will be optimized in this task.-->
2424
<JMPBodySet>
2525
<JMPBody name="pelvis">
2626
<!--Boolean value for whether the body, with task name, is to be scaled.-->
2727
<scale_body>true</scale_body>
2828
<!--Three boolean values (separated by spaces) for which axes the markers should be free to move in (x, y, z) order.-->
29-
<move_markers>false true true</move_markers>
29+
<move_markers>false false false</move_markers>
3030
</JMPBody>
3131
</JMPBodySet>
3232
</JMPTask>
3333
<JMPTask name="Right Knee">
3434
<!--Indicate whether the task is enabled or not.-->
3535
<is_enabled>true</is_enabled>
3636
<!--Name of marker file with required data for this JointPersonalizationTask.-->
37-
<marker_file_name>MarkerFiles\GaitTrial_markers.trc</marker_file_name>
37+
<marker_file_name>MarkerFiles\RightKnee_markers.trc</marker_file_name>
3838
<!--Order of the tasks to be completed-->
3939
<index>2</index>
4040
<!--Time range from marker file to be used to optimize joint personalization.-->
41-
<time_range>0 1.07</time_range>
41+
<time_range>0 1.64</time_range>
4242
<marker_names>R_Thigh_Lateral R_Thigh_Superior R_Thigh_Inferior R_Shank_Superior R_Shank_Inferior R_Shank_Lateral</marker_names>
4343
<!--Joints that will be optimized in this task.-->
4444
<JMPJointSet>
@@ -72,11 +72,11 @@
7272
<!--Indicate whether the task is enabled or not.-->
7373
<is_enabled>true</is_enabled>
7474
<!--Name of marker file with required data for this JointPersonalizationTask.-->
75-
<marker_file_name>MarkerFiles\GaitTrial_markers.trc</marker_file_name>
75+
<marker_file_name>MarkerFiles\RightAnkle_markers.trc</marker_file_name>
7676
<!--Order of the tasks to be completed-->
7777
<index>3</index>
7878
<!--Time range from marker file to be used to optimize joint personalization.-->
79-
<time_range>0 1.07</time_range>
79+
<time_range>0 2.64</time_range>
8080
<marker_names>R_Shank_Superior R_Shank_Inferior R_Shank_Lateral R_Heel R_Midfoot_Superior R_Midfoot_Lateral</marker_names>
8181
<!--Joints that will be optimized in this task.-->
8282
<JMPJointSet>
@@ -90,7 +90,7 @@
9090
<!--Translation bounds set the upper and lower limits of the search range around the initial value.-->
9191
<translation_bounds>0.050000000000000003</translation_bounds>
9292
<!--Orientation bounds set the upper and lower limits of the search range around the initial value.-->
93-
<orientation_bounds>0.1</orientation_bounds>
93+
<orientation_bounds>1</orientation_bounds>
9494
</parent_frame_transformation>
9595
<!--Joint Child Frame.-->
9696
<child_frame_transformation>
@@ -114,7 +114,7 @@
114114
<!--Translation bounds set the upper and lower limits of the search range around the initial value.-->
115115
<translation_bounds>0.050000000000000003</translation_bounds>
116116
<!--Orientation bounds set the upper and lower limits of the search range around the initial value.-->
117-
<orientation_bounds>0.5</orientation_bounds>
117+
<orientation_bounds>1</orientation_bounds>
118118
</parent_frame_transformation>
119119
<!--Joint Child Frame.-->
120120
<child_frame_transformation>
@@ -130,32 +130,6 @@
130130
</JMPJoint>
131131
</JMPJointSet>
132132
</JMPTask>
133-
<JMPTask name="Move markers">
134-
<!--Indicate whether the task is enabled or not.-->
135-
<is_enabled>true</is_enabled>
136-
<!--Name of marker file with required data for this JointPersonalizationTask.-->
137-
<marker_file_name>MarkerFiles\GaitTrial_markers.trc</marker_file_name>
138-
<!--Order of the tasks to be completed-->
139-
<index>4</index>
140-
<!--Time range from marker file to be used to optimize joint personalization.-->
141-
<time_range>0 1.07</time_range>
142-
<marker_names>R_Thigh_Lateral R_Thigh_Superior R_Thigh_Inferior R_Shank_Superior R_Shank_Inferior R_Shank_Lateral</marker_names>
143-
<!--Bodies that will be optimized in this task.-->
144-
<JMPBodySet>
145-
<JMPBody name="femur_r">
146-
<!--Boolean value for whether the body, with task name, is to be scaled.-->
147-
<scale_body>false</scale_body>
148-
<!--Three boolean values (separated by spaces) for which axes the markers should be free to move in (x, y, z) order.-->
149-
<move_markers>false true true</move_markers>
150-
</JMPBody>
151-
<JMPBody name="tibia_r">
152-
<!--Boolean value for whether the body, with task name, is to be scaled.-->
153-
<scale_body>false</scale_body>
154-
<!--Three boolean values (separated by spaces) for which axes the markers should be free to move in (x, y, z) order.-->
155-
<move_markers>false true true</move_markers>
156-
</JMPBody>
157-
</JMPBodySet>
158-
</JMPTask>
159133
</JMPTaskList>
160134
<!--*Optional* The accuracy of the IKSolver solution in absolute terms. Default is 1e-5. It determines the number of significant digits to which the solution can be trusted.-->
161135
<accuracy>9.9999999999999995e-07</accuracy>

Step-1-Joint-Model-Personalization/CompletedSettingsFiles/JMPSettingsV2.xml renamed to Step-1-Joint-Model-Personalization/CompletedSettingsFiles/JMPSettingsSimultaneous.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<NMSMPipelineDocument Version="1.4.0">
1+
<NMSMPipelineDocument Version="1.5.0">
22
<JointModelPersonalizationTool name="default">
33
<!--Directory for input files.-->
44
<input_directory>.</input_directory>
55
<!--Name of file containing input model, if using the application this has no effect as current model is used.-->
66
<input_model_file>UF_Subject_3_Scaled.osim</input_model_file>
77
<!--Name of file containing output model after tool executaion.-->
8-
<output_model_file>UF_Subject_3_Scaled_JMPV2.osim</output_model_file>
8+
<output_model_file>UF_Subject_3_Scaled_Simultaneous.osim</output_model_file>
99
<!--The accuracy to compare against, depends on model/data units (0.01 == 1cm for data in units meters).-->
1010
<allowable_error>0.01</allowable_error>
1111
<!--List of tasks to be completed by the tool, each Task is a separate optimization.-->
@@ -14,12 +14,12 @@
1414
<!--Indicate whether the task is enabled or not.-->
1515
<is_enabled>true</is_enabled>
1616
<!--Name of marker file with required data for this JointPersonalizationTask.-->
17-
<marker_file_name>MarkerFiles\AnkleKneeGaitConcatenated_markers.trc</marker_file_name>
17+
<marker_file_name>MarkerFiles\AnkleKneeHipGaitConcatenated_markers.trc</marker_file_name>
1818
<!--Order of the tasks to be completed-->
1919
<index>1</index>
2020
<marker_names>R_Asis L_Asis Sacral R_Thigh_Lateral R_Thigh_Superior R_Thigh_Inferior R_Shank_Superior R_Shank_Inferior R_Shank_Lateral R_Heel R_Midfoot_Superior R_Midfoot_Lateral</marker_names>
2121
<!--Time range from marker file to be used to optimize joint personalization.-->
22-
<time_range>0 3.02</time_range>
22+
<time_range>0 5.05</time_range>
2323
<!--Joints that will be optimized in this task.-->
2424
<JMPJointSet>
2525
<JMPJoint name="knee_r">
@@ -76,7 +76,7 @@
7676
<!--Three boolean values (separated by spaces) for if the joint translation parameter is to be optimized.-->
7777
<translation>false false false</translation>
7878
<!--Three boolean values (separated by spaces) for if the joint orientation parameter is to be optimized.-->
79-
<orientation>false true false</orientation>
79+
<orientation>false true true</orientation>
8080
<!--Translation bounds set the upper and lower limits of the search range around the initial value.-->
8181
<translation_bounds>0.050000000000000003</translation_bounds>
8282
<!--Orientation bounds set the upper and lower limits of the search range around the initial value.-->
@@ -87,7 +87,7 @@
8787
<!--Three boolean values (separated by spaces) for if the joint translation parameter is to be optimized.-->
8888
<translation>false false false</translation>
8989
<!--Three boolean values (separated by spaces) for if the joint orientation parameter is to be optimized.-->
90-
<orientation>false true false</orientation>
90+
<orientation>false true true</orientation>
9191
<!--Translation bounds set the upper and lower limits of the search range around the initial value.-->
9292
<translation_bounds>0.050000000000000003</translation_bounds>
9393
<!--Orientation bounds set the upper and lower limits of the search range around the initial value.-->
@@ -101,19 +101,19 @@
101101
<!--Boolean value for whether the body, with task name, is to be scaled.-->
102102
<scale_body>true</scale_body>
103103
<!--Three boolean values (separated by spaces) for which axes the markers should be free to move in (x, y, z) order.-->
104-
<move_markers>false true true</move_markers>
104+
<move_markers>false false false</move_markers>
105105
</JMPBody>
106106
<JMPBody name="femur_r">
107107
<!--Boolean value for whether the body, with task name, is to be scaled.-->
108108
<scale_body>false</scale_body>
109109
<!--Three boolean values (separated by spaces) for which axes the markers should be free to move in (x, y, z) order.-->
110-
<move_markers>false true true</move_markers>
110+
<move_markers>true true false</move_markers>
111111
</JMPBody>
112112
<JMPBody name="tibia_r">
113113
<!--Boolean value for whether the body, with task name, is to be scaled.-->
114114
<scale_body>false</scale_body>
115115
<!--Three boolean values (separated by spaces) for which axes the markers should be free to move in (x, y, z) order.-->
116-
<move_markers>false true true</move_markers>
116+
<move_markers>true true false</move_markers>
117117
</JMPBody>
118118
</JMPBodySet>
119119
</JMPTask>

0 commit comments

Comments
 (0)