Commit Graph

185 Commits

Author SHA1 Message Date
Petter Strandmark aeb00a0732 Removing gomp for Visual Studio
Linking currently fails in Visual Studio due to a missing library
"gomp.lib". This is not needed in Visual Studio. OpenMP works
without it.

Change-Id: I39e204a8dd4f1b7425df7d4b222d86a8bb961432
2012-08-27 22:22:57 -07:00
Markus Moll 6f362464ba Add some tests for DoglegStrategy.
Not necessarily a complete set.

Change-Id: I14eb3a38c6fe976c8212f3934655411b6d1e0aa4
2012-08-27 21:10:01 -07:00
Sameer Agarwal 122cf836a6 Documentation update.
Change-Id: I0a3c5ae4bc981a8f5bdd5a8905f923dc5f09a024
2012-08-27 14:29:21 -07:00
Keir Mierle 69081719f7 Remove unnecessary overload for hash<>
The overload for pointers in hash tables was applied in normal
usage of schur_ordering.cc. However, the tests did not include the
overload since they only included collections_port.h. As a result,
the routines in schur_ordering.cc were using a different hash
function than that inside the tests.

The fix is to remove the specialization. If this breaks one of the
compiler configurations, we will find a workaround at that time.

Change-Id: Idbf60415d5e2aec0c865b514ad0c577d21b91405
2012-08-27 13:32:53 -07:00
Sameer Agarwal 1762420b6e Update changelog.
Change-Id: Idf5af69d5a9dbe35f58e30a8afcbfcd29bb7ebfe
2012-08-24 10:24:02 -07:00
Keir Mierle 976ab7aca9 Remove Google-era vestigial unit test.
Change-Id: Ia7a295a5c759a17c1675a3055d287d3e40e9e0fe
2012-08-23 18:21:36 -07:00
Keir Mierle 6ad6257de0 Add a workaround for an Android NDK compiler bug.
On certain NDK build configurations, one of the innermost
parts of the Schur eliminator would get compiled
incorrectly. The compiler changed a -= to a +=.

The normal Ceres unit tests caught the problem; however,
since it is not possible to build the tests with the NDK
(only with the standalone toolchain) this was difficult to
track down. Finding the issue involved pasting the schur
eliminator unit test inside of solver_impl.cc and other such
hacks.

Change-Id: Ie91bb545d74fe39f0c8cbd1a6eb69ee4d8b25fb2
2012-08-22 11:10:31 -07:00
Sameer Agarwal aecb2dc92b Fix relative path bug in bibtex call.
Change-Id: I0d31786564320a6831259bcdf4c75a6b665c43ad
2012-08-22 10:08:17 -07:00
Sameer Agarwal 1e2892009e Update Summary::FullReport to report dogleg type.
Change-Id: I0b4be8d7486c1c4b36b299693b3fe8b0d3426537
2012-08-22 08:50:17 -07:00
Sameer Agarwal 295ade1122 Fix Eigen3 Row/Column Major storage issue.
Eigen3 does not allow column vectors to be stored in row-major
format. NumericDiffCostFunction by default stores its Jacobian
matrices in row-major format. This works fine if the residual
contains more than one variable. But if the residual block
depends on one variable and has more than one residuals, the
resulting Jacobian matrix is a column matrix in row-major format
resulting in a compile time error.

The fix is to check the template parameters and switch to column-major
storage as needed.

Thanks to Lena Gieseke for reporting this.

Change-Id: Icc51c5b38e1f3609e0e1ecb3c4e4a02aecd72c3b
2012-08-22 08:20:06 -07:00
Arnaud Gelas 9ad27e8e9f Add one uninstall target to remove all installed files
Change-Id: Ifcf89a6c27b25f28403d95a50e29c093a525298f
2012-08-22 10:44:51 +02:00
Markus Moll 0c3a748ee4 Allow equal lower and upper bound for diagonal scaling.
This way, setting the lower and upper bound both to 1.0, one can disable
the automatic trust region scaling.

