From: Benjamin Auder Date: Tue, 15 Nov 2016 11:54:00 +0000 (+0100) Subject: 'update' X-Git-Url: https://git.auder.net/variants/current/css/img/scripts/R.css?a=commitdiff_plain;h=0c393effd785e90f9414f2132f6732cabef7c176;p=epclust.git 'update' --- diff --git a/code/stage1/src/Algorithm/pam.c b/code/stage1/src/Algorithm/pam.c index 7cde367..ecd72c3 100644 --- a/code/stage1/src/Algorithm/pam.c +++ b/code/stage1/src/Algorithm/pam.c @@ -107,7 +107,7 @@ void pam(Real* dissimilarities, uint32_t nbItems, uint32_t nbClusters, int clust } else // No information: complete random sampling - sample(ctrs, nbItems, nbClusters); + sample(ctrs, nbItems, nbClusters); for (uint32_t j = 0; j < nbClusters; j++) oldCtrs[j] = 0; uint32_t kounter = 0; diff --git a/code/stage1/src/Algorithm/pam.h b/code/stage1/src/Algorithm/pam.h index 106919f..14274c8 100644 --- a/code/stage1/src/Algorithm/pam.h +++ b/code/stage1/src/Algorithm/pam.h @@ -7,7 +7,7 @@ #define MAXITER 100 // Core PAM algorithm from a 'flat' dissimilarity matrix -void pam(Real* dissimilarities, uint32_t nbItems, uint32_t nbClusters, +void pam(Real* dissimilarities, uint32_t nbItems, uint32_t nbClusters, int clustOnMedoids, uint32_t nbStart, uint32_t maxNbIter, Result_t* result); #endif