projects
/
clueless-kmeans.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e83a6c8
)
Cosmetics.
author
Francois Fleuret
<francois@fleuret.org>
Wed, 27 Mar 2013 13:45:14 +0000
(14:45 +0100)
committer
Francois Fleuret
<francois@fleuret.org>
Wed, 27 Mar 2013 13:45:14 +0000
(14:45 +0100)
clusterer.h
patch
|
blob
|
history
diff --git
a/clusterer.h
b/clusterer.h
index
065dd3f
..
d1ff8be
100644
(file)
--- a/
clusterer.h
+++ b/
clusterer.h
@@
-43,21
+43,20
@@
public:
void initialize_clusters(int nb_points, scalar_t **points);
void initialize_clusters(int nb_points, scalar_t **points);
- //
Does the s
tandard hard k-mean association
+ //
S
tandard hard k-mean association
scalar_t baseline_cluster_association(int nb_points, scalar_t **points,
int nb_classes, int *labels,
scalar_t **gamma);
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);
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,
scalar_t uninformative_lp_cluster_association(int nb_points, scalar_t **points,
int nb_classes, int *labels,