Skip to content
Snippets Groups Projects
Commit 5d101769 authored by Ale's avatar Ale
Browse files

working on walking (very stiff)

parent a1faec35
No related branches found
No related tags found
1 merge request!32Draft: Reverse-merge casadi-walking into new WBC devel branch
...@@ -126,7 +126,7 @@ class CasadiOCP: ...@@ -126,7 +126,7 @@ class CasadiOCP:
eq.append(self.runningModels[t].constraint_dynamics_eq()) eq.append(self.runningModels[t].constraint_dynamics_eq())
eq.append(self.runningModels[t].difference(self.xs[t + 1], xnext) - np.zeros(self.pd.ndx)) eq.append(self.runningModels[t].difference(self.xs[t + 1], xnext) - np.zeros(self.pd.ndx))
#ineq.append(self.runningModels[t].constraint_swing_feet_ineq(self.pd.xref, k = self.pd.k)) ineq.append(self.runningModels[t].constraint_swing_feet_ineq(self.pd.xref, k = self.pd.k))
ineq.append(self.runningModels[t].constraint_standing_feet_ineq()) ineq.append(self.runningModels[t].constraint_standing_feet_ineq())
totalcost += rcost totalcost += rcost
......
...@@ -74,7 +74,7 @@ class ProblemData(problemDataAbstract): ...@@ -74,7 +74,7 @@ class ProblemData(problemDataAbstract):
self.mu = 0.7 self.mu = 0.7
self.friction_cone_w = 1e3 self.friction_cone_w = 1e3
#self.control_bound_w = 1e3 #self.control_bound_w = 1e3
self.control_reg_w = 1e0 * 0 self.control_reg_w = 1e1
self.state_reg_w = np.array([0] * 3 \ self.state_reg_w = np.array([0] * 3 \
+ [1e0] * 3 \ + [1e0] * 3 \
+ [1e1] * 12 \ + [1e1] * 12 \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment