Skip to content

Commit f6048a1

Browse files
committed
Change all instances of taking argument "const Eigen::VectorXd &" to "const ConstVectorRef&"
1 parent 4674fe9 commit f6048a1

File tree

11 files changed

+40
-43
lines changed

11 files changed

+40
-43
lines changed

include/simple-mpc/centroidal-dynamics.hpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,13 @@ namespace simple_mpc
9090

9191
// Getters and setters for contact forces
9292
void setReferenceForces(const std::size_t t, const std::map<std::string, Eigen::VectorXd> & force_refs) override;
93-
void
94-
setReferenceForce(const std::size_t t, const std::string & ee_name, const Eigen::VectorXd & force_ref) override;
93+
void setReferenceForce(const std::size_t t, const std::string & ee_name, const ConstVectorRef & force_ref) override;
9594
const Eigen::VectorXd getReferenceForce(const std::size_t t, const std::string & ee_name) override;
9695
void computeControlFromForces(const std::map<std::string, Eigen::VectorXd> & force_refs);
9796
const Eigen::VectorXd getVelocityBase(const std::size_t t) override;
98-
void setVelocityBase(const std::size_t t, const Eigen::VectorXd & velocity_base) override;
97+
void setVelocityBase(const std::size_t t, const ConstVectorRef & velocity_base) override;
9998
const Eigen::VectorXd getPoseBase(const std::size_t t) override;
100-
void setPoseBase(const std::size_t t, const Eigen::VectorXd & pose_base) override;
99+
void setPoseBase(const std::size_t t, const ConstVectorRef & pose_base) override;
101100
const Eigen::VectorXd getProblemState() override;
102101
size_t getContactSupport(const std::size_t t) override;
103102

include/simple-mpc/fulldynamics.hpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,13 @@ namespace simple_mpc
9595
void setReferencePoses(const std::size_t t, const std::map<std::string, pinocchio::SE3> & pose_refs) override;
9696
void setTerminalReferencePose(const std::string & ee_name, const pinocchio::SE3 & pose_ref) override;
9797
void setReferenceForces(const std::size_t t, const std::map<std::string, Eigen::VectorXd> & force_refs) override;
98-
void
99-
setReferenceForce(const std::size_t t, const std::string & ee_name, const Eigen::VectorXd & force_ref) override;
98+
void setReferenceForce(const std::size_t t, const std::string & ee_name, const ConstVectorRef & force_ref) override;
10099
const pinocchio::SE3 getReferencePose(const std::size_t t, const std::string & cost_name) override;
101100
const Eigen::VectorXd getReferenceForce(const std::size_t t, const std::string & cost_name) override;
102101
const Eigen::VectorXd getVelocityBase(const std::size_t t) override;
103-
void setVelocityBase(const std::size_t t, const Eigen::VectorXd & velocity_base) override;
102+
void setVelocityBase(const std::size_t t, const ConstVectorRef & velocity_base) override;
104103
const Eigen::VectorXd getPoseBase(const std::size_t t) override;
105-
void setPoseBase(const std::size_t t, const Eigen::VectorXd & pose_base) override;
104+
void setPoseBase(const std::size_t t, const ConstVectorRef & pose_base) override;
106105
const Eigen::VectorXd getProblemState() override;
107106
size_t getContactSupport(const std::size_t t) override;
108107
FullDynamicsSettings getSettings()

