Skip to content

Commit d85bd07

Browse files
committed
core: Try to fix MSVC build issue
Remove `using namespace internal` to fix the following error: ``` ..\include\pinocchio/algorithm/delassus-operator-base.hpp(130): error C2872: 'traits': ambiguous symbol ..\include\pinocchio/fwd.hpp(89): note: could be 'pinocchio::traits' ..\include\pinocchio/fwd.hpp(101): note: or 'pinocchio::internal::traits' ... ..\include\pinocchio/algorithm/admm-solver.hxx(350): note: see reference to class template instantiation ```
1 parent 631f019 commit d85bd07

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

include/pinocchio/algorithm/admm-solver.hxx

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ namespace pinocchio
192192
// Unused for now
193193
PINOCCHIO_UNUSED_VARIABLE(dual_guess);
194194

195-
using namespace internal;
196195
typedef ADMMSpectralUpdateRuleTpl<Scalar> ADMMSpectralUpdateRule;
197196
typedef ADMMLinearUpdateRuleTpl<Scalar> ADMMLinearUpdateRule;
198197

@@ -236,9 +235,9 @@ namespace pinocchio
236235
// -> time_scaling_constraints_to_pos similarly allows to go from the units of the constraints
237236
// to positions in m. Warning: this constraints time-scaling has (a priori) nothing to do with
238237
// the pre-conditioner.
239-
getTimeScalingFromAccelerationToConstraints(
238+
internal::getTimeScalingFromAccelerationToConstraints(
240239
constraint_models, dt, time_scaling_acc_to_constraints);
241-
getTimeScalingFromConstraintsToPosition(
240+
internal::getTimeScalingFromConstraintsToPosition(
242241
time_scaling_acc_to_constraints, dt, time_scaling_constraints_to_pos);
243242
gs = g.array() / time_scaling_acc_to_constraints.array();
244243
const Scalar g_pos_norm_inf =
@@ -276,15 +275,15 @@ namespace pinocchio
276275
}
277276

278277
// Init y
279-
computeConeProjection(constraint_models, x_, y_);
278+
internal::computeConeProjection(constraint_models, x_, y_);
280279

281280
// Init z -> z_ = (G + R) * y_ + g
282281
delassus.applyOnTheRight(y_, z_);
283282
z_ += gs;
284283
z_ -= y_.cwiseProduct(delassus.getDamping());
285284
if (solve_ncp)
286285
{
287-
computeDeSaxeCorrection(constraint_models, z_, s_);
286+
internal::computeDeSaxeCorrection(constraint_models, z_, s_);
288287
z_ += s_; // Add De Saxé shift
289288
}
290289

@@ -296,11 +295,11 @@ namespace pinocchio
296295
// constraint formulation level.
297296
rhs =
298297
z_.array() * time_scaling_acc_to_constraints.array(); // back to constraint formulation level
299-
complementarity = computeConicComplementarity(constraint_models, rhs, y_);
298+
complementarity = internal::computeConicComplementarity(constraint_models, rhs, y_);
300299

301300
// dual feasibility is computed in "position" on the z_ variable (and not on z_bar_).
302301
dual_feasibility_vector = rhs;
303-
computeDualConeProjection(constraint_models, rhs, rhs);
302+
internal::computeDualConeProjection(constraint_models, rhs, rhs);
304303
dual_feasibility_vector -= rhs;
305304
dual_feasibility = dual_feasibility_vector.template lpNorm<Eigen::Infinity>();
306305
const Scalar absolute_residual_warm_start = math::max(complementarity, dual_feasibility);
@@ -329,13 +328,13 @@ namespace pinocchio
329328
{
330329
PINOCCHIO_TRACY_ZONE_SCOPED_N(
331330
"ADMMContactSolverTpl::solve - second computeDeSaxeCorrection");
332-
computeDeSaxeCorrection(constraint_models, z_, s_);
331+
internal::computeDeSaxeCorrection(constraint_models, z_, s_);
333332
}
334333
z_ += s_; // Add De Saxé shift
335334
}
336335
rhs = z_.array() * time_scaling_acc_to_constraints.array();
337336
dual_feasibility_vector = rhs;
338-
computeDualConeProjection(constraint_models, rhs, rhs);
337+
internal::computeDualConeProjection(constraint_models, rhs, rhs);
339338
dual_feasibility_vector -= rhs; // Dual feasibility vector for the new null guess
340339
dual_feasibility_vector.array() *= time_scaling_constraints_to_pos.array();
341340
// We set the new convergence criterion
@@ -449,7 +448,7 @@ namespace pinocchio
449448
if (solve_ncp)
450449
{
451450
// s-update
452-
computeDeSaxeCorrection(constraint_models, z_bar_, s_bar_);
451+
internal::computeDeSaxeCorrection(constraint_models, z_bar_, s_bar_);
453452
}
454453

455454
// x-update
@@ -459,7 +458,8 @@ namespace pinocchio
459458

460459
// y-update
461460
rhs -= z_bar_ / (tau * rho);
462-
computeScaledConeProjection(constraint_models, rhs, preconditioner_.getDiagonal(), y_bar_);
461+
internal::computeScaledConeProjection(
462+
constraint_models, rhs, preconditioner_.getDiagonal(), y_bar_);
463463

464464
// z-update
465465
z_bar_ -= (tau * rho) * (x_bar_ - y_bar_);
@@ -505,7 +505,7 @@ namespace pinocchio
505505
unscalePrimalSolution(y_bar_, y_);
506506
unscaleDualSolution(z_bar_, z_);
507507
rhs = z_.array() * time_scaling_acc_to_constraints.array();
508-
complementarity = computeConicComplementarity(constraint_models, rhs, y_);
508+
complementarity = internal::computeConicComplementarity(constraint_models, rhs, y_);
509509

510510
if (stat_record)
511511
{
@@ -515,7 +515,7 @@ namespace pinocchio
515515
unscaleDualSolution(rhs, tmp);
516516
if (solve_ncp)
517517
{
518-
computeDeSaxeCorrection(constraint_models, tmp, rhs);
518+
internal::computeDeSaxeCorrection(constraint_models, tmp, rhs);
519519
tmp += rhs;
520520
}
521521

0 commit comments

Comments
 (0)