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

Deprecate macros.h and fpclassify.h

Browse Source 
1. Replace CERES_DISALLOW_* with explicitly deleted constructors.
2. Replace use of CERES_ARRAY_SIZE and stack allocated arrays
   with std::vector.
3. Move CERES_ALIGN_* macros into manual_constructor.h, which is
   the one place they are used and will be deprecated along with that
   file.
4. Introduce isnan,isnormal,isinf and isfinite for Jets.
5. Replace IsNormal,IsFinite,IsNaN and IsInfinite with corresponding
   c++11 function calls.

Change-Id: I04f33a221aae77d247602150988b6d4aa4efeeab
This commit is contained in:
Sameer Agarwal
2018-04-12 20:44:56 -07:00
parent 58c5edae2f
commit 31f24521cc
42 changed files with 141 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/ceres/numeric_diff_test_utils.cc
+11 -8
View File
@@ -34,7 +34,6 @@
#include <algorithm>
#include <cmath>
#include "ceres/cost_function.h"
#include "ceres/internal/macros.h"
#include "ceres/test_util.h"
#include "ceres/types.h"
#include "gtest/gtest.h"
@@ -122,10 +121,13 @@ bool TranscendentalFunctor::operator()(const double* x1,
void TranscendentalFunctor::ExpectCostFunctionEvaluationIsNearlyCorrect(
const CostFunction& cost_function,
NumericDiffMethodType method) const {
struct {
struct TestParameterBlocks {
double x1[5];
double x2[5];
} kTests[] = {
};
std::vector<TestParameterBlocks> kTests = {
{ { 1.0, 2.0, 3.0, 4.0, 5.0 }, // No zeros.
{ 9.0, 9.0, 5.0, 5.0, 1.0 },
},
@@ -146,7 +148,7 @@ void TranscendentalFunctor::ExpectCostFunctionEvaluationIsNearlyCorrect(
},
};
for (int k = 0; k < CERES_ARRAYSIZE(kTests); ++k) {
for (int k = 0; k < kTests.size(); ++k) {
double *x1 = &(kTests[k].x1[0]);
double *x2 = &(kTests[k].x2[0]);
double *parameters[] = { x1, x2 };
@@ -196,15 +198,16 @@ bool ExponentialFunctor::operator()(const double* x1,
return true;
}
void ExponentialFunctor::ExpectCostFunctionEvaluationIsNearlyCorrect(
const CostFunction& cost_function) const {
// Evaluating the functor at specific points for testing.
double kTests[] = { 1.0, 2.0, 3.0, 4.0, 5.0 };
std::vector<double> kTests = { 1.0, 2.0, 3.0, 4.0, 5.0 };
// Minimal tolerance w.r.t. the cost function and the tests.
const double kTolerance = 2e-14;
for (int k = 0; k < CERES_ARRAYSIZE(kTests); ++k) {
for (int k = 0; k < kTests.size(); ++k) {
double *parameters[] = { &kTests[k] };
double dydx;
double *jacobians[1] = { &dydx };
@@ -241,14 +244,14 @@ bool RandomizedFunctor::operator()(const double* x1,
void RandomizedFunctor::ExpectCostFunctionEvaluationIsNearlyCorrect(
const CostFunction& cost_function) const {
double kTests[] = { 0.0, 1.0, 3.0, 4.0, 50.0 };
std::vector<double> kTests = { 0.0, 1.0, 3.0, 4.0, 50.0 };
const double kTolerance = 2e-4;
// Initialize random number generator with given seed.
srand(random_seed_);
for (int k = 0; k < CERES_ARRAYSIZE(kTests); ++k) {
for (int k = 0; k < kTests.size(); ++k) {
double *parameters[] = { &kTests[k] };
double dydx;
double *jacobians[1] = { &dydx };