include/simple-mpc/kinodynamics.hpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,13 @@ namespace simple_mpc
8383
void setReferencePoses(const std::size_t i, const std::map<std::string, pinocchio::SE3> & pose_refs) override;
8484
void setTerminalReferencePose(const std::string & ee_name, const pinocchio::SE3 & pose_ref) override;
8585
void setReferenceForces(const std::size_t i, const std::map<std::string, Eigen::VectorXd> & force_refs) override;
86-
void
87-
setReferenceForce(const std::size_t i, const std::string & ee_name, const Eigen::VectorXd & force_ref) override;
86+
void setReferenceForce(const std::size_t i, const std::string & ee_name, const ConstVectorRef & force_ref) override;
8887
const Eigen::VectorXd getReferenceForce(const std::size_t i, const std::string & cost_name) override;
8988
const pinocchio::SE3 getReferencePose(const std::size_t i, const std::string & cost_name) override;
9089
const Eigen::VectorXd getVelocityBase(const std::size_t t) override;
9190
const Eigen::VectorXd getPoseBase(const std::size_t t) override;
92-
void setPoseBase(const std::size_t t, const Eigen::VectorXd & pose_base) override;
93-
void setVelocityBase(const std::size_t t, const Eigen::VectorXd & velocity_base) override;
91+
void setPoseBase(const std::size_t t, const ConstVectorRef & pose_base) override;
92+
void setVelocityBase(const std::size_t t, const ConstVectorRef & velocity_base) override;
9493
const Eigen::VectorXd getProblemState() override;
9594
size_t getContactSupport(const std::size_t t) override;
9695

include/simple-mpc/ocp-handler.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,16 @@ namespace simple_mpc
8282

8383
// Setter and getter for base velocity
8484
virtual const Eigen::VectorXd getVelocityBase(const std::size_t t) = 0;
85-
virtual void setVelocityBase(const std::size_t t, const Eigen::VectorXd & velocity_base) = 0;
85+
virtual void setVelocityBase(const std::size_t t, const ConstVectorRef & velocity_base) = 0;
8686

8787
// Setter and getter for base pose
8888
virtual const Eigen::VectorXd getPoseBase(const std::size_t t) = 0;
89-
virtual void setPoseBase(const std::size_t t, const Eigen::VectorXd & pose_base) = 0;
89+
virtual void setPoseBase(const std::size_t t, const ConstVectorRef & pose_base) = 0;
9090

9191
// Setter and getter for forces reference
9292
virtual void setReferenceForces(const std::size_t t, const std::map<std::string, Eigen::VectorXd> & force_refs) = 0;
9393
virtual void
94-
setReferenceForce(const std::size_t t, const std::string & ee_name, const Eigen::VectorXd & force_ref) = 0;
94+
setReferenceForce(const std::size_t t, const std::string & ee_name, const ConstVectorRef & force_ref) = 0;
9595
virtual const Eigen::VectorXd getReferenceForce(const std::size_t t, const std::string & ee_name) = 0;
9696
virtual const Eigen::VectorXd getProblemState() = 0;
9797
virtual size_t getContactSupport(const std::size_t t) = 0;
@@ -100,14 +100,14 @@ namespace simple_mpc
100100

101101
// Create one TrajOptProblem from contact sequence
102102
void createProblem(
103-
const Eigen::VectorXd & x0,
103+
const ConstVectorRef & x0,
104104
const size_t horizon,
105105
const int force_size,
106106
const double gravity,
107107
const bool terminal_constraint);
108108

109109
// Setter and getter for control reference
110-
void setReferenceControl(const std::size_t t, const Eigen::VectorXd & u_ref);
110+
void setReferenceControl(const std::size_t t, const ConstVectorRef & u_ref);
111111
ConstVectorRef getReferenceControl(const std::size_t t);
112112

113113
// Getter for various objects and quantities

include/simple-mpc/python/py-ocp-handler.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ namespace simple_mpc
125125
}
126126

127127
void
128-
setReferenceForce(const std::size_t t, const std::string & ee_name, const Eigen::VectorXd & force_ref) override
128+
setReferenceForce(const std::size_t t, const std::string & ee_name, const ConstVectorRef & force_ref) override
129129
{
130130
SIMPLE_MPC_PYTHON_OVERRIDE_PURE(void, "setReferenceForce", t, ee_name, force_ref);
131131
}
@@ -135,7 +135,7 @@ namespace simple_mpc
135135
SIMPLE_MPC_PYTHON_OVERRIDE_PURE(Eigen::VectorXd, "getReferenceForce", t, ee_name);
136136
}
137137

138-
void setVelocityBase(const std::size_t t, const Eigen::VectorXd & velocity_base) override
138+
void setVelocityBase(const std::size_t t, const ConstVectorRef & velocity_base) override
139139
{
140140
SIMPLE_MPC_PYTHON_OVERRIDE_PURE(void, "setVelocityBase", t, velocity_base);
141141
}
@@ -145,7 +145,7 @@ namespace simple_mpc
145145
SIMPLE_MPC_PYTHON_OVERRIDE_PURE(Eigen::VectorXd, "getVelocityBase", t);
146146
}
147147

