[mlpack-git] master: branch conflict resolved (d1c2ae0)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/460e326cb2dd1025d45f424bc70967f8d76a4c2f...78f6ac2e036f659c81be032ebbec55b98fe7461f

>---------------------------------------------------------------

commit d1c2ae0b09d028cb455f8f00c755ddf57f2025dd
Merge: 3f2d6ab 460e326
Author: ranjan1990 <ranjan.rbc at gmail.com>
Date:   Tue Apr 12 00:36:16 2016 +0530

    branch conflict resolved


>---------------------------------------------------------------

d1c2ae0b09d028cb455f8f00c755ddf57f2025dd
 COPYRIGHT.txt                                      |   1 +
 src/mlpack/core.hpp                                |   1 +
 src/mlpack/methods/ann/cnn.hpp                     |   6 +-
 src/mlpack/methods/ann/ffn.hpp                     |   6 +-
 src/mlpack/methods/ann/ffn_impl.hpp                |   6 +
 src/mlpack/methods/ann/layer/bias_layer.hpp        |  29 +-
 .../ann/layer/binary_classification_layer.hpp      |  20 +-
 src/mlpack/methods/ann/layer/constant_layer.hpp    | 116 +++++++
 src/mlpack/methods/ann/layer/conv_layer.hpp        |   9 +-
 src/mlpack/methods/ann/layer/dropconnect_layer.hpp |  23 +-
 src/mlpack/methods/ann/layer/empty_layer.hpp       |   6 +-
 src/mlpack/methods/ann/layer/linear_layer.hpp      |  29 +-
 .../{softmax_layer.hpp => log_softmax_layer.hpp}   |  81 +++--
 src/mlpack/methods/ann/layer/lstm_layer.hpp        |  18 +-
 src/mlpack/methods/ann/layer/recurrent_layer.hpp   |   7 +-
 src/mlpack/methods/ann/layer/sparse_bias_layer.hpp |   7 +-
 .../methods/ann/layer/sparse_input_layer.hpp       |  12 +-
 .../methods/ann/layer/sparse_output_layer.hpp      |  10 +-
 src/mlpack/methods/ann/network_util.hpp            |  93 ++++++
 src/mlpack/methods/ann/network_util_impl.hpp       | 109 +++++++
 src/mlpack/methods/ann/rnn.hpp                     |  16 +-
 src/mlpack/methods/ann/rnn_impl.hpp                |  10 +-
 src/mlpack/methods/lsh/lsh_main.cpp                |   7 +-
 src/mlpack/tests/lsh_test.cpp                      | 360 ++++++++++++++++-----
 src/mlpack/tests/network_util_test.cpp             | 123 +++++--
 25 files changed, 884 insertions(+), 221 deletions(-)

diff --cc COPYRIGHT.txt
index 1854c34,db781f4..d04af2c
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@@ -53,7 -53,7 +53,8 @@@ Copyright
    Copyright 2016, Dhawal Arora <d.p.arora1 at gmail.com>
    Copyright 2016, Alexander Leinoff <alexander-leinoff at uiowa.edu>
    Copyright 2016, Palash Ahuja <abhor902 at gmail.com>
+   Copyright 2016, Yannis Mentekidis <mentekid at gmail.com>
 +  Copyright 2016, Ranjan Mondal <ranjan.rev at gmail.com>
  License: BSD-3-clause
    All rights reserved.
    .
diff --cc src/mlpack/core.hpp
index 74fce74,6bf111f..6e106f8
--- a/src/mlpack/core.hpp
+++ b/src/mlpack/core.hpp
@@@ -188,7 -188,7 +188,8 @@@
   *   - Dhawal Arora <d.p.arora1 at gmail.com>
   *   - Alexander Leinoff <alexander-leinoff at uiowa.edu>
   *   - Palash Ahuja <abhor902 at gmail.com>
+  *   - Yannis Mentekidis <mentekid at gmail.com>
 + *   - Ranjan Mondal <ranjan.rev at gmail.com>
   */
  
  // First, include all of the prerequisites.