Clean up the last few proxy functions.

Author: rcurtin

include/ensmallen_bits/utility/proxies.hpp

@@ -159,50 +159,6 @@ struct ForwardTypeHelper<ElemType, true>
 };
 #endif
 
-// Proxy for `arma::shuffle` or `coot::shuffle` based on the data type.
-template<typename MatType>
-typename std::enable_if<
-    IsCootType<MatType>::value, typename ForwardType<MatType>::uvec>::type
-sort_index(const MatType& input)
-{
-  #ifdef USE_COOT
-  return coot::sort_index(input);
-  #else
-  return arma::sort_index(input);
-  #endif
-}
-
-// Armadillo proxy for `arma::sort_index` if `MatType` is not a Coot type.
-template<typename MatType>
-typename std::enable_if<
-    !IsCootType<MatType>::value, typename ForwardType<MatType>::uvec>::type
-sort_index(const MatType& input)
-{
-  return arma::sort_index(input);
-}
-
-// Proxy for `arma::linspace` or `coot::linspace` based on the data type.
-template<typename OutputType>
-inline static typename std::enable_if<
-    !arma::is_arma_type<OutputType>::value, OutputType>::type
-linspace(const double start, const double end, const size_t num = 100u)
-{
-  #ifdef USE_COOT
-  return coot::linspace<OutputType>(start, end, num);
-  #else
-  return arma::linspace<OutputType>(start, end, num);
-  #endif
-}
-
-// Armadillo proxy for `arma::linspace` if `OutputType` is an Armadillo type.
-template<typename OutputType>
-inline static typename std::enable_if<
-    arma::is_arma_type<OutputType>::value, OutputType>::type
-linspace(const double start, const double end, const size_t num = 100u)
-{
-  return arma::linspace<OutputType>(start, end, num);
-}
-
 } // namespace ens
 
 #endif

include/ensmallen_bits/utility/using.hpp

@@ -34,6 +34,7 @@ using coot::dot;
 using coot::exp;
 using coot::join_cols;
 using coot::join_rows;
+using coot::linspace;
 using coot::log;
 using coot::max;
 using coot::mean;
@@ -78,6 +79,7 @@ using arma::dot;
 using arma::exp;
 using arma::join_cols;
 using arma::join_rows;
+using arma::linspace;
 using arma::log;
 using arma::max;
 using arma::mean;