[mlpack-git] master: template order (edbc0f1)

[gitdub at big.cc.gt.atl.ga.us]

Repository : https://github.com/mlpack/mlpack

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/ee384655c4462e422e343e9725437fd772ca4449...182d4a629c1b23f683dff7b284844e4e3e9f5cc4

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

commit edbc0f1e1f51be9139cf93ed891f0ebefeb6362f
Author: HurricaneTong <HurricaneTong at HurricaneTong.local>
Date:   Wed Jan 21 00:01:02 2015 +0800

    template order


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

edbc0f1e1f51be9139cf93ed891f0ebefeb6362f
 src/mlpack/methods/mean_shift/mean_shift.hpp      |  4 ++--
 src/mlpack/methods/mean_shift/mean_shift_impl.hpp | 16 ++++++++--------
 src/mlpack/methods/mean_shift/mean_shift_main.cpp |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/mlpack/methods/mean_shift/mean_shift.hpp b/src/mlpack/methods/mean_shift/mean_shift.hpp
index 19f9082..09a27d4 100644
--- a/src/mlpack/methods/mean_shift/mean_shift.hpp
+++ b/src/mlpack/methods/mean_shift/mean_shift.hpp
@@ -34,8 +34,8 @@ namespace meanshift /** Mean Shift clustering. */ {
  * @tparam KernelType the kernel to use.
  */
   
-template<typename MatType = arma::mat,
-         typename KernelType = kernel::GaussianKernel>
+template<typename KernelType = kernel::GaussianKernel,
+         typename MatType = arma::mat>
 class MeanShift
 {
  public:
diff --git a/src/mlpack/methods/mean_shift/mean_shift_impl.hpp b/src/mlpack/methods/mean_shift/mean_shift_impl.hpp
index 1cbf85d..0e4d8c7 100644
--- a/src/mlpack/methods/mean_shift/mean_shift_impl.hpp
+++ b/src/mlpack/methods/mean_shift/mean_shift_impl.hpp
@@ -14,11 +14,11 @@ namespace meanshift {
 /**
   * Construct the Mean Shift object.
   */
-template<typename MatType,
-         typename KernelType>
+template<typename KernelType,
+         typename MatType>
 MeanShift<
-    MatType,
-    KernelType>::
+  KernelType,
+  MatType>::
 MeanShift(const double duplicateThresh,
           const size_t maxIterations,
           const double stopThresh,
@@ -35,11 +35,11 @@ MeanShift(const double duplicateThresh,
   * Perform Mean Shift clustering on the data, returning a list of cluster
   * assignments and centroids.
   */
-template<typename MatType,
-         typename KernelType>
+template<typename KernelType,
+         typename MatType>
 inline void MeanShift<
-    MatType,
-    KernelType>::
+    KernelType,
+    MatType>::
 Cluster(const MatType& data,
         arma::Col<size_t>& assignments,
         arma::mat& centroids) {
diff --git a/src/mlpack/methods/mean_shift/mean_shift_main.cpp b/src/mlpack/methods/mean_shift/mean_shift_main.cpp
index 983db63..b85a176 100644
--- a/src/mlpack/methods/mean_shift/mean_shift_main.cpp
+++ b/src/mlpack/methods/mean_shift/mean_shift_main.cpp
@@ -72,7 +72,7 @@ int main(int argc, char** argv) {
   kernel::GaussianKernel kernel;
   kernel.Bandwidth(bandwidth);
   
-  MeanShift<arma::mat, kernel::GaussianKernel> meanShift(duplicateThresh,
+  MeanShift<> meanShift(duplicateThresh,
                                                          maxIterations, stopThresh, kernel);
   Timer::Start("clustering");
   meanShift.Cluster(dataset, assignments, centroids);