[arrayfire] 127/248: Updated SIFT/GLOH test thresholds

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Tue Nov 17 15:54:13 UTC 2015


This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch dfsg-clean
in repository arrayfire.

commit a67ea40b814e9c2800f699308e6013ec14c417a0
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date:   Tue Oct 13 15:26:08 2015 -0400

    Updated SIFT/GLOH test thresholds
---
 test/gloh_nonfree.cpp | 7 ++-----
 test/sift_nonfree.cpp | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/test/gloh_nonfree.cpp b/test/gloh_nonfree.cpp
index 6fcdd19..bdb810a 100644
--- a/test/gloh_nonfree.cpp
+++ b/test/gloh_nonfree.cpp
@@ -235,10 +235,7 @@ void glohTest(string pTestFile)
         }
 
         bool isTypeDouble = is_same_type<T, double>::value || is_same_type<T, af::cdouble>::value;
-        if (isTypeDouble)
-            EXPECT_TRUE(compareEuclidean(descDims[0], descDims[1], (float*)&v_out_desc[0], (float*)&v_gold_desc[0], 2.f, 5.5f));
-        else
-            EXPECT_TRUE(compareEuclidean(descDims[0], descDims[1], (float*)&v_out_desc[0], (float*)&v_gold_desc[0], 2.f, 3.f));
+        EXPECT_TRUE(compareEuclidean(descDims[0], descDims[1], (float*)&v_out_desc[0], (float*)&v_gold_desc[0], 2.f, 5.5f));
 
         ASSERT_EQ(AF_SUCCESS, af_release_array(inArray));
         ASSERT_EQ(AF_SUCCESS, af_release_array(inArray_f32));
@@ -328,7 +325,7 @@ TEST(GLOH, CPP)
         ASSERT_LE(fabs(out_feat[elIter].f[4] - gold_feat[elIter].f[4]), 1e-3) << "at: " << elIter << std::endl;
     }
 
-    EXPECT_TRUE(compareEuclidean(descDims[0], descDims[1], (float*)&v_out_desc[0], (float*)&v_gold_desc[0], 2.f, 3.f));
+    EXPECT_TRUE(compareEuclidean(descDims[0], descDims[1], (float*)&v_out_desc[0], (float*)&v_gold_desc[0], 2.f, 5.5f));
 
     delete[] outX;
     delete[] outY;
diff --git a/test/sift_nonfree.cpp b/test/sift_nonfree.cpp
index f2bf42e..0d31eed 100644
--- a/test/sift_nonfree.cpp
+++ b/test/sift_nonfree.cpp
@@ -235,10 +235,7 @@ void siftTest(string pTestFile, unsigned nLayers, float contrastThr, float edgeT
         }
 
         bool isTypeDouble = is_same_type<T, double>::value || is_same_type<T, af::cdouble>::value;
-        if (isTypeDouble)
-            EXPECT_TRUE(compareEuclidean(descDims[0], descDims[1], (float*)&v_out_desc[0], (float*)&v_gold_desc[0], 2.f, 4.5f));
-        else
-            EXPECT_TRUE(compareEuclidean(descDims[0], descDims[1], (float*)&v_out_desc[0], (float*)&v_gold_desc[0], 2.f, 4.f));
+        EXPECT_TRUE(compareEuclidean(descDims[0], descDims[1], (float*)&v_out_desc[0], (float*)&v_gold_desc[0], 2.f, 4.5f));
 
         ASSERT_EQ(AF_SUCCESS, af_release_array(inArray));
         ASSERT_EQ(AF_SUCCESS, af_release_array(inArray_f32));
@@ -334,7 +331,7 @@ TEST(SIFT, CPP)
         ASSERT_LE(fabs(out_feat[elIter].f[4] - gold_feat[elIter].f[4]), 1e-3) << "at: " << elIter << std::endl;
     }
 
-    EXPECT_TRUE(compareEuclidean(descDims[0], descDims[1], (float*)&v_out_desc[0], (float*)&v_gold_desc[0], 2.f, 2.f));
+    EXPECT_TRUE(compareEuclidean(descDims[0], descDims[1], (float*)&v_out_desc[0], (float*)&v_gold_desc[0], 2.f, 4.5f));
 
     delete[] outX;
     delete[] outY;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git



More information about the debian-science-commits mailing list