[mlpack-git] master: Merge branch 'feature/det_sparse' of https://github.com/thejonan/mlpack into thejonan-feature/det_sparse (bfb199a)

gitdub at mlpack.org gitdub at mlpack.org
Tue Nov 1 13:55:38 EDT 2016


Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/94d14187222231ca29e4f6419c5999c660db4f8a...981ffa2d67d8fe38df6c699589005835fef710ea

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

commit bfb199a0cd9335a569e1e9caa59e15d5674fcbb2
Merge: 94d1418 10812ca
Author: Ryan Curtin <ryan at ratml.org>
Date:   Tue Nov 1 13:55:38 2016 -0400

    Merge branch 'feature/det_sparse' of https://github.com/thejonan/mlpack into thejonan-feature/det_sparse


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

bfb199a0cd9335a569e1e9caa59e15d5674fcbb2
 .gitignore                                         |   2 +
 COPYRIGHT.txt                                      |   1 +
 src/mlpack/core.hpp                                |   1 +
 src/mlpack/core/arma_extend/Mat_extra_bones.hpp    |   9 +
 src/mlpack/core/arma_extend/SpMat_extra_bones.hpp  |   8 +
 src/mlpack/methods/det/CMakeLists.txt              |   6 +-
 src/mlpack/methods/det/det_main.cpp                |   5 +-
 src/mlpack/methods/det/dt_utils.hpp                |  23 +-
 .../det/{dt_utils.cpp => dt_utils_impl.hpp}        |  84 ++--
 src/mlpack/methods/det/dtree.hpp                   | 103 ++---
 .../methods/det/{dtree.cpp => dtree_impl.hpp}      | 447 ++++++++++++++-------
 src/mlpack/tests/det_test.cpp                      | 162 +++++++-
 src/mlpack/tests/serialization_test.cpp            |  15 +-
 13 files changed, 569 insertions(+), 297 deletions(-)

diff --cc src/mlpack/methods/det/dtree_impl.hpp
index a0bf2e6,a3e1567..5625006
--- a/src/mlpack/methods/det/dtree_impl.hpp
+++ b/src/mlpack/methods/det/dtree_impl.hpp
@@@ -1,15 -1,13 +1,15 @@@
-  /**
+ /**
   * @file dtree.cpp
   * @author Parikshit Ram (pram at cc.gatech.edu)
++ * @author Ivan Georgiev (ivan at jonan.info) (sparsification and optimizations)
   *
   * Implementations of some declared functions in
   * the Density Estimation Tree class.
   *
 - * Sparsification and optimizations.
 - * @author Ivan Georgiev (ivan at jonan.info)
-- *
 + * mlpack is free software; you may redistribute it and/or modify it under the
 + * terms of the 3-clause BSD license.  You should have received a copy of the
 + * 3-clause BSD license along with mlpack.  If not, see
 + * http://www.opensource.org/licenses/BSD-3-Clause for more information.
   */
  #include "dtree.hpp"
  #include <stack>




More information about the mlpack-git mailing list