[mlpack-git] master: Use Center() instead of Centroid(). (0d9213f)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Thu Jul 16 12:16:49 EDT 2015


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

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/b4659b668021db631b3c8a48e3d735b513706fdc...015d79104286231ef70ea0ba1d99a6c397025b3e

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

commit 0d9213f60d073f6372f99a88bd7d147284aa158b
Author: Ryan Curtin <ryan at ratml.org>
Date:   Thu Jul 16 16:15:54 2015 +0000

    Use Center() instead of Centroid().


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

0d9213f60d073f6372f99a88bd7d147284aa158b
 src/mlpack/methods/fastmks/fastmks_rules_impl.hpp | 16 ++++++++--------
 src/mlpack/methods/fastmks/fastmks_stat.hpp       |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/mlpack/methods/fastmks/fastmks_rules_impl.hpp b/src/mlpack/methods/fastmks/fastmks_rules_impl.hpp
index 34290a6..f85c947 100644
--- a/src/mlpack/methods/fastmks/fastmks_rules_impl.hpp
+++ b/src/mlpack/methods/fastmks/fastmks_rules_impl.hpp
@@ -157,10 +157,10 @@ double FastMKSRules<KernelType, TreeType>::Score(const size_t queryIndex,
   }
   else
   {
-    arma::vec refCentroid;
-    referenceNode.Centroid(refCentroid);
+    arma::vec refCenter;
+    referenceNode.Center(refCenter);
 
-    kernelEval = kernel.Evaluate(querySet.col(queryIndex), refCentroid);
+    kernelEval = kernel.Evaluate(querySet.col(queryIndex), refCenter);
   }
 
   referenceNode.Stat().LastKernel() = kernelEval;
@@ -325,12 +325,12 @@ double FastMKSRules<KernelType, TreeType>::Score(TreeType& queryNode,
   else
   {
     // Calculate the maximum possible kernel value.
-    arma::vec queryCentroid;
-    arma::vec refCentroid;
-    queryNode.Centroid(queryCentroid);
-    referenceNode.Centroid(refCentroid);
+    arma::vec queryCenter;
+    arma::vec refCenter;
+    queryNode.Center(queryCenter);
+    referenceNode.Center(refCenter);
 
-    kernelEval = kernel.Evaluate(queryCentroid, refCentroid);
+    kernelEval = kernel.Evaluate(queryCenter, refCenter);
 
     traversalInfo.LastBaseCase() = kernelEval;
   }
diff --git a/src/mlpack/methods/fastmks/fastmks_stat.hpp b/src/mlpack/methods/fastmks/fastmks_stat.hpp
index 9cbef10..9a20435 100644
--- a/src/mlpack/methods/fastmks/fastmks_stat.hpp
+++ b/src/mlpack/methods/fastmks/fastmks_stat.hpp
@@ -65,10 +65,10 @@ class FastMKSStat
     else
     {
       // Calculate the centroid.
-      arma::vec centroid;
-      node.Centroid(centroid);
+      arma::vec center;
+      node.Center(center);
 
-      selfKernel = sqrt(node.Metric().Kernel().Evaluate(centroid, centroid));
+      selfKernel = sqrt(node.Metric().Kernel().Evaluate(center, center));
     }
   }
 



More information about the mlpack-git mailing list