From 6da67a32e56c101b9334d2c6f33bd5238d082330 Mon Sep 17 00:00:00 2001 From: Samuel Fadel Date: Fri, 24 Jul 2015 13:01:16 -0300 Subject: Color mapping in Scatterplot and initial measures. - Scatterplot: can now map any floating point data to colors; - Scatterplot: somewhat optimized geometry/material updates; - Removed anything related to labels where it was not necessary; - Added observers to implement distortion (via measures) visualization; - Added skeleton implementations of NP and silhouette. --- dist.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dist.cpp') 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); } -- cgit v1.2.3