From a1eaa262eacc3a1575ccfbaa99933f51c8d4f537 Mon Sep 17 00:00:00 2001 From: Sameer Agarwal Date: Thu, 9 May 2013 10:02:24 -0700 Subject: [PATCH] Update glog path Change-Id: I47a69cb267c71a9f8f3350c4f645e8cf83e44cc9 --- examples/curve_fitting.cc | 2 +- examples/robust_curve_fitting.cc | 2 +- include/ceres/autodiff_cost_function.h | 2 +- include/ceres/internal/autodiff.h | 2 +- include/ceres/internal/fixed_array.h | 2 +- include/ceres/internal/variadic_evaluate.h | 2 +- include/ceres/loss_function.h | 2 +- include/ceres/numeric_diff_cost_function.h | 2 +- include/ceres/sized_cost_function.h | 2 +- internal/ceres/dense_sparse_matrix.cc | 1 + internal/ceres/dense_sparse_matrix.h | 1 - internal/ceres/dense_sparse_matrix_test.cc | 3 ++- internal/ceres/line_search.cc | 3 +-- internal/ceres/line_search.h | 1 - 14 files changed, 13 insertions(+), 14 deletions(-) diff --git a/examples/curve_fitting.cc b/examples/curve_fitting.cc index e77e177ef..3e3adcd28 100644 --- a/examples/curve_fitting.cc +++ b/examples/curve_fitting.cc @@ -28,8 +28,8 @@ // // Author: sameeragarwal@google.com (Sameer Agarwal) -#include #include "ceres/ceres.h" +#include "glog/logging.h" using ceres::AutoDiffCostFunction; using ceres::CostFunction; diff --git a/examples/robust_curve_fitting.cc b/examples/robust_curve_fitting.cc index 01cbbb29e..ad71a5d33 100644 --- a/examples/robust_curve_fitting.cc +++ b/examples/robust_curve_fitting.cc @@ -28,8 +28,8 @@ // // Author: sameeragarwal@google.com (Sameer Agarwal) -#include #include "ceres/ceres.h" +#include "glog/logging.h" // Data generated using the following octave code. // randn('seed', 23497); diff --git a/include/ceres/autodiff_cost_function.h b/include/ceres/autodiff_cost_function.h index 2cc3f502d..371a11f71 100644 --- a/include/ceres/autodiff_cost_function.h +++ b/include/ceres/autodiff_cost_function.h @@ -128,11 +128,11 @@ #ifndef CERES_PUBLIC_AUTODIFF_COST_FUNCTION_H_ #define CERES_PUBLIC_AUTODIFF_COST_FUNCTION_H_ -#include #include "ceres/internal/autodiff.h" #include "ceres/internal/scoped_ptr.h" #include "ceres/sized_cost_function.h" #include "ceres/types.h" +#include "glog/logging.h" namespace ceres { diff --git a/include/ceres/internal/autodiff.h b/include/ceres/internal/autodiff.h index 2b32671c0..116303860 100644 --- a/include/ceres/internal/autodiff.h +++ b/include/ceres/internal/autodiff.h @@ -142,11 +142,11 @@ #include -#include #include "ceres/jet.h" #include "ceres/internal/eigen.h" #include "ceres/internal/fixed_array.h" #include "ceres/internal/variadic_evaluate.h" +#include "glog/logging.h" namespace ceres { namespace internal { diff --git a/include/ceres/internal/fixed_array.h b/include/ceres/internal/fixed_array.h index fa4a339d7..ee264d161 100644 --- a/include/ceres/internal/fixed_array.h +++ b/include/ceres/internal/fixed_array.h @@ -33,10 +33,10 @@ #define CERES_PUBLIC_INTERNAL_FIXED_ARRAY_H_ #include -#include #include "Eigen/Core" #include "ceres/internal/macros.h" #include "ceres/internal/manual_constructor.h" +#include "glog/logging.h" namespace ceres { namespace internal { diff --git a/include/ceres/internal/variadic_evaluate.h b/include/ceres/internal/variadic_evaluate.h index 4b1e4bdc6..9a473d5b2 100644 --- a/include/ceres/internal/variadic_evaluate.h +++ b/include/ceres/internal/variadic_evaluate.h @@ -34,10 +34,10 @@ #include -#include #include "ceres/jet.h" #include "ceres/internal/eigen.h" #include "ceres/internal/fixed_array.h" +#include "glog/logging.h" namespace ceres { namespace internal { diff --git a/include/ceres/loss_function.h b/include/ceres/loss_function.h index 0c0ceaaec..7b4af1519 100644 --- a/include/ceres/loss_function.h +++ b/include/ceres/loss_function.h @@ -75,10 +75,10 @@ #ifndef CERES_PUBLIC_LOSS_FUNCTION_H_ #define CERES_PUBLIC_LOSS_FUNCTION_H_ -#include #include "ceres/internal/macros.h" #include "ceres/internal/scoped_ptr.h" #include "ceres/types.h" +#include "glog/logging.h" namespace ceres { diff --git a/include/ceres/numeric_diff_cost_function.h b/include/ceres/numeric_diff_cost_function.h index 020d0851e..6c44b580c 100644 --- a/include/ceres/numeric_diff_cost_function.h +++ b/include/ceres/numeric_diff_cost_function.h @@ -148,13 +148,13 @@ #ifndef CERES_PUBLIC_NUMERIC_DIFF_COST_FUNCTION_H_ #define CERES_PUBLIC_NUMERIC_DIFF_COST_FUNCTION_H_ -#include #include "Eigen/Dense" #include "ceres/cost_function.h" #include "ceres/internal/numeric_diff.h" #include "ceres/internal/scoped_ptr.h" #include "ceres/sized_cost_function.h" #include "ceres/types.h" +#include "glog/logging.h" namespace ceres { diff --git a/include/ceres/sized_cost_function.h b/include/ceres/sized_cost_function.h index 6bfc1af31..4f98d4eb9 100644 --- a/include/ceres/sized_cost_function.h +++ b/include/ceres/sized_cost_function.h @@ -38,9 +38,9 @@ #ifndef CERES_PUBLIC_SIZED_COST_FUNCTION_H_ #define CERES_PUBLIC_SIZED_COST_FUNCTION_H_ -#include #include "ceres/types.h" #include "ceres/cost_function.h" +#include "glog/logging.h" namespace ceres { diff --git a/internal/ceres/dense_sparse_matrix.cc b/internal/ceres/dense_sparse_matrix.cc index 9d58031cc..f94b8886d 100644 --- a/internal/ceres/dense_sparse_matrix.cc +++ b/internal/ceres/dense_sparse_matrix.cc @@ -35,6 +35,7 @@ #include "ceres/triplet_sparse_matrix.h" #include "ceres/internal/eigen.h" #include "ceres/internal/port.h" +#include "glog/logging.h" namespace ceres { namespace internal { diff --git a/internal/ceres/dense_sparse_matrix.h b/internal/ceres/dense_sparse_matrix.h index 6c7b60ade..96a715d9c 100644 --- a/internal/ceres/dense_sparse_matrix.h +++ b/internal/ceres/dense_sparse_matrix.h @@ -33,7 +33,6 @@ #ifndef CERES_INTERNAL_DENSE_SPARSE_MATRIX_H_ #define CERES_INTERNAL_DENSE_SPARSE_MATRIX_H_ -#include #include "ceres/sparse_matrix.h" #include "ceres/internal/eigen.h" #include "ceres/internal/macros.h" diff --git a/internal/ceres/dense_sparse_matrix_test.cc b/internal/ceres/dense_sparse_matrix_test.cc index ccc833c14..3f8215d97 100644 --- a/internal/ceres/dense_sparse_matrix_test.cc +++ b/internal/ceres/dense_sparse_matrix_test.cc @@ -34,13 +34,14 @@ #include "ceres/dense_sparse_matrix.h" -#include "gtest/gtest.h" #include "ceres/casts.h" #include "ceres/linear_least_squares_problems.h" #include "ceres/matrix_proto.h" #include "ceres/triplet_sparse_matrix.h" #include "ceres/internal/eigen.h" #include "ceres/internal/scoped_ptr.h" +#include "glog/logging.h" +#include "gtest/gtest.h" namespace ceres { namespace internal { diff --git a/internal/ceres/line_search.cc b/internal/ceres/line_search.cc index 437f74260..bc47814f9 100644 --- a/internal/ceres/line_search.cc +++ b/internal/ceres/line_search.cc @@ -31,12 +31,11 @@ #ifndef CERES_NO_LINE_SEARCH_MINIMIZER #include "ceres/line_search.h" -#include #include "ceres/fpclassify.h" #include "ceres/evaluator.h" #include "ceres/internal/eigen.h" #include "ceres/polynomial.h" - +#include "glog/logging.h" namespace ceres { namespace internal { diff --git a/internal/ceres/line_search.h b/internal/ceres/line_search.h index 95bf56e2a..a2b59b1c4 100644 --- a/internal/ceres/line_search.h +++ b/internal/ceres/line_search.h @@ -35,7 +35,6 @@ #ifndef CERES_NO_LINE_SEARCH_MINIMIZER -#include #include #include "ceres/internal/eigen.h" #include "ceres/internal/port.h"