Change-Id: Ifa317a6911b813a89c1cf7fdfde25af603705319
2012-08-21 14:45:46 +02:00
Arnaud Gelas 3d644b76ad Install headers, libraries and pdf
Headers are installed in ${CMAKE_INSTALL_PREFIX}/include/ceres
Libraries are installed in ${CMAKE_INSTALL_PREFIX}/lib
pdf is installed in ${CMAKE_INSTALL_PREFIX}/share/ceres/docs

Change-Id: Ic175f2c2f5fa86820a1e8c64c2ed171f4a302a68
2012-08-21 09:40:59 +02:00
Arnaud Gelas d2fb5adea4 Configure gerrit hook at CMake time
If the source directory is a clone, at CMake time the commit-msg hook gets
downloaded and installed in the right location.

Change-Id: I5fee17d050ca22d8b92a49fdcc2a1cd6659f209b
2012-08-21 09:04:47 +02:00
Arnaud Gelas 73166098fc Add one CMake option to build the examples.
Currently the examples are always built. For external projects, it is useful
not to compile the examples.

Change-Id: I41d3bde19c7e742818e60f78222d39c43992ca8b
2012-08-21 08:41:13 +02:00
Keir Mierle 86d4f1ba41 Add missing return statement.
Change-Id: I5eaf718318e27040e3c97e32ee46cf0a11176a37
2012-08-20 11:52:04 -07:00
Keir Mierle 51eb229da3 Add Program::ToString() to aid debugging.
Change-Id: I0ab37ed2fe0947ca87a152919d4e7dc9b56dedc6
2012-08-20 11:46:12 -07:00
Keir Mierle bcc7100635 Ignore minted.sty.
Change-Id: I2467a6f801812b9007b51bf14b00757f026e4322
2012-08-20 11:45:04 -07:00
Keir Mierle 9705a736dd Add ParameterBlock::ToString() to aid debugging.
Change-Id: Id3f5cb27b855c536dd65a986f345bd8eb2799dfa
2012-08-20 11:25:26 -07:00
Sameer Agarwal 0c714a70e6 Fix blanks before private in loss_function.h
Change-Id: I068bed6431bc7c9b7958af391655df61499000b2
2012-08-20 11:18:16 -07:00
Markus Moll 51cf7cbe3b Add the two-dimensional subspace search to DoglegStrategy
Change-Id: I5163744c100cdf07dd93343d0734ffe0e80364f3
2012-08-20 11:16:41 -07:00
Sameer Agarwal ad1f7b772e Add ArcTanLoss, TolerantLoss and ComposedLossFunction.
Based on work by James Roseborough.

Change-Id: Idc4e0b099028f67702bfc7fe3e43dbd96b6f9256
2012-08-20 11:11:02 -07:00
Sameer Agarwal 05292bf8fc Add a TrustRegionStrategy::Summary object.
Change-Id: I7caee35a3408ee4a0ec16ba407410d822929340d
2012-08-20 08:48:09 -07:00
Arnaud Gelas b12b906c4d Add one option to generate the PDF from CMake at build time
Make sure pygmentize is installed

Change-Id: I068ba45c33a8e96acc906a464b12d10d58b3e231
2012-08-20 09:13:21 +02:00
Sameer Agarwal b9f15a5936 Add a dense Cholesky factorization based linear solver.
For problems with a small number of variables, but a large
number of residuals, it is sometimes beneficial to use the
Cholesky factorization on the normal equations, instead of
the dense QR factorization of the Jacobian, even though it
is numerically the better thing to do.

Change-Id: I3506b006195754018deec964e6e190b7e8c9ac8f
2012-08-19 14:47:38 -07:00
Arnaud Gelas b3fa009435 Set CMAKE_*_OUTPUT_DIRECTORY
Gather
 * all executables in ${CMAKE_BINARY_DIR}/bin
 * all libraries (static and dynamic) in ${CMAKE_BINARY_DIR}/lib

