projects
/
cmim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Recoded to UTF-8.
[cmim.git]
/
fastentropy.h
diff --git
a/fastentropy.h
b/fastentropy.h
index
af4914c
..
5abd6fe
100644
(file)
--- a/
fastentropy.h
+++ b/
fastentropy.h
@@
-13,7
+13,7
@@
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
// //
// Written by Francois Fleuret //
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
// //
// Written by Francois Fleuret //
-//
(C) Ecole Polytechnique Federale de Lausanne
//
+//
Copyright (C) Ecole Polytechnique Federale de Lausanne
//
// Contact <francois.fleuret@epfl.ch> for comments & bug reports //
//////////////////////////////////////////////////////////////////////////////////
// Contact <francois.fleuret@epfl.ch> for comments & bug reports //
//////////////////////////////////////////////////////////////////////////////////
@@
-66,7
+66,7
@@
inline int fe_count_and_not_not(int n, uint32_t *a, uint32_t *b) {
// This selection maximises the conditional mutual information between
// the features and the class to predict, given any feature already
// This selection maximises the conditional mutual information between
// the features and the class to predict, given any feature already
-// picked
+// picked
. Call fe_init_tables() beforehand.
void fe_selection_cmim(int nb_samples,
int nb_total_features, uint32_t **x, uint32_t *y,
void fe_selection_cmim(int nb_samples,
int nb_total_features, uint32_t **x, uint32_t *y,
@@
-74,7
+74,7
@@
void fe_selection_cmim(int nb_samples,
// This selection maximises the mutual information between the
// features and the class to predict, without taking care of the
// This selection maximises the mutual information between the
// features and the class to predict, without taking care of the
-// redundancy
+// redundancy
. Call fe_init_tables() beforehand.
void fe_selection_mim(int nb_samples,
int nb_total_features, uint32_t **x, uint32_t *y,
void fe_selection_mim(int nb_samples,
int nb_total_features, uint32_t **x, uint32_t *y,