saberbud/ceres-solver
1
0
Fork 0
mirror of https://github.com/ceres-solver/ceres-solver.git synced 2026-08-31 01:20:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix formatting for (non-generated) internal source files

Browse Source 
- Change formatting standard to Cpp11. Main difference is not having
  the space between two closing >> for nested templates. We don't
  choose c++14, because older versions of clang-format (version 9
  and earlier) don't know this value yet, and it doesn't make a
  difference in the formatting.
- Apply clang-format to all (non generated) internal source files.
- Manually fix some code sections (clang-format on/off) and c-strings
- Exclude some embedded external files with very different formatting
  (gtest/gmock)
- Add script to format all source files

Change-Id: Ic6cea41575ad6e37c9e136dbce176b0d505dc44d
This commit is contained in:
Nikolaus Demmel
2020-09-20 21:45:24 +02:00
parent 921368ce31
commit 7b8f675bfd
272 changed files with 3449 additions and 3319 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/ceres/dynamic_numeric_diff_cost_function_test.cc
+36 -42
View File
@@ -29,10 +29,11 @@
// Author: sameeragarwal@google.com (Sameer Agarwal)
// mierle@gmail.com (Keir Mierle)
#include <cstddef>
#include <memory>
#include "ceres/dynamic_numeric_diff_cost_function.h"
#include <cstddef>
#include <memory>
#include "gtest/gtest.h"
namespace ceres {
@@ -87,9 +88,8 @@ TEST(DynamicNumericdiffCostFunctionTest, TestResiduals) {
vector<double*> parameter_blocks(2);
parameter_blocks[0] = &param_block_0[0];
parameter_blocks[1] = &param_block_1[0];
EXPECT_TRUE(cost_function.Evaluate(&parameter_blocks[0],
residuals.data(),
NULL));
EXPECT_TRUE(
cost_function.Evaluate(&parameter_blocks[0], residuals.data(), NULL));
for (int r = 0; r < 10; ++r) {
EXPECT_EQ(1.0 * r, residuals.at(r * 2));
EXPECT_EQ(-1.0 * r, residuals.at(r * 2 + 1));
@@ -97,7 +97,6 @@ TEST(DynamicNumericdiffCostFunctionTest, TestResiduals) {
EXPECT_EQ(0, residuals.at(20));
}
TEST(DynamicNumericdiffCostFunctionTest, TestJacobian) {
// Test the residual counting.
vector<double> param_block_0(10, 0.0);
@@ -128,9 +127,8 @@ TEST(DynamicNumericdiffCostFunctionTest, TestJacobian) {
jacobian.push_back(jacobian_vect[1].data());
// Test jacobian computation.
EXPECT_TRUE(cost_function.Evaluate(parameter_blocks.data(),
residuals.data(),
jacobian.data()));
EXPECT_TRUE(cost_function.Evaluate(
parameter_blocks.data(), residuals.data(), jacobian.data()));
for (int r = 0; r < 10; ++r) {
EXPECT_EQ(-1.0 * r, residuals.at(r * 2));
@@ -139,11 +137,11 @@ TEST(DynamicNumericdiffCostFunctionTest, TestJacobian) {
EXPECT_EQ(420, residuals.at(20));
for (int p = 0; p < 10; ++p) {
// Check "A" Jacobian.
EXPECT_NEAR(-1.0, jacobian_vect[0][2*p * 10 + p], kTolerance);
EXPECT_NEAR(-1.0, jacobian_vect[0][2 * p * 10 + p], kTolerance);
// Check "B" Jacobian.
EXPECT_NEAR(+1.0, jacobian_vect[0][(2*p+1) * 10 + p], kTolerance);
jacobian_vect[0][2*p * 10 + p] = 0.0;
jacobian_vect[0][(2*p+1) * 10 + p] = 0.0;
EXPECT_NEAR(+1.0, jacobian_vect[0][(2 * p + 1) * 10 + p], kTolerance);
jacobian_vect[0][2 * p * 10 + p] = 0.0;
jacobian_vect[0][(2 * p + 1) * 10 + p] = 0.0;
}
// Check "C" Jacobian for first parameter block.
@@ -165,7 +163,8 @@ TEST(DynamicNumericdiffCostFunctionTest, TestJacobian) {
}
}
TEST(DynamicNumericdiffCostFunctionTest, JacobianWithFirstParameterBlockConstant) { // NOLINT
TEST(DynamicNumericdiffCostFunctionTest,
JacobianWithFirstParameterBlockConstant) { // NOLINT
// Test the residual counting.
vector<double> param_block_0(10, 0.0);
for (int i = 0; i < 10; ++i) {
@@ -195,9 +194,8 @@ TEST(DynamicNumericdiffCostFunctionTest, JacobianWithFirstParameterBlockConstant
jacobian.push_back(jacobian_vect[1].data());
// Test jacobian computation.
EXPECT_TRUE(cost_function.Evaluate(parameter_blocks.data(),
residuals.data(),
jacobian.data()));
EXPECT_TRUE(cost_function.Evaluate(
parameter_blocks.data(), residuals.data(), jacobian.data()));
for (int r = 0; r < 10; ++r) {
EXPECT_EQ(-1.0 * r, residuals.at(r * 2));
@@ -215,7 +213,8 @@ TEST(DynamicNumericdiffCostFunctionTest, JacobianWithFirstParameterBlockConstant
}
}
TEST(DynamicNumericdiffCostFunctionTest, JacobianWithSecondParameterBlockConstant) { // NOLINT
TEST(DynamicNumericdiffCostFunctionTest,
JacobianWithSecondParameterBlockConstant) { // NOLINT
// Test the residual counting.
vector<double> param_block_0(10, 0.0);
for (int i = 0; i < 10; ++i) {
@@ -245,9 +244,8 @@ TEST(DynamicNumericdiffCostFunctionTest, JacobianWithSecondParameterBlockConstan
jacobian.push_back(NULL);
// Test jacobian computation.
EXPECT_TRUE(cost_function.Evaluate(parameter_blocks.data(),
residuals.data(),
jacobian.data()));
EXPECT_TRUE(cost_function.Evaluate(
parameter_blocks.data(), residuals.data(), jacobian.data()));
for (int r = 0; r < 10; ++r) {
EXPECT_EQ(-1.0 * r, residuals.at(r * 2));
@@ -256,11 +254,11 @@ TEST(DynamicNumericdiffCostFunctionTest, JacobianWithSecondParameterBlockConstan
EXPECT_EQ(420, residuals.at(20));
for (int p = 0; p < 10; ++p) {
// Check "A" Jacobian.
EXPECT_NEAR(-1.0, jacobian_vect[0][2*p * 10 + p], kTolerance);
EXPECT_NEAR(-1.0, jacobian_vect[0][2 * p * 10 + p], kTolerance);
// Check "B" Jacobian.
EXPECT_NEAR(+1.0, jacobian_vect[0][(2*p+1) * 10 + p], kTolerance);
jacobian_vect[0][2*p * 10 + p] = 0.0;
jacobian_vect[0][(2*p+1) * 10 + p] = 0.0;
EXPECT_NEAR(+1.0, jacobian_vect[0][(2 * p + 1) * 10 + p], kTolerance);
jacobian_vect[0][2 * p * 10 + p] = 0.0;
jacobian_vect[0][(2 * p + 1) * 10 + p] = 0.0;
}
// Check "C" Jacobian for first parameter block.
@@ -331,10 +329,10 @@ class ThreeParameterCostFunctorTest : public ::testing::Test {
// Prepare the cost function.
typedef DynamicNumericDiffCostFunction<MyThreeParameterCostFunctor>
DynamicMyThreeParameterCostFunction;
DynamicMyThreeParameterCostFunction * cost_function =
new DynamicMyThreeParameterCostFunction(
new MyThreeParameterCostFunctor());
DynamicMyThreeParameterCostFunction;
DynamicMyThreeParameterCostFunction* cost_function =
new DynamicMyThreeParameterCostFunction(
new MyThreeParameterCostFunctor());
cost_function->AddParameterBlock(1);
cost_function->AddParameterBlock(2);
cost_function->AddParameterBlock(3);
@@ -432,9 +430,8 @@ class ThreeParameterCostFunctorTest : public ::testing::Test {
TEST_F(ThreeParameterCostFunctorTest, TestThreeParameterResiduals) {
vector<double> residuals(7, -100000);
EXPECT_TRUE(cost_function_->Evaluate(parameter_blocks_.data(),
residuals.data(),
NULL));
EXPECT_TRUE(cost_function_->Evaluate(
parameter_blocks_.data(), residuals.data(), NULL));
for (int i = 0; i < 7; ++i) {
EXPECT_EQ(expected_residuals_[i], residuals[i]);
}
@@ -448,9 +445,8 @@ TEST_F(ThreeParameterCostFunctorTest, TestThreeParameterJacobian) {
jacobian.push_back(jacobian_vect_[1].data());
jacobian.push_back(jacobian_vect_[2].data());
EXPECT_TRUE(cost_function_->Evaluate(parameter_blocks_.data(),
residuals.data(),
jacobian.data()));
EXPECT_TRUE(cost_function_->Evaluate(
parameter_blocks_.data(), residuals.data(), jacobian.data()));
for (int i = 0; i < 7; ++i) {
EXPECT_EQ(expected_residuals_[i], residuals[i]);
@@ -478,9 +474,8 @@ TEST_F(ThreeParameterCostFunctorTest,
jacobian.push_back(jacobian_vect_[1].data());
jacobian.push_back(NULL);
EXPECT_TRUE(cost_function_->Evaluate(parameter_blocks_.data(),
residuals.data(),
jacobian.data()));
EXPECT_TRUE(cost_function_->Evaluate(
parameter_blocks_.data(), residuals.data(), jacobian.data()));
for (int i = 0; i < 7; ++i) {
EXPECT_EQ(expected_residuals_[i], residuals[i]);
@@ -500,9 +495,8 @@ TEST_F(ThreeParameterCostFunctorTest,
jacobian.push_back(NULL);
jacobian.push_back(jacobian_vect_[2].data());
EXPECT_TRUE(cost_function_->Evaluate(parameter_blocks_.data(),
residuals.data(),
jacobian.data()));
EXPECT_TRUE(cost_function_->Evaluate(
parameter_blocks_.data(), residuals.data(), jacobian.data()));
for (int i = 0; i < 7; ++i) {
EXPECT_EQ(expected_residuals_[i], residuals[i]);