Skip to content

Commit 6f07981

Browse files
mlamprosmlampros
committed
updated files
1 parent ef47bab commit 6f07981

File tree

3 files changed

+24
-28
lines changed

3 files changed

+24
-28
lines changed

‎DESCRIPTION‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Package: ClusterR
22
Type: Package
33
Title: Gaussian Mixture Models, K-Means, Mini-Batch-Kmeans, K-Medoids and Affinity Propagation Clustering
4-
Version: 1.3.5
5-
Date: 2025-09-14
4+
Version: 1.3.6
5+
Date: 2025-12-22
66
Authors@R: c( person(given = "Lampros", family = "Mouselimis", email = "[email protected]", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-8024-1546")), person(given = "Conrad", family = "Sanderson", role = "cph", comment = "Author of the C++ Armadillo library"), person(given = "Ryan", family = "Curtin", role = "cph", comment = "Author of the C++ Armadillo library"), person(given = "Siddharth", family = "Agrawal", role = "cph", comment = "Author of the C code of the Mini-Batch-Kmeans algorithm (https://github.com/siddharth-agrawal/Mini-Batch-K-Means)"), person(given = "Brendan", family = "Frey", email = "[email protected]", role = "cph", comment = "Author of the matlab code of the Affinity propagation algorithm (for commercial use please contact the author of the matlab code)"), person(given = "Delbert", family = "Dueck", role = "cph", comment = "Author of the matlab code of the Affinity propagation algorithm"), person(given = "Vitalie", family = "Spinu", email = "[email protected]", role = "ctb", comment = "Github Contributor"),person(given = "Frederiek - Maarten", family = "Kerckhof", email = "[email protected]", role = "ctb", comment = "Github Contributor") )
77
BugReports: https://github.com/mlampros/ClusterR/issues
88
URL: https://github.com/mlampros/ClusterR, https://mlampros.github.io/ClusterR/

‎src/.gitignore‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎src/init.c‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,62 +8,61 @@
88
*/
99

1010
/* .Call calls */
11-
extern SEXP _ClusterR_affinity_propagation(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
12-
extern SEXP _ClusterR_check_NaN_Inf(SEXP);
1311
extern SEXP _ClusterR_ClaraMedoids(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
1412
extern SEXP _ClusterR_ClusterMedoids(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
15-
extern SEXP _ClusterR_cost_clusters_from_dis_meds(SEXP, SEXP);
16-
extern SEXP _ClusterR_dissim_mat(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
17-
extern SEXP _ClusterR_dissim_MEDOIDS(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
18-
extern SEXP _ClusterR_evaluation_rcpp(SEXP, SEXP, SEXP);
1913
extern SEXP _ClusterR_GMM_arma(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
2014
extern SEXP _ClusterR_GMM_arma_AIC_BIC(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
2115
extern SEXP _ClusterR_KMEANS_arma(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
2216
extern SEXP _ClusterR_KMEANS_rcpp(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
17+
extern SEXP _ClusterR_OptClust(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
18+
extern SEXP _ClusterR_Predict_mini_batch_kmeans(SEXP, SEXP, SEXP, SEXP);
19+
extern SEXP _ClusterR_SCALE(SEXP, SEXP, SEXP);
20+
extern SEXP _ClusterR_affinity_propagation(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
21+
extern SEXP _ClusterR_check_NaN_Inf(SEXP);
22+
extern SEXP _ClusterR_cost_clusters_from_dis_meds(SEXP, SEXP);
23+
extern SEXP _ClusterR_dissim_MEDOIDS(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
24+
extern SEXP _ClusterR_dissim_mat(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
25+
extern SEXP _ClusterR_evaluation_rcpp(SEXP, SEXP, SEXP);
2326
extern SEXP _ClusterR_mini_batch_kmeans(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
2427
extern SEXP _ClusterR_opt_clust_fK(SEXP, SEXP, SEXP);
25-
extern SEXP _ClusterR_OptClust(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
26-
extern SEXP _ClusterR_predict_medoids(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
2728
extern SEXP _ClusterR_predict_MGausDPDF(SEXP, SEXP, SEXP, SEXP, SEXP);
2829
extern SEXP _ClusterR_predict_MGausDPDF_full(SEXP, SEXP, SEXP, SEXP, SEXP);
29-
extern SEXP _ClusterR_Predict_mini_batch_kmeans(SEXP, SEXP, SEXP, SEXP);
30+
extern SEXP _ClusterR_predict_medoids(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
3031
extern SEXP _ClusterR_preferenceRange(SEXP, SEXP, SEXP);
31-
extern SEXP _ClusterR_SCALE(SEXP, SEXP, SEXP);
3232
extern SEXP _ClusterR_silhouette_clusters(SEXP, SEXP);
3333
extern SEXP _ClusterR_split_rcpp_lst(SEXP);
3434
extern SEXP _ClusterR_validate_centroids(SEXP, SEXP, SEXP, SEXP, SEXP);
3535

36-
37-
3836
static const R_CallMethodDef CallEntries[] = {
39-
{"_ClusterR_affinity_propagation", (DL_FUNC) &_ClusterR_affinity_propagation, 9},
40-
{"_ClusterR_check_NaN_Inf", (DL_FUNC) &_ClusterR_check_NaN_Inf, 1},
4137
{"_ClusterR_ClaraMedoids", (DL_FUNC) &_ClusterR_ClaraMedoids, 11},
4238
{"_ClusterR_ClusterMedoids", (DL_FUNC) &_ClusterR_ClusterMedoids, 9},
43-
{"_ClusterR_cost_clusters_from_dis_meds", (DL_FUNC) &_ClusterR_cost_clusters_from_dis_meds, 2},
44-
{"_ClusterR_dissim_mat", (DL_FUNC) &_ClusterR_dissim_mat, 7},
45-
{"_ClusterR_dissim_MEDOIDS", (DL_FUNC) &_ClusterR_dissim_MEDOIDS, 6},
46-
{"_ClusterR_evaluation_rcpp", (DL_FUNC) &_ClusterR_evaluation_rcpp, 3},
4739
{"_ClusterR_GMM_arma", (DL_FUNC) &_ClusterR_GMM_arma, 10},
4840
{"_ClusterR_GMM_arma_AIC_BIC", (DL_FUNC) &_ClusterR_GMM_arma_AIC_BIC, 11},
4941
{"_ClusterR_KMEANS_arma", (DL_FUNC) &_ClusterR_KMEANS_arma, 7},
5042
{"_ClusterR_KMEANS_rcpp", (DL_FUNC) &_ClusterR_KMEANS_rcpp, 12},
43+
{"_ClusterR_OptClust", (DL_FUNC) &_ClusterR_OptClust, 12},
44+
{"_ClusterR_Predict_mini_batch_kmeans", (DL_FUNC) &_ClusterR_Predict_mini_batch_kmeans, 4},
45+
{"_ClusterR_SCALE", (DL_FUNC) &_ClusterR_SCALE, 3},
46+
{"_ClusterR_affinity_propagation", (DL_FUNC) &_ClusterR_affinity_propagation, 9},
47+
{"_ClusterR_check_NaN_Inf", (DL_FUNC) &_ClusterR_check_NaN_Inf, 1},
48+
{"_ClusterR_cost_clusters_from_dis_meds", (DL_FUNC) &_ClusterR_cost_clusters_from_dis_meds, 2},
49+
{"_ClusterR_dissim_MEDOIDS", (DL_FUNC) &_ClusterR_dissim_MEDOIDS, 6},
50+
{"_ClusterR_dissim_mat", (DL_FUNC) &_ClusterR_dissim_mat, 7},
51+
{"_ClusterR_evaluation_rcpp", (DL_FUNC) &_ClusterR_evaluation_rcpp, 3},
5152
{"_ClusterR_mini_batch_kmeans", (DL_FUNC) &_ClusterR_mini_batch_kmeans, 13},
5253
{"_ClusterR_opt_clust_fK", (DL_FUNC) &_ClusterR_opt_clust_fK, 3},
53-
{"_ClusterR_OptClust", (DL_FUNC) &_ClusterR_OptClust, 12},
54-
{"_ClusterR_predict_medoids", (DL_FUNC) &_ClusterR_predict_medoids, 7},
5554
{"_ClusterR_predict_MGausDPDF", (DL_FUNC) &_ClusterR_predict_MGausDPDF, 5},
5655
{"_ClusterR_predict_MGausDPDF_full", (DL_FUNC) &_ClusterR_predict_MGausDPDF_full, 5},
57-
{"_ClusterR_Predict_mini_batch_kmeans", (DL_FUNC) &_ClusterR_Predict_mini_batch_kmeans, 4},
56+
{"_ClusterR_predict_medoids", (DL_FUNC) &_ClusterR_predict_medoids, 7},
5857
{"_ClusterR_preferenceRange", (DL_FUNC) &_ClusterR_preferenceRange, 3},
59-
{"_ClusterR_SCALE", (DL_FUNC) &_ClusterR_SCALE, 3},
6058
{"_ClusterR_silhouette_clusters", (DL_FUNC) &_ClusterR_silhouette_clusters, 2},
6159
{"_ClusterR_split_rcpp_lst", (DL_FUNC) &_ClusterR_split_rcpp_lst, 1},
6260
{"_ClusterR_validate_centroids", (DL_FUNC) &_ClusterR_validate_centroids, 5},
6361
{NULL, NULL, 0}
6462
};
6563

66-
void R_init_ClusterR(DllInfo *dll) {
64+
void R_init_ClusterR(DllInfo *dll)
65+
{
6766
R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);
6867
R_useDynamicSymbols(dll, FALSE);
6968
}

0 commit comments

Comments
 (0)