148-
void setPoseBase(const std::size_t t, const Eigen::VectorXd & pose_base) override
148+
void setPoseBase(const std::size_t t, const ConstVectorRef & pose_base) override
149149
{
150150
SIMPLE_MPC_PYTHON_OVERRIDE_PURE(void, "setPoseBase", t, pose_base);
151151
}
@@ -165,7 +165,7 @@ namespace simple_mpc
165165
SIMPLE_MPC_PYTHON_OVERRIDE_PURE(std::size_t, "getContactSupport", t);
166166
}
167167

168-
void setReferenceControl(const std::size_t t, const Eigen::VectorXd & u_ref)
168+
void setReferenceControl(const std::size_t t, const ConstVectorRef & u_ref)
169169
{
170170
SIMPLE_MPC_PYTHON_OVERRIDE(void, OCPHandler, setReferenceControl, t, u_ref);
171171
}

include/simple-mpc/robot-handler.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ namespace simple_mpc
111111
* @return Eigen::VectorXd The vector that must be integrated during a unit of
112112
* time to go from x1 to x2.
113113
*/
114-
Eigen::VectorXd difference(const Eigen::VectorXd & x1, const Eigen::VectorXd & x2) const;
114+
Eigen::VectorXd difference(const ConstVectorRef & x1, const ConstVectorRef & x2) const;
115115

116116
/**
117117
* @brief Compute reduced state from measures by concatenating q,v of the
@@ -121,10 +121,10 @@ namespace simple_mpc
121121
* @param v Velocity vector of the full model
122122
* @return const Eigen::VectorXd State vector of the reduced model.
123123
*/
124-
Eigen::VectorXd shapeState(const Eigen::VectorXd & q, const Eigen::VectorXd & v) const;
124+
Eigen::VectorXd shapeState(const ConstVectorRef & q, const ConstVectorRef & v) const;
125125

126126
// Const getters
127-
const Eigen::VectorXd & getReferenceState() const
127+
const ConstVectorRef & getReferenceState() const
128128
{
129129
return reference_state_;
130130
}
@@ -195,8 +195,8 @@ namespace simple_mpc
195195
RobotDataHandler(const RobotModelHandler & model_handler);
196196

197197
// Set new robot state
198-
void updateInternalData(const Eigen::VectorXd & x, const bool updateJacobians);
199-
void updateJacobiansMassMatrix(const Eigen::VectorXd & x);
198+
void updateInternalData(const ConstVectorRef & x, const bool updateJacobians);
199+
void updateJacobiansMassMatrix(const ConstVectorRef & x);
200200

201201
// Const getters
202202
const SE3 & getRefFootPose(const std::string & foot_name) const

src/centroidal-dynamics.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ namespace simple_mpc
190190
}
191191

192192
void
193-
CentroidalOCP::setReferenceForce(const std::size_t t, const std::string & ee_name, const Eigen::VectorXd & force_ref)
193+
CentroidalOCP::setReferenceForce(const std::size_t t, const std::string & ee_name, const ConstVectorRef & force_ref)
194194
{
195195
std::vector<std::string> hname = model_handler_.getFeetNames();
196196
std::vector<std::string>::iterator it = std::find(hname.begin(), hname.end(), ee_name);
@@ -224,7 +224,7 @@ namespace simple_mpc
224224
return v;
225225
}
226226

227-
void CentroidalOCP::setVelocityBase(const std::size_t t, const Eigen::VectorXd & velocity_base)
227+
void CentroidalOCP::setVelocityBase(const std::size_t t, const ConstVectorRef & velocity_base)
228228
{
229229
CostStack * cs = getCostStack(t);
230230
QuadraticResidualCost * qcm = cs->getComponent<QuadraticResidualCost>("linear_mom_cost");
@@ -245,7 +245,7 @@ namespace simple_mpc
245245
return cfr->getReference();
246246
}
247247

