Corrected conditions in test_threshold

diff --git a/src/caffe/test/test_threshold_layer.cpp b/src/caffe/test/test_threshold_layer.cpp
index 25e9f02..4f87d0d 100644 (file)
--- a/src/caffe/test/test_threshold_layer.cpp
+++ b/src/caffe/test/test_threshold_layer.cpp
@@ -64,8 +64,12 @@ TYPED_TEST(ThresholdLayerTest, TestCPU) {
   for (int i = 0; i < this->blob_bottom_->count(); ++i) {
     EXPECT_GE(top_data[i], 0.);
     EXPECT_LE(top_data[i], 1.);
-    EXPECT_TRUE(top_data[i] == 0 && bottom_data[i] <= threshold_);
-    EXPECT_TRUE(top_data[i] == 1 && bottom_data[i] > threshold_);
+    if (top_data[i] == 0) {
+       EXPECT_LE(bottom_data[i],threshold_);
+    }
+    if (top_data[i] == 1) {
+       EXPECT_GT(bottom_data[i],threshold_);
+    }
   }
 }
 
@@ -86,8 +90,12 @@ TYPED_TEST(ThresholdLayerTest, TestCPU2) {
   for (int i = 0; i < this->blob_bottom_->count(); ++i) {
     EXPECT_GE(top_data[i], 0.);
     EXPECT_LE(top_data[i], 1.);
-    EXPECT_TRUE(top_data[i] == 0 && bottom_data[i] <= threshold_);
-    EXPECT_TRUE(top_data[i] == 1 && bottom_data[i] > threshold_);
+    if (top_data[i] == 0) {
+       EXPECT_LE(bottom_data[i],threshold_);
+    }
+    if (top_data[i] == 1) {
+       EXPECT_TRUE(bottom_data[i] > threshold_); 
+    }
   }
 }