Files
MINGW-packages/mingw-w64-ceres-solver/ceres-solver-1.13.0-fix-testcode-failed.patch
Sui Libin d3a4355997 fix ceres-solver-1.13.0 test code error at mingw. (#3057)
* fix ceres-solver-1.13.0 code error at mingw.

* update release version.

* add libxlsxwriter package for mingw.
2017-11-02 14:40:09 +03:00

32 lines
1.6 KiB
Diff

diff -Naur ceres-solver-1.13.0.orig/internal/ceres/levenberg_marquardt_strategy_test.cc ceres-solver-1.13.0/internal/ceres/levenberg_marquardt_strategy_test.cc
--- ceres-solver-1.13.0.orig/internal/ceres/levenberg_marquardt_strategy_test.cc 2017-08-03 15:10:55.000000000 +0800
+++ ceres-solver-1.13.0/internal/ceres/levenberg_marquardt_strategy_test.cc 2017-10-16 11:34:48.510059700 +0800
@@ -149,15 +149,8 @@
// are versions of glog which are not in the google namespace.
using namespace google;
-#if defined(_MSC_VER)
- // Use GLOG_WARNING to support MSVC if GLOG_NO_ABBREVIATED_SEVERITIES
- // is defined.
EXPECT_CALL(log, Log(GLOG_WARNING, _,
HasSubstr("Failed to compute a step")));
-#else
- EXPECT_CALL(log, Log(google::WARNING, _,
- HasSubstr("Failed to compute a step")));
-#endif
TrustRegionStrategy::Summary summary =
lms.ComputeStep(pso, &dsm, &residual, x);
diff -Naur ceres-solver-1.13.0.orig/internal/ceres/sparse_cholesky_test.cc ceres-solver-1.13.0/internal/ceres/sparse_cholesky_test.cc
--- ceres-solver-1.13.0.orig/internal/ceres/sparse_cholesky_test.cc 2017-08-03 15:10:55.000000000 +0800
+++ ceres-solver-1.13.0/internal/ceres/sparse_cholesky_test.cc 2017-10-15 21:08:40.687205600 +0800
@@ -137,7 +137,7 @@
lhs->ToDenseMatrix(&eigen_lhs);
EXPECT_NEAR((actual - expected).norm() / actual.norm(),
0.0,
- std::numeric_limits<double>::epsilon() * 10)
+ std::numeric_limits<double>::epsilon() * 15)
<< "\n"
<< eigen_lhs;
}