aboutsummaryrefslogtreecommitdiff
path: root/dist.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'dist.cpp')
-rw-r--r--dist.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/dist.cpp b/dist.cpp
index aaa2167..a5620ad 100644
--- a/dist.cpp
+++ b/dist.cpp
@@ -5,14 +5,14 @@ double mp::euclidean(const arma::rowvec &x1, const arma::rowvec &x2)
return arma::norm(x1 - x2, 2);
}
-arma::mat mp::dist(const arma::mat &X, double (*distCalc)(const arma::rowvec &, const arma::rowvec &))
+arma::mat mp::dist(const arma::mat &X, mp::DistFunc dfunc)
{
arma::uword n = X.n_rows;
arma::mat D(n, n, arma::fill::zeros);
for (arma::uword i = 0; i < n; i++)
for (arma::uword j = 0; j < i; j++) {
- D(i, j) = distCalc(X.row(i), X.row(j));
+ D(i, j) = dfunc(X.row(i), X.row(j));
D(j, i) = D(i, j);
}