[mlpack-git] master: backported sub2ind & ind2sub (1dfb208)

gitdub at mlpack.org gitdub at mlpack.org
Mon Jun 6 17:09:53 EDT 2016


Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/630efbe8c55e9072cc2be03a8033199ed2836177...b29bad9f77af89306ba48fb918c7772b72f19eac

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

commit 1dfb208c7f4d652a2d194d8e5159e816cf629cb8
Author: nilayjain <nilayjain13 at gmail.com>
Date:   Mon Jun 6 21:09:53 2016 +0000

    backported sub2ind & ind2sub


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

1dfb208c7f4d652a2d194d8e5159e816cf629cb8
 src/mlpack/core/arma_extend/fn_ind2sub.hpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mlpack/core/arma_extend/fn_ind2sub.hpp b/src/mlpack/core/arma_extend/fn_ind2sub.hpp
index b4bbfe7..7991b9d 100644
--- a/src/mlpack/core/arma_extend/fn_ind2sub.hpp
+++ b/src/mlpack/core/arma_extend/fn_ind2sub.hpp
@@ -1,5 +1,6 @@
   
-  #if (ARMA_VERSION_MAJOR < 6 && ARMA_VERSION_MINOR < 399)
+  #if (ARMA_VERSION_MAJOR < 6 || \
+    (ARMA_VERSION_MAJOR == 6 && ARMA_VERSION_MINOR < 399))
   inline
   uvec
   ind2sub(const SizeMat& s, const uword i)




More information about the mlpack-git mailing list