X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=clueless-kmeans.git;a=blobdiff_plain;f=clusterer.h;h=d1ff8bee69d28dd6765749722242213ad3c6054c;hp=065dd3ffab9bb4cf5841180c00049580f69479e3;hb=48d5f7c64682b2753c26360ffbc8dd1490591c1f;hpb=e83a6c8bc9daf4e36a82796cd7ca4ed7f6d686da diff --git a/clusterer.h b/clusterer.h index 065dd3f..d1ff8be 100644 --- a/clusterer.h +++ b/clusterer.h @@ -43,21 +43,20 @@ public: void initialize_clusters(int nb_points, scalar_t **points); - // Does the standard hard k-mean association + // Standard hard k-mean association scalar_t baseline_cluster_association(int nb_points, scalar_t **points, int nb_classes, int *labels, scalar_t **gamma); - // Does the same with an LP formulation, as a sanity check + // Standard k-mean association implemented as an LP optimization scalar_t baseline_lp_cluster_association(int nb_points, scalar_t **points, int nb_classes, int *labels, scalar_t **gamma); - // Does the association under constraints that each cluster gets - // associated clusters with the same class proportion as the overall - // training set + // Association under the constraint that each cluster gets the same + // class proportions as the overall training set scalar_t uninformative_lp_cluster_association(int nb_points, scalar_t **points, int nb_classes, int *labels,