[mlpack-git] master: Merge pull request #2 from mlpack/master (170c3a2)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/fd84f3a2e53592d723a8e8a76dadb8aa76820913...1a9c41a86be1fa1dcc5c3b90dd959c2255c3bb8e

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

commit 170c3a20e7ec9e7f44a0236d640ce306c514c97e
Merge: 171c35b a2e57d6
Author: Grzegorz Krajewski <krajekg at gmail.com>
Date:   Tue Mar 1 21:32:10 2016 +0100

    Merge pull request #2 from mlpack/master
    
    Update from master


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

170c3a20e7ec9e7f44a0236d640ce306c514c97e
 README.md                                          |  2 +-
 .../binary_space_tree/binary_space_tree_impl.hpp   |  6 ++----
 src/mlpack/methods/ann/layer/conv_layer.hpp        | 20 ------------------
 src/mlpack/methods/ann/layer/dropout_layer.hpp     | 16 ---------------
 src/mlpack/methods/ann/layer/linear_layer.hpp      | 14 -------------
 src/mlpack/methods/ann/layer/lstm_layer.hpp        | 15 --------------
 .../ann/layer/multiclass_classification_layer.hpp  |  8 ++++++++
 src/mlpack/methods/ann/layer/one_hot_layer.hpp     |  8 ++++++++
 src/mlpack/methods/ann/layer/pooling_layer.hpp     | 24 ++++++++--------------
 src/mlpack/methods/ann/layer/recurrent_layer.hpp   | 14 -------------
 src/mlpack/methods/ann/layer/softmax_layer.hpp     | 14 -------------
 src/mlpack/methods/ann/layer/sparse_bias_layer.hpp | 14 -------------
 .../methods/ann/layer/sparse_input_layer.hpp       | 15 --------------
 .../methods/ann/layer/sparse_output_layer.hpp      | 17 ---------------
 src/mlpack/methods/det/dtree.cpp                   |  7 ++-----
 15 files changed, 29 insertions(+), 165 deletions(-)