Skip to content

Minor updates to metabolic example package #105

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Nov 11, 2018
Merged

Minor updates to metabolic example package #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6020b7d
minimum set of updates to get current example working
jimmyDunne Nov 11, 2018
4da639c
Fix indentation.
chrisdembia Nov 11, 2018
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
16 changes: 12 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,21 @@ install(FILES Models/BouncingBlock/run_forward_bouncingBlock.xml

install(FILES Models/Gait10dof18musc/gait10dof18musc.osim
Models/Gait10dof18musc/subject01.osim
Models/Gait10dof18musc/subject01_metabolics.osim
Models/Gait10dof18musc/subject01_metabolics_path_spring.osim
Models/Gait10dof18musc/subject01_metabolics_path_actuator.osim
Tutorials/Design_to_Reduce_Metabolic_Cost/ExperimentalData/subject01_static.trc
Tutorials/Design_to_Reduce_Metabolic_Cost/ExperimentalData/subject01_walk.trc
Tutorials/Design_to_Reduce_Metabolic_Cost/ExperimentalData/subject01_walk_grf.mot
Tutorials/Design_to_Reduce_Metabolic_Cost/ExperimentalData/subject01_walk_grf.xml
Tutorials/Design_to_Reduce_Metabolic_Cost/CMC/walk_Setup_CMC.xml
Tutorials/Design_to_Reduce_Metabolic_Cost/CMC/walk_Setup_CMC_PathActuator.xml
DESTINATION Models/Gait10dof18musc)
# TODO subject01_metabolics* files?
install(DIRECTORY Pipelines/Gait10dof18musc/
install(DIRECTORY Tutorials/Design_to_Reduce_Metabolic_Cost/
DESTINATION Models/Gait10dof18musc
PATTERN "CMC/ResultsCMC_*" EXCLUDE
PATTERN "CMC/controls_43p_r.xml" EXCLUDE
PATTERN "CMC/*.osim" EXCLUDE)
PATTERN "CMC/walk_Setup_CMC*" EXCLUDE
PATTERN "ExperimentalData" EXCLUDE)

install(FILES Models/Gait2354_Simbody/gait2354_simbody.osim
DESTINATION Models/Gait2354_Simbody)
Expand Down
0 ...t/gait10dof_Kinematics_Tracking_Tasks.xml → ...C/gait10dof_Kinematics_Tracking_Tasks.xml
View file
Open in desktop
File renamed without changes.
0 ...olic_Cost/gait10dof_Reserve_Actuators.xml → ..._Cost/CMC/gait10dof_Reserve_Actuators.xml
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions Tutorials/Design_to_Reduce_Metabolic_Cost/CMC/walk_Setup_CMC.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<!--Replace the model's force set with sets specified in <force_set_files>? If false, the force set is appended to.-->
<replace_force_set>false</replace_force_set>
<!--List of xml files used to construct an force set for the model.-->
<force_set_files>../gait10dof_Reserve_Actuators.xml</force_set_files>
<force_set_files>CMC/gait10dof_Reserve_Actuators.xml</force_set_files>
<!--Directory used for writing results.-->
<results_directory>ResultsCMC</results_directory>
<results_directory>CMC/ResultsCMC</results_directory>
<!--Output precision. It is 8 by default.-->
<output_precision>8</output_precision>
<!--Initial time for the simulation.-->
Expand Down Expand Up @@ -40,13 +40,13 @@
<groups />
</ControllerSet>
<!--XML file (.xml) containing the forces applied to the model as ExternalLoads.-->
<external_loads_file>../ExperimentalData/subject01_walk_grf.xml</external_loads_file>
<external_loads_file>subject01_walk_grf.xml</external_loads_file>
<!--Motion (.mot) or storage (.sto) file containing the desired point trajectories.-->
<desired_points_file />
<!--Motion (.mot) or storage (.sto) file containing the desired kinematic trajectories.-->
<desired_kinematics_file>../RRA/ResultsRRA/subject_adjusted_Kinematics_q.sto</desired_kinematics_file>
<desired_kinematics_file>RRA/ResultsRRA/subject_adjusted_Kinematics_q.sto</desired_kinematics_file>
<!--File containing the tracking tasks. Which coordinates are tracked and with what weights are specified here.-->
<task_set_file>../gait10dof_Kinematics_Tracking_Tasks.xml</task_set_file>
<task_set_file>CMC/gait10dof_Kinematics_Tracking_Tasks.xml</task_set_file>
<!--File containing the constraints on the controls.-->
<constraints_file />
<!--File containing the controls output by RRA. These can be used to place constraints on the residuals during CMC.-->
Expand Down
12 changes: 6 additions & 6 deletions Tutorials/Design_to_Reduce_Metabolic_Cost/CMC/walk_Setup_CMC_PathActuator.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<!--Replace the model's force set with sets specified in <force_set_files>? If false, the force set is appended to.-->
<replace_force_set>false</replace_force_set>
<!--List of xml files used to construct an force set for the model.-->
<force_set_files>../gait10dof_Reserve_Actuators.xml</force_set_files>
<force_set_files>CMC/gait10dof_Reserve_Actuators.xml</force_set_files>
<!--Directory used for writing results.-->
<results_directory>ResultsCMC</results_directory>
<results_directory>CMC/ResultsCMC</results_directory>
<!--Output precision. It is 8 by default.-->
<output_precision>8</output_precision>
<!--Initial time for the simulation.-->
Expand Down Expand Up @@ -40,15 +40,15 @@
<groups />
</ControllerSet>
<!--XML file (.xml) containing the forces applied to the model as ExternalLoads.-->
<external_loads_file>../ExperimentalData/subject01_walk_grf.xml</external_loads_file>
<external_loads_file>subject01_walk_grf.xml</external_loads_file>
<!--Motion (.mot) or storage (.sto) file containing the desired point trajectories.-->
<desired_points_file />
<!--Motion (.mot) or storage (.sto) file containing the desired kinematic trajectories.-->
<desired_kinematics_file>../RRA/ResultsRRA/subject_adjusted_Kinematics_q.sto</desired_kinematics_file>
<desired_kinematics_file>RRA/ResultsRRA/subject_adjusted_Kinematics_q.sto</desired_kinematics_file>
<!--File containing the tracking tasks. Which coordinates are tracked and with what weights are specified here.-->
<task_set_file>../gait10dof_Kinematics_Tracking_Tasks.xml</task_set_file>
<task_set_file>CMC/gait10dof_Kinematics_Tracking_Tasks.xml</task_set_file>
<!--File containing the constraints on the controls.-->
<constraints_file>controls_43p_r.xml</constraints_file>
<constraints_file>CMC/controls_43p_r.xml</constraints_file>
<!--File containing the controls output by RRA. These can be used to place constraints on the residuals during CMC.-->
<rra_controls_file />
<!--Low-pass cut-off frequency for filtering the desired kinematics. A negative value results in no filtering. The default value is -1.0, so no filtering.-->
Expand Down