Skip to content

Commit

Permalink
[cleanup] Run pre-commit to fix format
Browse files Browse the repository at this point in the history
  • Loading branch information
cmastalli committed Aug 4, 2023
1 parent 4da5c55 commit 7ff8618
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ros1-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- {name: "CI (noetic, clang, multi-threading)", ROS_DISTRO: noetic, ADDITIONAL_DEBS: "clang libomp-dev", CC: clang, CXX: clang++, CMAKE_ARGS: "-DBUILD_WITH_MULTITHREADS=ON -DBUILD_WITH_NTHREADS=2"}
- {name: "CI (noetic, clang, Debug)", ROS_DISTRO: noetic, ADDITIONAL_DEBS: clang, CC: clang, CXX: clang++, CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug"}
# Format check
#- {name: "Format check", ROS_DISTRO: noetic, CLANG_FORMAT_CHECK: file, CLANG_FORMAT_VERSION: "6.0", BEFORE_RUN_CLANG_FORMAT_CHECK: "wget https://raw.githubusercontent.com/Gepetto/linters/master/.clang-format-6.0 -O /tmp/clang_format_check/crocoddyl/.clang-format", ADDITIONAL_DEBS: wget}
#- {name: "Format check", ROS_DISTRO: noetic, CLANG_FORMAT_CHECK: file, CLANG_FORMAT_VERSION: "6.0", BEFORE_RUN_CLANG_FORMAT_CHECK: "wget https://raw.githubusercontent.com/Gepetto/linters/master/.clang-format-6.0 -O /tmp/clang_format_check/crocoddyl/.clang-format", ADDITIONAL_DEBS: wget}
name: ${{ matrix.env.name }}
env:
CCACHE_DIR: /github/home/.ccache # Enable ccache
Expand Down
3 changes: 1 addition & 2 deletions unittest/factory/cost.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -244,8 +244,7 @@ boost::shared_ptr<crocoddyl::CostModelAbstract> CostModelFactory::create(
switch (cost_type) {
case CostModelCollisionTypes::CostModelResidualPairCollision:
cost = boost::make_shared<crocoddyl::CostModelResidual>(
state,
boost::make_shared<crocoddyl::ActivationModelQuad>(3),
state, boost::make_shared<crocoddyl::ActivationModelQuad>(3),
boost::make_shared<crocoddyl::ResidualModelPairCollision>(
state, nu, geometry, 0,
state->get_pinocchio()->frames[frame_index].parent));
Expand Down
5 changes: 3 additions & 2 deletions unittest/test_costs_collision.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,9 @@ bool init_function() {
++cost_type) {
register_cost_model_unit_tests(CostModelCollisionTypes::all[cost_type],
StateModelTypes::StateMultibody_HyQ);
register_cost_model_unit_tests(CostModelCollisionTypes::all[cost_type],
StateModelTypes::StateMultibody_RandomHumanoid);
register_cost_model_unit_tests(
CostModelCollisionTypes::all[cost_type],
StateModelTypes::StateMultibody_RandomHumanoid);
}
return true;
}
Expand Down

0 comments on commit 7ff8618

Please sign in to comment.