Skip to content
This repository has been archived by the owner on Oct 26, 2018. It is now read-only.

Commit

Permalink
Lint cleanup from William Rucklidge.
Browse files Browse the repository at this point in the history
Change-Id: If545f114c1a2b07edd660a3c71ecfc16ffa25e43
  • Loading branch information
sandwichmaker committed Apr 30, 2014
1 parent 15c1210 commit 31b5037
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 13 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ IF (MSVC)
OPTION(MSVC_USE_STATIC_CRT
"MS Visual Studio: Use static C-Run Time Library in place of shared." OFF)

IF ( BUILD_TESTING AND BUILD_SHARED_LIBS)
IF (BUILD_TESTING AND BUILD_SHARED_LIBS)
MESSAGE(
"-- Disabling tests. The flags BUILD_TESTING and BUILD_SHARED_LIBS"
" are incompatible with MSVC."
Expand Down
6 changes: 3 additions & 3 deletions docs/source/version_history.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ New Features
(Alex Stewart)
#. LBFGS is faster due to fewer memory copies.
#. Parameter blocks are not restricted to be less than 32k in size,
they can be upto 2G in size.
they can be up to 2G in size.
#. Faster ``SPARSE_NORMAL_CHOLESKY`` solver when using ``CX_SPARSE``
as the sparse linear algebra library.
#. ``Problem::IsParameterBlockPresent`` can be used to check if a
parameter block is already present in the problem.
#. ``Problem::GetParameterzation`` can be used to access the
#. ``Problem::GetParameterization`` can be used to access the
parameterization associated with a parameter block.
#. Added the (2,4,9) template specialization for PartitionedMatrixView
and SchurEliminator.
Expand Down Expand Up @@ -98,7 +98,7 @@ Bug Fixes
column blocks. (Richard Bowen)
#. Better error checking when ``Problem::RemoveResidualBlock`` is
called. (Alex Stewart)
#. Fixed a memory leack in ``SchurComplementSolver``.
#. Fixed a memory leak in ``SchurComplementSolver``.
#. Added ``epsilon()`` method to ``NumTraits<ceres::Jet<T, N> >``. (Filippo
Basso)
#. Fixed a bug in `CompressedRowSparseMatrix::AppendRows`` and
Expand Down
24 changes: 15 additions & 9 deletions include/ceres/types.h
Original file line number Diff line number Diff line change
Expand Up @@ -378,9 +378,9 @@ enum DumpFormatType {
TEXTFILE
};

// For SizedCostFunction and AutoDiffCostFunction, DYNAMIC can be specified for
// the number of residuals. If specified, then the number of residuas for that
// cost function can vary at runtime.
// For SizedCostFunction and AutoDiffCostFunction, DYNAMIC can be
// specified for the number of residuals. If specified, then the
// number of residuas for that cost function can vary at runtime.
enum DimensionType {
DYNAMIC = -1
};
Expand All @@ -402,13 +402,17 @@ enum CovarianceAlgorithmType {
SPARSE_QR
};

CERES_EXPORT const char* LinearSolverTypeToString(LinearSolverType type);
CERES_EXPORT bool StringToLinearSolverType(string value, LinearSolverType* type);
CERES_EXPORT const char* LinearSolverTypeToString(
LinearSolverType type);
CERES_EXPORT bool StringToLinearSolverType(string value,
LinearSolverType* type);

CERES_EXPORT const char* PreconditionerTypeToString(PreconditionerType type);
CERES_EXPORT bool StringToPreconditionerType(string value, PreconditionerType* type);
CERES_EXPORT bool StringToPreconditionerType(string value,
PreconditionerType* type);

CERES_EXPORT const char* VisibilityClusteringTypeToString(VisibilityClusteringType type);
CERES_EXPORT const char* VisibilityClusteringTypeToString(
VisibilityClusteringType type);
CERES_EXPORT bool StringToVisibilityClusteringType(string value,
VisibilityClusteringType* type);

Expand All @@ -424,7 +428,8 @@ CERES_EXPORT bool StringToDenseLinearAlgebraLibraryType(
string value,
DenseLinearAlgebraLibraryType* type);

CERES_EXPORT const char* TrustRegionStrategyTypeToString(TrustRegionStrategyType type);
CERES_EXPORT const char* TrustRegionStrategyTypeToString(
TrustRegionStrategyType type);
CERES_EXPORT bool StringToTrustRegionStrategyType(string value,
TrustRegionStrategyType* type);

Expand All @@ -434,7 +439,8 @@ CERES_EXPORT bool StringToDoglegType(string value, DoglegType* type);
CERES_EXPORT const char* MinimizerTypeToString(MinimizerType type);
CERES_EXPORT bool StringToMinimizerType(string value, MinimizerType* type);

CERES_EXPORT const char* LineSearchDirectionTypeToString(LineSearchDirectionType type);
CERES_EXPORT const char* LineSearchDirectionTypeToString(
LineSearchDirectionType type);
CERES_EXPORT bool StringToLineSearchDirectionType(string value,
LineSearchDirectionType* type);

Expand Down

0 comments on commit 31b5037

Please sign in to comment.