nocnokneo pushed to ceres-solver (f21). "Fix improperly ported patch to fix failing unit test small_blas_test"

[notifications at fedoraproject.org]

>From b38ac278d9c5279aa7636ac574fed40e9d90e172 Mon Sep 17 00:00:00 2001
From: Taylor Braun-Jones <taylor.braun-jones at ge.com>
Date: Sat, 4 Apr 2015 09:08:23 -0400
Subject: Fix improperly ported patch to fix failing unit test small_blas_test


diff --git a/0002-Increase-tolerance-in-small_blas-test-for-Cygwin.patch b/0002-Increase-tolerance-in-small_blas-test-for-Cygwin.patch
index 2678ed4..33b42de 100644
--- a/0002-Increase-tolerance-in-small_blas-test-for-Cygwin.patch
+++ b/0002-Increase-tolerance-in-small_blas-test-for-Cygwin.patch
@@ -1,32 +1,58 @@
-From 99f953d5d97c7e6366879643a6e391bffb5cdf54 Mon Sep 17 00:00:00 2001
+From d128f103f2aeaf8ed329658b8604eecfc35981d6 Mon Sep 17 00:00:00 2001
 From: Alex Stewart <alexs.mac at gmail.com>
 Date: Mon, 30 Mar 2015 19:54:26 +0100
 Subject: [PATCH] Increase tolerance in small_blas test for Cygwin.
 
 - Previous tolerance of 2.0 * std::numeric_limits<double>::epsilon()
-  was too tight for Cygwin, worked on all other known platforms.
+was too tight for Cygwin, worked on all other known platforms.
 
 Change-Id: Ia79ad8961272dbb608d8e8ddd3f6d52e5f0735f4
 
 Conflicts:
 	internal/ceres/small_blas_test.cc
 ---
- internal/ceres/small_blas_test.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ internal/ceres/small_blas_test.cc | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/internal/ceres/small_blas_test.cc b/internal/ceres/small_blas_test.cc
-index b8b5bc5..5efceb5 100644
+index b8b5bc5..f7c8475 100644
 --- a/internal/ceres/small_blas_test.cc
 +++ b/internal/ceres/small_blas_test.cc
-@@ -37,7 +37,7 @@ namespace ceres {
+@@ -36,8 +36,9 @@
+ namespace ceres {
  namespace internal {
  
++const double kTolerance = 3.0 * std::numeric_limits<double>::epsilon();
++
  TEST(BLAS, MatrixMatrixMultiply) {
 -  const double kTolerance = 1e-16;
-+  const double kTolerance = 3.0 * std::numeric_limits<double>::epsilon();;
    const int kRowA = 3;
    const int kColA = 5;
    Matrix A(kRowA, kColA);
+@@ -120,7 +121,6 @@ TEST(BLAS, MatrixMatrixMultiply) {
+ }
+ 
+ TEST(BLAS, MatrixTransposeMatrixMultiply) {
+-  const double kTolerance = 1e-16;
+   const int kRowA = 5;
+   const int kColA = 3;
+   Matrix A(kRowA, kColA);
+@@ -202,7 +202,6 @@ TEST(BLAS, MatrixTransposeMatrixMultiply) {
+ }
+ 
+ TEST(BLAS, MatrixVectorMultiply) {
+-  const double kTolerance = 1e-16;
+   const int kRowA = 5;
+   const int kColA = 3;
+   Matrix A(kRowA, kColA);
+@@ -251,7 +250,6 @@ TEST(BLAS, MatrixVectorMultiply) {
+ }
+ 
+ TEST(BLAS, MatrixTransposeVectorMultiply) {
+-  const double kTolerance = 1e-16;
+   const int kRowA = 5;
+   const int kColA = 3;
+   Matrix A(kRowA, kColA);
 -- 
 1.8.3.1
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/ceres-solver.git/commit/?h=f21&id=b38ac278d9c5279aa7636ac574fed40e9d90e172