aboutsummaryrefslogtreecommitdiff
path: root/mp.h
diff options
context:
space:
mode:
authorSamuel Fadel <samuelfadel@gmail.com>2016-02-09 21:36:34 -0200
committerSamuel Fadel <samuelfadel@gmail.com>2016-02-09 21:36:34 -0200
commit5c26dd04dd171112d14bfb24db96cf286566e19b (patch)
tree62a2dd9370a54968bf543344153ef69a85561840 /mp.h
parent886bdd0fa43a2fcdeca306648b643b623af99f88 (diff)
Slightly reworked rewinding; added values rewinding.
Needs a solution to the problem of which values must be displayed and/or interpolated. Currently, whenever the user rewinds, the current error measure is displayed, regardless of what was being displayed before. This will probably be trivial to solve once we have a nice way of changing the current measure. * Also changed all OpenMP-powered for loops to use signed integers, requirements of OMP2.x (which is what MSVC supports currently) * The above change comes with a new header for utility functions
Diffstat (limited to 'mp.h')
-rw-r--r--mp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/mp.h b/mp.h
index 2f32c8e..8f555a2 100644
--- a/mp.h
+++ b/mp.h
@@ -13,9 +13,9 @@ arma::mat dist(const arma::mat &X, DistFunc dfunc = euclidean);
void knn(const arma::mat &dmat, arma::uword i, arma::uword k, arma::uvec &nn, arma::vec &dist);
// Evaluation measures
-typedef arma::vec (*MeasureFunc)(const arma::mat &distA, const arma::mat &distB);
arma::vec neighborhoodPreservation(const arma::mat &distA, const arma::mat &distB, arma::uword k = 10);
arma::vec silhouette(const arma::mat &distA, const arma::mat &distB, const arma::vec &labels);
+void aggregatedError(const arma::mat &distX, const arma::mat &distY, arma::vec &v);
// Techniques
arma::mat lamp(const arma::mat &X, const arma::uvec &sampleIndices, const arma::mat &Ys);