Fixed lint errors due to ArgmaxLayer

diff --git a/src/caffe/layers/argmax_layer.cpp b/src/caffe/layers/argmax_layer.cpp
index 33ec1d3..e04588d 100644 (file)
--- a/src/caffe/layers/argmax_layer.cpp
+++ b/src/caffe/layers/argmax_layer.cpp
@@ -15,11 +15,11 @@ void ArgMaxLayer<Dtype>::SetUp(const vector<Blob<Dtype>*>& bottom,
   CHECK_EQ(bottom.size(), 1) << "ArgMaxLayer Layer takes 1 input.";
   CHECK_EQ(top->size(), 1) << "ArgMaxLayer Layer takes 1 output.";
   out_max_val_ = this->layer_param_.argmax_param().out_max_val();
-  // Produces max_ind and max_val
-  if (out_max_val_) { 
+  if (out_max_val_) {
+    // Produces max_ind and max_val
     (*top)[0]->Reshape(bottom[0]->num(), 2, 1, 1);
-  } // Produces only max_ind
-  else {
+  } else {
+    // Produces only max_ind
     (*top)[0]->Reshape(bottom[0]->num(), 1, 1, 1);
   }
 }
@@ -44,8 +44,7 @@ Dtype ArgMaxLayer<Dtype>::Forward_cpu(const vector<Blob<Dtype>*>& bottom,
     if (out_max_val_) {
       top_data[i * 2] = max_ind;
       top_data[i * 2 + 1] = max_val;
-    }
-    else {
+    } else {
       top_data[i] = max_ind;
     }
   }

diff --git a/src/caffe/test/test_argmax_layer.cpp b/src/caffe/test/test_argmax_layer.cpp
index 627dd57..c4150e5 100644 (file)
--- a/src/caffe/test/test_argmax_layer.cpp
+++ b/src/caffe/test/test_argmax_layer.cpp
@@ -103,7 +103,7 @@ TYPED_TEST(ArgMaxLayerTest, TestCPUMaxVal) {
     EXPECT_LE(top_data[i], dim);
     max_ind = top_data[i * 2];
     max_val = top_data[i * 2 + 1];
-    EXPECT_EQ(bottom_data[i * dim + max_ind],max_val);
+    EXPECT_EQ(bottom_data[i * dim + max_ind], max_val);
     for (int j = 0; j < dim; ++j) {
       EXPECT_LE(bottom_data[i * dim + j], max_val);
     }