Removed L2HingeLoss class now a case within HingeLoss class

Conflicts:
	include/caffe/vision_layers.hpp
	src/caffe/layers/loss_layer.cpp
	src/caffe/proto/caffe.proto
	src/caffe/test/test_l2_hinge_loss_layer.cpp

diff --git a/src/caffe/proto/caffe.proto b/src/caffe/proto/caffe.proto
index f1e82f1bfda4d9b8a97c1647faf9800b1846be4b..b15172fa1ef5ea25bd42bc2eb9d641f790c905c9 100644 (file)
--- a/src/caffe/proto/caffe.proto
+++ b/src/caffe/proto/caffe.proto
@@ -307,9 +307,9 @@ message HDF5OutputParameter {
 }
 
 message HingeLossParameter {
-  enum Norm {
-    L1 = 0;
-    L2 = 1;    
+  enum Norm {    
+    L1 = 1;
+    L2 = 2;    
   }
   // Specify the Norm to use L1 or L2
   optional Norm hinge_norm = 1 [default = L1];