248-
void CentroidalOCP::setPoseBase(const std::size_t t, const Eigen::VectorXd & pose_base)
248+
void CentroidalOCP::setPoseBase(const std::size_t t, const ConstVectorRef & pose_base)
249249
{
250250
if (pose_base.size() != 7)
251251
{

src/fulldynamics.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,8 @@ namespace simple_mpc
290290
}
291291
}
292292

293-
void FullDynamicsOCP::setReferenceForce(
294-
const std::size_t i, const std::string & ee_name, const Eigen::VectorXd & force_ref)
293+
void
294+
FullDynamicsOCP::setReferenceForce(const std::size_t i, const std::string & ee_name, const ConstVectorRef & force_ref)
295295
{
296296
CostStack * cs = getCostStack(i);
297297
QuadraticResidualCost * qrc = cs->getComponent<QuadraticResidualCost>(ee_name + "_force_cost");
@@ -332,7 +332,7 @@ namespace simple_mpc
332332
return qc->getTarget().segment(nq_, 6);
333333
}
334334

335-
void FullDynamicsOCP::setVelocityBase(const std::size_t t, const Eigen::VectorXd & velocity_base)
335+
void FullDynamicsOCP::setVelocityBase(const std::size_t t, const ConstVectorRef & velocity_base)
336336
{
337337
if (velocity_base.size() != 6)
338338
{
@@ -351,7 +351,7 @@ namespace simple_mpc
351351
return qc->getTarget().head(7);
352352
};
353353

354-
void FullDynamicsOCP::setPoseBase(const std::size_t t, const Eigen::VectorXd & pose_base)
354+
void FullDynamicsOCP::setPoseBase(const std::size_t t, const ConstVectorRef & pose_base)
355355
{
356356
if (pose_base.size() != 7)
357357
{

src/kinodynamics.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,8 @@ namespace simple_mpc
247247
setReferenceControl(i, control_ref_);
248248
}
249249

250-
void KinodynamicsOCP::setReferenceForce(
251-
const std::size_t i, const std::string & ee_name, const Eigen::VectorXd & force_ref)
250+
void
251+
KinodynamicsOCP::setReferenceForce(const std::size_t i, const std::string & ee_name, const ConstVectorRef & force_ref)
252252
{
253253
std::vector<std::string> hname = model_handler_.getFeetNames();
254254
std::vector<std::string>::iterator it = std::find(hname.begin(), hname.end(), ee_name);
@@ -273,7 +273,7 @@ namespace simple_mpc
273273
return qc->getTarget().segment(nq_, 6);
274274
}
275275

276-
void KinodynamicsOCP::setVelocityBase(const std::size_t t, const Eigen::VectorXd & velocity_base)
276+
void KinodynamicsOCP::setVelocityBase(const std::size_t t, const ConstVectorRef & velocity_base)
277277
{
278278
if (velocity_base.size() != 6)
279279
{
@@ -292,7 +292,7 @@ namespace simple_mpc
292292
return qc->getTarget().head(7);
293293
};
294294

295-
void KinodynamicsOCP::setPoseBase(const std::size_t t, const Eigen::VectorXd & pose_base)
295+
void KinodynamicsOCP::setPoseBase(const std::size_t t, const ConstVectorRef & pose_base)
296296
{
297297
if (pose_base.size() != 7)
298298
{

src/ocp-handler.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ namespace simple_mpc
5656
return stage_models;
5757
}
5858

59-
void OCPHandler::setReferenceControl(const std::size_t t, const Eigen::VectorXd & u_ref)
59+
void OCPHandler::setReferenceControl(const std::size_t t, const ConstVectorRef & u_ref)
6060
{
6161
CostStack * cs = getCostStack(t);
6262
QuadraticControlCost * qc = cs->getComponent<QuadraticControlCost>("control_cost");
@@ -95,7 +95,7 @@ namespace simple_mpc
9595
}
9696

9797
void OCPHandler::createProblem(
98-
const Eigen::VectorXd & x0,
98+
const ConstVectorRef & x0,
9999
const size_t horizon,
100100
const int force_size,
101101
const double gravity,

0 commit comments

Comments
 (0)