Fixed contrastive loss layer to be the same as proposed in Hadsell et al 2006#2321

Merged

shelhamer merged 3 commits intoBVLC:masterfrom

nickcarlevaris:contrastive_loss_fix

May 12, 2015

Commits on Apr 17, 2015

Fixed contrastive loss layer to be the same as proposed in Hadsell et al 2006
Nick Carlevaris-Bianco
committed

Commits on Apr 21, 2015

added epsilon to prevent possible division by zero in gradient calculation
Nick Carlevaris-Bianco
committed

Commits on May 4, 2015

Added support for original implementation, using (margin - d^2), through the
Nick Carlevaris-Bianco
committed