Change-Id: Ibc2fa1adfb6f0aea65d66d570259b79546bf3b07
2012-08-19 08:30:14 -07:00
Sameer Agarwal 1b8a4d5d11 Fix a minor bug in detect_structure logging.
Change-Id: I117f7745e4c67595b3ff9244cde82b5b5b34ee4b
2012-08-17 16:56:10 -07:00
Keir Mierle 31c1e784ab Minor cleanups.
Change-Id: Ida4866997deeaa1bc2cebd6b69313a05ac82e457
2012-08-17 16:16:32 -07:00
Sameer Agarwal e83f7879a8 Fix SuiteSparse3 UFConfig.h detection really.
Change-Id: Id187102e755b7d778dff4363f22f9a4697ed12dd
2012-08-17 15:37:39 -07:00
Sameer Agarwal 96f25dc576 Fix SuiteSparse3 UFConfig.h detection.
Change-Id: Ia59aefdb0ad7f713f76ed79692f2db4fa2821e5b
2012-08-17 15:34:42 -07:00
Markus Moll c497bd6cd9 Add UFconfig and/or SuiteSparse_config test to CMakeLists.txt
SuiteSparse 4 requires linking to libsuitesparseconfig.a.
Both SuiteSparse 3 and SuiteSparse 4 require an additional header
(either UFconfig.h or SuiteSparse_config.h) that is not found if it is
in a separate path. Therefore, add explicit checks.

Change-Id: I699902b5db4f1b7f17134b5a54f9aa681445e294
2012-08-17 15:15:01 -07:00
Sameer Agarwal 383c04f423 Fix QuaternionToAngleAxis to ensure rotations are between -pi and pi.
Thanks to Guoxuan Zhang for reporting this.

Change-Id: I2831ca3a04d5dc6467849c290461adbe23faaea3
2012-08-17 14:32:23 -07:00
Sameer Agarwal dd2b17d7dd CERES_DONT_HAVE_PROTOCOL_BUFFERS -> CERES_NO_PROTOCOL_BUFFERS.
Change-Id: I6c9f50e4c006faf4e75a8f417455db18357f3187
2012-08-17 13:21:33 -07:00
Sameer Agarwal 8b4cb7aa2c Fix sparse linear algebra library logging in Summary::FullReport.
Change-Id: Id2c902dc86c00954fde7749c7b4a67dd94215a31
2012-08-17 13:20:06 -07:00
Markus Moll 47d26bcd3b Do not implicitly negate the step in the TrustRegionMinimizer.
In the TrustRegionMinimizer, the step is currently implicitly negated.
This is done so that the linearized residual is |r - J*step|^2, which
corresponds to J*step = r, so neither J nor r have to be modified.
However, it leads to the rather unintuitive situation that the strategy
returns a step in positive gradient direction, which you would expect to
increase the function value. One way is to rename the "step" parameter in
the strategy to "negative_step" and document it.
This patch instead moves the negation inside the strategy, just around
the linear solver call, so that it is done in a local context and easier
to document.

Change-Id: Idb258149a01f61c64e22128ea221c5a30cd89c89
2012-08-17 13:19:14 -07:00
Markus Moll 51da590c84 Remove tmp file
Change-Id: I07496fafae7b0c5c12cc26ae336e0db3b5592735
2012-08-17 12:56:09 +02:00
Sameer Agarwal 7006a1f2b1 Correct example code in Powell's function example.
Thanks to Petter Strandmark for pointing this out.

