Skip to content

Commit 81779fa

Browse files
authored
Merge pull request #231 from humanoid-path-planner/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2 parents 156e580 + 7b16f77 commit 81779fa

File tree

5 files changed

+34
-35
lines changed

5 files changed

+34
-35
lines changed

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
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.5.1
5+
rev: v0.6.9
66
hooks:
77
- id: ruff
88
args:
@@ -19,13 +19,13 @@ repos:
1919
- id: toml-sort-fix
2020
exclude: poetry.lock
2121
- repo: https://github.com/pre-commit/mirrors-clang-format
22-
rev: v18.1.8
22+
rev: v19.1.1
2323
hooks:
2424
- id: clang-format
2525
args:
2626
- --style=Google
2727
- repo: https://github.com/pre-commit/pre-commit-hooks
28-
rev: v4.6.0
28+
rev: v5.0.0
2929
hooks:
3030
- id: check-added-large-files
3131
- id: check-ast

include/hpp/corbaserver/servant-base.hh

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -484,16 +484,17 @@ 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-
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+
; \
497+
HPP_CORBASERVER_DLLLOCAL __InitializerClass_##ServantType \
497498
__instance_##ServantType;
498499

499500
#endif // HPP_CORBASERVER_SERVANT_BASE_HH

src/problem.impl.cc

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,9 @@ DifferentiableFunctionPtr_t buildGenericFunc(
163163

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

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

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

642639
problemSolver()->addNumericalConstraint(
643640
name,

tests/problem.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def test_tools(self):
2020
assert object_ids[0] == cl.orb.object_to_string(pb)
2121

2222
pb2 = cl.orb.string_to_object(object_ids[0])
23-
assert type(pb) == type(pb2)
23+
assert type(pb) is type(pb2)
2424
pb2.persistantStorage(False)
2525

2626
def test_createConstraints(self):

tests/quat.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from math import cos, pi, sin, sqrt
22

33
import numpy as np
4+
45
from hpp import Quaternion
56

67
ok = True

0 commit comments

Comments
 (0)