aboutsummaryrefslogtreecommitdiff
path: root/dist.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'dist.cpp')
-rw-r--r--dist.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/dist.cpp b/dist.cpp
index 0a241ec..f307564 100644
--- a/dist.cpp
+++ b/dist.cpp
@@ -1,5 +1,7 @@
#include "mp.h"
+#include "utils.h"
+
double mp::euclidean(const arma::rowvec &x1, const arma::rowvec &x2)
{
return arma::norm(x1 - x2, 2);
@@ -7,11 +9,11 @@ double mp::euclidean(const arma::rowvec &x1, const arma::rowvec &x2)
arma::mat mp::dist(const arma::mat &X, mp::DistFunc dfunc)
{
- arma::uword n = X.n_rows;
+ int n = uintToInt<arma::uword, int>(X.n_rows);
arma::mat D(n, n, arma::fill::zeros);
- #pragma omp parallel for shared(X, D)
- for (arma::uword i = 0; i < n; i++) {
+ #pragma omp parallel for shared(X, D, n)
+ for (int i = 0; i < n; i++) {
for (arma::uword j = 0; j < i; j++) {
D(i, j) = dfunc(X.row(i), X.row(j));
D(j, i) = D(i, j);