Change-Id: I967632235dccdb481396e94904bb911c9a1efe1e
2012-08-16 18:04:22 -07:00
Keir Mierle 57a44b27bc Remove unnecessary flags in NDK build.
Change-Id: Ib5b4d0b7f2d898671252734978c789b8171d96a8
2012-08-16 17:04:50 -07:00
Keir Mierle f21bee2472 Fix for fpclassify.h NDK porting work.
Change-Id: I69df1b4caf2941ed96a53e35e43ec54073f84f59
2012-08-16 17:02:43 -07:00
Keir Mierle 8ceb02cb75 Add Android NDK build files.
This adds a Android.mk build that builds a Ceres static library
suitable for embetting in larger Android applications. This is
useful when needing to build Ceres without GPL'd components, since
the standalone toolchain (needed for the CMake Android build) does
not work with STLPort.

Change-Id: I8d857237f6f82658741017d161b2e31d9a20e5a7
2012-08-16 16:31:23 -07:00
Keir Mierle 6185db22f8 Fix STLPort fpclassify portability.
Change-Id: I9418c05a160aa635574370c5e35424566781dcb0
2012-08-16 14:22:53 -07:00
Keir Mierle 5c4467873e Fix a memory leak in the LM strategy test.
Change-Id: I7c4ed74dee60f869fee9395b74a9dfc77703f2ee
2012-08-16 11:40:57 -07:00
Markus Moll d3dce27c65 Fix early return in DoglegStrategy::StepAccepted
In StepAccepted, reuse_ was not cleared if the improvement was not good
enough. This is obviously wrong as the step was taken nevertheless and
the computed entities may be completely different at the new iterate.

Change-Id: I4bf3441f71550a0595dd8c5565aedd38d03e8b2f
2012-08-16 17:27:36 +02:00
Keir Mierle d216490ce0 Support building without TR1.
Change-Id: Ib59e201198e1ff2621626ab80e6b6f2156f0d1d1
2012-08-15 19:05:20 -07:00
Markus Moll a3fb17c8de Use elliptical trust region in DoglegStrategy.
In the Levenberg-Marquardt algorithm, the diagonal of J^T J is used to
regularize the problem. This corresponds to an elliptical trust region
|| D step || <= r, where D = sqrt(diag(J^T J)).

This commit adds the same elliptical trust region to the dogleg
strategy. The trust region problem becomes

  min. x^T H x + g^T x
  s.t. || D x || <= r

By substituting y = D x, it becomes

  min. y^T D^-1 H D^-1 y + g^T D^-1 y
  s.t. || y || <= r

which is the traditional spherical trust region problem.
This commit changes the DoglegStrategy so that the Gauss-Newton point,
the gradient, and the Cauchy point are scaled correctly (without
modifying the Jacobian directly). Then the dogleg step is computed the
same way as before, and finally the step is rescaled to obtain
x = D^-1 y.

Change-Id: Iea25a9113ecba911b746e269bc6e6fe51cb59003
2012-08-15 12:01:13 -07:00
Sameer Agarwal ceda487ed8 Minor correction to the README file.
Change-Id: Ic41672692be9d924cebfa8bb4b42b628a49b8bdf
2012-08-14 14:47:13 -07:00
Keir Mierle 8e68ff395b Zero-initialize Jet derivative components.
Change-Id: I9606aadb1a1f275608f6f332858af9258a120b05
2012-08-14 14:40:42 -07:00
Sameer Agarwal 62f50d1466 Move internal/ceres/mock_log.h to internal/ceres/gmock/mock-log.h
Change-Id: I652b25b7bfb56edf814d73f2dd7c796f9af983d5
2012-08-14 14:26:13 -07:00
Sameer Agarwal 9bdb6cc759 Rename macro to avoid namespace conflicts.
Change-Id: Iecf00f67dcd6250d6919875cee79a600fccab039
2012-08-14 13:02:20 -07:00
Sameer Agarwal c6bbecf26d Consolidate path handling for test data files.
Added CERES_TEST_SRCDIR_POSTFIX macro.
Added TestFileAbsolutePath function.

Change-Id: I223b74af027bfb775447e062edab897395b21514
2012-08-14 11:35:13 -07:00