Skip to content

Commit

Permalink
fixing submodule path
Browse files Browse the repository at this point in the history
  • Loading branch information
Kevin CO committed Jul 15, 2024
1 parent 973ad81 commit ce45bf4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
[submodule "external/bioptim"]
path = external/bioptim
url = https://github.com/Kev1CO/bioptim
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@
fes_muscle_models[i].a_scale = fes_muscle_models[i].a_scale * a_scale_proportion_list[i]

minimum_pulse_duration = DingModelPulseDurationFrequencyWithFatigue().pd0
pickle_file_list = ["minimize_muscle_fatigue.pkl", "minimize_muscle_force.pkl"]
# pickle_file_list = ["minimize_muscle_fatigue.pkl", "minimize_muscle_force.pkl"]
pickle_file_list = ["minimize_muscle_fatigue.pkl"]
n_stim = 60
n_shooting = 25
# Step time of 1ms -> 1sec / (40Hz * 25) = 0.001s
Expand Down
4 changes: 0 additions & 4 deletions cocofest/optimization/fes_ocp_dynamics.py
Original file line number Diff line number Diff line change
Expand Up @@ -753,10 +753,8 @@ def _set_objective(
)

if minimize_muscle_fatigue:
# for i in range(n_stim):
objective_functions.add(
CustomObjective.minimize_overall_muscle_fatigue,
# custom_type=ObjectiveFcn.Lagrange,
custom_type=ObjectiveFcn.Mayer,
node=Node.END,
quadratic=True,
Expand All @@ -769,8 +767,6 @@ def _set_objective(
objective_functions.add(
CustomObjective.minimize_overall_muscle_force_production,
custom_type=ObjectiveFcn.Lagrange,
# custom_type=ObjectiveFcn.Mayer,
# node=Node.ALL,
quadratic=True,
weight=1,
phase=i,
Expand Down

0 comments on commit ce45bf4

Please sign in to comment.