Skip to content

Commit 152e379

Browse files
authored
Merge pull request #259 from humanoid-path-planner/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2 parents 985e0eb + 24591e7 commit 152e379

File tree

4 files changed

+34
-32
lines changed

4 files changed

+34
-32
lines changed

.pre-commit-config.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ci:
22
autoupdate_branch: devel
33
repos:
44
- repo: https://github.com/astral-sh/ruff-pre-commit
5-
rev: v0.9.10
5+
rev: v0.11.6
66
hooks:
77
- id: ruff
88
args:
@@ -19,7 +19,7 @@ repos:
1919
- id: toml-sort-fix
2020
exclude: poetry.lock
2121
- repo: https://github.com/pre-commit/mirrors-clang-format
22-
rev: v19.1.7
22+
rev: v20.1.0
2323
hooks:
2424
- id: clang-format
2525
args:

include/hpp/corbaserver/servant-base.hh

+10-11
Original file line numberDiff line numberDiff line change
@@ -484,17 +484,16 @@ struct vectorToSeqServant {
484484
/// // PathVector directly inherits from Path
485485
/// HPP_CORBASERVER_ADD_DOWNCAST_OBJECT(PathVector, Path, 1)
486486
/// \endcode
487-
#define HPP_CORBASERVER_ADD_DOWNCAST_OBJECT(ServantType, BaseServantType, \
488-
depth) \
489-
struct HPP_CORE_DLLAPI __InitializerClass_##ServantType{ \
490-
__InitializerClass_##ServantType(){ \
491-
::hpp::corbaServer::addDowncastObjects<BaseServantType>( \
492-
new ::hpp::corbaServer::ServantFactory<BaseServantType, \
493-
ServantType>(depth)); \
494-
} \
495-
} \
496-
; \
497-
HPP_CORBASERVER_DLLLOCAL __InitializerClass_##ServantType \
487+
#define HPP_CORBASERVER_ADD_DOWNCAST_OBJECT(ServantType, BaseServantType, \
488+
depth) \
489+
struct HPP_CORE_DLLAPI __InitializerClass_##ServantType { \
490+
__InitializerClass_##ServantType() { \
491+
::hpp::corbaServer::addDowncastObjects<BaseServantType>( \
492+
new ::hpp::corbaServer::ServantFactory<BaseServantType, \
493+
ServantType>(depth)); \
494+
} \
495+
}; \
496+
HPP_CORBASERVER_DLLLOCAL __InitializerClass_##ServantType \
498497
__instance_##ServantType;
499498

500499
#endif // HPP_CORBASERVER_SERVANT_BASE_HH

src/hpp/corbaserver/ompl_benchmark_statistics.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ def plotAttribute(cur, planners, attribute, typename):
443443
measurements[i],
444444
width,
445445
bottom=heights[0],
446-
color=matplotlib.cm.hot(int(floor(i * 256 / numValues))),
446+
color=matplotlib.cm.hot(floor(i * 256 / numValues)),
447447
label=descriptions[i],
448448
)
449449
heights = heights + measurements[i]

src/problem.impl.cc

+21-18
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,12 @@ DifferentiableFunctionPtr_t buildGenericFunc(
163163

164164
if (relative) {
165165
// Both joints are provided
166-
return constraints::GenericTransformation < PositionOrientationFlag |
167-
constraints::RelativeBit >
168-
::create(name, robot, joint1, joint2, ref1, ref2, mask);
166+
return constraints::GenericTransformation<
167+
PositionOrientationFlag | constraints::RelativeBit>::create(name, robot,
168+
joint1,
169+
joint2,
170+
ref1, ref2,
171+
mask);
169172
} else {
170173
return constraints::GenericTransformation<PositionOrientationFlag>::create(
171174
name, robot, joint2, ref2, ref1, mask);
@@ -578,10 +581,10 @@ void Problem::createTransformationConstraint(const char* constraintName,
578581
Transform3s ref(toTransform3s(p));
579582
std::string name(constraintName);
580583
DifferentiableFunctionPtr_t func =
581-
buildGenericFunc < constraints::PositionBit |
582-
constraints::OrientationBit > (problemSolver()->robot(), name,
583-
joint1Name, joint2Name, ref, Id,
584-
boolSeqToVector(mask, 6));
584+
buildGenericFunc<constraints::PositionBit |
585+
constraints::OrientationBit>(
586+
problemSolver()->robot(), name, joint1Name, joint2Name, ref, Id,
587+
boolSeqToVector(mask, 6));
585588

586589
problemSolver()->addNumericalConstraint(
587590
name,
@@ -603,11 +606,11 @@ void Problem::createTransformationConstraint2(const char* constraintName,
603606
if (!problemSolver()->robot()) throw hpp::Error("No robot loaded");
604607
std::string name(constraintName);
605608
DifferentiableFunctionPtr_t func =
606-
buildGenericFunc < constraints::PositionBit |
607-
constraints::OrientationBit >
608-
(problemSolver()->robot(), name, joint1Name, joint2Name,
609-
toTransform3s(frame1), toTransform3s(frame2),
610-
boolSeqToVector(mask, 6));
609+
buildGenericFunc<constraints::PositionBit |
610+
constraints::OrientationBit>(
611+
problemSolver()->robot(), name, joint1Name, joint2Name,
612+
toTransform3s(frame1), toTransform3s(frame2),
613+
boolSeqToVector(mask, 6));
611614

612615
problemSolver()->addNumericalConstraint(
613616
name,
@@ -629,12 +632,12 @@ void Problem::createTransformationR3xSO3Constraint(const char* constraintName,
629632
if (!problemSolver()->robot()) throw hpp::Error("No robot loaded");
630633
std::string name(constraintName);
631634
DifferentiableFunctionPtr_t func =
632-
buildGenericFunc < constraints::OutputR3xSO3Bit |
633-
constraints::PositionBit |
634-
constraints::OrientationBit >
635-
(problemSolver()->robot(), name, joint1Name, joint2Name,
636-
toTransform3s(frame1), toTransform3s(frame2),
637-
boolSeqToVector(mask, 6));
635+
buildGenericFunc<constraints::OutputR3xSO3Bit |
636+
constraints::PositionBit |
637+
constraints::OrientationBit>(
638+
problemSolver()->robot(), name, joint1Name, joint2Name,
639+
toTransform3s(frame1), toTransform3s(frame2),
640+
boolSeqToVector(mask, 6));
638641

639642
problemSolver()->addNumericalConstraint(
640643
name,

0 commit comments

Comments
 (0)