mirror of
https://github.com/ceres-solver/ceres-solver.git
synced 2026-08-29 16:40:38 +08:00
fix formatting for (non-generated) internal source files
- 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:
@@ -64,8 +64,7 @@ CoordinateDescentMinimizer::CoordinateDescentMinimizer(ContextImpl* context)
|
||||
CHECK(context_ != nullptr);
|
||||
}
|
||||
|
||||
CoordinateDescentMinimizer::~CoordinateDescentMinimizer() {
|
||||
}
|
||||
CoordinateDescentMinimizer::~CoordinateDescentMinimizer() {}
|
||||
|
||||
bool CoordinateDescentMinimizer::Init(
|
||||
const Program& program,
|
||||
@@ -82,13 +81,13 @@ bool CoordinateDescentMinimizer::Init(
|
||||
map<int, set<double*>> group_to_elements = ordering.group_to_elements();
|
||||
for (const auto& g_t_e : group_to_elements) {
|
||||
const auto& elements = g_t_e.second;
|
||||
for (double* parameter_block: elements) {
|
||||
for (double* parameter_block : elements) {
|
||||
parameter_blocks_.push_back(parameter_map.find(parameter_block)->second);
|
||||
parameter_block_index[parameter_blocks_.back()] =
|
||||
parameter_blocks_.size() - 1;
|
||||
}
|
||||
independent_set_offsets_.push_back(
|
||||
independent_set_offsets_.back() + elements.size());
|
||||
independent_set_offsets_.push_back(independent_set_offsets_.back() +
|
||||
elements.size());
|
||||
}
|
||||
|
||||
// The ordering does not have to contain all parameter blocks, so
|
||||
@@ -126,10 +125,9 @@ bool CoordinateDescentMinimizer::Init(
|
||||
return true;
|
||||
}
|
||||
|
||||
void CoordinateDescentMinimizer::Minimize(
|
||||
const Minimizer::Options& options,
|
||||
double* parameters,
|
||||
Solver::Summary* summary) {
|
||||
void CoordinateDescentMinimizer::Minimize(const Minimizer::Options& options,
|
||||
double* parameters,
|
||||
Solver::Summary* summary) {
|
||||
// Set the state and mark all parameter blocks constant.
|
||||
for (int i = 0; i < parameter_blocks_.size(); ++i) {
|
||||
ParameterBlock* parameter_block = parameter_blocks_[i];
|
||||
@@ -202,7 +200,7 @@ void CoordinateDescentMinimizer::Minimize(
|
||||
});
|
||||
}
|
||||
|
||||
for (int i = 0; i < parameter_blocks_.size(); ++i) {
|
||||
for (int i = 0; i < parameter_blocks_.size(); ++i) {
|
||||
parameter_blocks_[i]->SetVarying();
|
||||
}
|
||||
|
||||
@@ -251,10 +249,10 @@ bool CoordinateDescentMinimizer::IsOrderingValid(
|
||||
// Verify that each group is an independent set
|
||||
for (const auto& g_t_e : group_to_elements) {
|
||||
if (!program.IsParameterBlockSetIndependent(g_t_e.second)) {
|
||||
*message =
|
||||
StringPrintf("The user-provided "
|
||||
"parameter_blocks_for_inner_iterations does not "
|
||||
"form an independent set. Group Id: %d", g_t_e.first);
|
||||
*message = StringPrintf(
|
||||
"The user-provided parameter_blocks_for_inner_iterations does not "
|
||||
"form an independent set. Group Id: %d",
|
||||
g_t_e.first);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user