Removing using std::...

Change-Id: I584402e2a34869183c1d59071a15d97b216c52fb
This commit is contained in:
Alexander Ivanov
2023-01-11 16:51:38 +00:00
parent e1ca3302af
commit 53df5ddcfd
47 changed files with 479 additions and 608 deletions
+19 -22
View File
@@ -46,9 +46,6 @@
namespace ceres {
namespace internal {
using std::string;
using std::vector;
// A cost function that simply returns its argument.
class UnaryIdentityCostFunction : public SizedCostFunction<1, 1> {
public:
@@ -96,9 +93,9 @@ TEST(Program, RemoveFixedBlocksNothingConstant) {
problem.AddResidualBlock(new BinaryCostFunction(), nullptr, &x, &y);
problem.AddResidualBlock(new TernaryCostFunction(), nullptr, &x, &y, &z);
vector<double*> removed_parameter_blocks;
std::vector<double*> removed_parameter_blocks;
double fixed_cost = 0.0;
string message;
std::string message;
std::unique_ptr<Program> reduced_program(
problem.program().CreateReducedProgram(
&removed_parameter_blocks, &fixed_cost, &message));
@@ -117,9 +114,9 @@ TEST(Program, RemoveFixedBlocksAllParameterBlocksConstant) {
problem.AddResidualBlock(new UnaryCostFunction(), nullptr, &x);
problem.SetParameterBlockConstant(&x);
vector<double*> removed_parameter_blocks;
std::vector<double*> removed_parameter_blocks;
double fixed_cost = 0.0;
string message;
std::string message;
std::unique_ptr<Program> reduced_program(
problem.program().CreateReducedProgram(
&removed_parameter_blocks, &fixed_cost, &message));
@@ -141,9 +138,9 @@ TEST(Program, RemoveFixedBlocksNoResidualBlocks) {
problem.AddParameterBlock(&y, 1);
problem.AddParameterBlock(&z, 1);
vector<double*> removed_parameter_blocks;
std::vector<double*> removed_parameter_blocks;
double fixed_cost = 0.0;
string message;
std::string message;
std::unique_ptr<Program> reduced_program(
problem.program().CreateReducedProgram(
&removed_parameter_blocks, &fixed_cost, &message));
@@ -167,9 +164,9 @@ TEST(Program, RemoveFixedBlocksOneParameterBlockConstant) {
problem.AddResidualBlock(new BinaryCostFunction(), nullptr, &x, &y);
problem.SetParameterBlockConstant(&x);
vector<double*> removed_parameter_blocks;
std::vector<double*> removed_parameter_blocks;
double fixed_cost = 0.0;
string message;
std::string message;
std::unique_ptr<Program> reduced_program(
problem.program().CreateReducedProgram(
&removed_parameter_blocks, &fixed_cost, &message));
@@ -191,9 +188,9 @@ TEST(Program, RemoveFixedBlocksNumEliminateBlocks) {
problem.AddResidualBlock(new BinaryCostFunction(), nullptr, &x, &y);
problem.SetParameterBlockConstant(&x);
vector<double*> removed_parameter_blocks;
std::vector<double*> removed_parameter_blocks;
double fixed_cost = 0.0;
string message;
std::string message;
std::unique_ptr<Program> reduced_program(
problem.program().CreateReducedProgram(
&removed_parameter_blocks, &fixed_cost, &message));
@@ -223,9 +220,9 @@ TEST(Program, RemoveFixedBlocksFixedCost) {
expected_removed_block->Evaluate(
true, &expected_fixed_cost, nullptr, nullptr, scratch.get());
vector<double*> removed_parameter_blocks;
std::vector<double*> removed_parameter_blocks;
double fixed_cost = 0.0;
string message;
std::string message;
std::unique_ptr<Program> reduced_program(
problem.program().CreateReducedProgram(
&removed_parameter_blocks, &fixed_cost, &message));
@@ -347,7 +344,7 @@ TEST(Program, ReallocationInCreateJacobianBlockSparsityTranspose) {
ProblemImpl problem;
double x[20];
vector<double*> parameter_blocks;
std::vector<double*> parameter_blocks;
for (int i = 0; i < 20; ++i) {
problem.AddParameterBlock(x + i, 1);
parameter_blocks.push_back(x + i);
@@ -392,9 +389,9 @@ TEST(Program, ProblemHasNanParameterBlocks) {
x[0] = 1.0;
x[1] = std::numeric_limits<double>::quiet_NaN();
problem.AddResidualBlock(new MockCostFunctionBase<1, 2>(), nullptr, x);
string error;
std::string error;
EXPECT_FALSE(problem.program().ParameterBlocksAreFinite(&error));
EXPECT_NE(error.find("has at least one invalid value"), string::npos)
EXPECT_NE(error.find("has at least one invalid value"), std::string::npos)
<< error;
}
@@ -404,9 +401,9 @@ TEST(Program, InfeasibleParameterBlock) {
problem.AddResidualBlock(new MockCostFunctionBase<1, 2>(), nullptr, x);
problem.SetParameterLowerBound(x, 0, 2.0);
problem.SetParameterUpperBound(x, 0, 1.0);
string error;
std::string error;
EXPECT_FALSE(problem.program().IsFeasible(&error));
EXPECT_NE(error.find("infeasible bound"), string::npos) << error;
EXPECT_NE(error.find("infeasible bound"), std::string::npos) << error;
}
TEST(Program, InfeasibleConstantParameterBlock) {
@@ -416,9 +413,9 @@ TEST(Program, InfeasibleConstantParameterBlock) {
problem.SetParameterLowerBound(x, 0, 1.0);
problem.SetParameterUpperBound(x, 0, 2.0);
problem.SetParameterBlockConstant(x);
string error;
std::string error;
EXPECT_FALSE(problem.program().IsFeasible(&error));
EXPECT_NE(error.find("infeasible value"), string::npos) << error;
EXPECT_NE(error.find("infeasible value"), std::string::npos) << error;
}
} // namespace internal