Another 32bit fix (R1OKM & R2OKM)

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: COveR
 Title: Clustering with Overlaps in R
-Version: 0.10.5
+Version: 0.10.6
 Authors@R: c(
   person("Guillaume", "Cleuziou", email = "guillaume.cleuziou@univ-orleans.fr", role = "cre"),
   person("Nicolas", "Hiot", email = "nicolas.hiot@etu.univ-orleans.fr", role = "aut"))

R/r1okm.R

@@ -90,7 +90,7 @@ r1okm <- function(x, centers, alpha = 0, nstart = 10, trace = FALSE, iter.max =
 #'
 #' @export
 print.r1okm <- function(x, ...) {
-  cat("NEOKM clustering with ", length(x$size), " clusters of sizes ", paste(x$size,
+  cat("R1OKM clustering with ", length(x$size), " clusters of sizes ", paste(x$size,
     collapse = ", "), "\n", sep = "")
   cat("\nCluster means:\n")
   print(x$centers, ...)

R/r2okm.R

@@ -92,7 +92,7 @@ r2okm <- function(x, centers, lambda = 0, nstart = 10, trace = FALSE, iter.max =
 #'
 #' @export
 print.r2okm <- function(x, ...) {
-  cat("NEOKM clustering with ", length(x$size), " clusters of sizes ", paste(x$size,
+  cat("R2OKM clustering with ", length(x$size), " clusters of sizes ", paste(x$size,
     collapse = ", "), "\n", sep = "")
   cat("\nCluster means:\n")
   print(x$centers, ...)

src/r1okm/r1okm.h

@@ -78,11 +78,15 @@ void r1_assign(double **elements, double **centers, bool **asso,
       dists[k] = vector_square_distance(elements[i], centers[k], nb_dim);
     }
 
+    unsigned nb_clusters_check = 0;
+
     do {
       double min_dist = INFINITY;
       unsigned ck = 0; ///< The next closest cluster
       end = true;
 
+      nb_clusters_check++;
+
       // Search closest cluster, that not associated
       for (size_t k = 0; k < nb_clusters; k++) {
         if (!new_asso[k]) {
@@ -111,7 +115,7 @@ void r1_assign(double **elements, double **centers, bool **asso,
         end = false;              // Not the end
       }
 
-    } while (!end);
+    } while (!end && nb_clusters_check<=nb_clusters);
 
     // If the new association is better than previous iteration, choose it
     if (new_dist <= withinss[i]) {

src/r2okm/r2okm.h

@@ -85,11 +85,15 @@ void r2_assign(double **elements, double **centers, bool **asso,
       dists[k] = vector_square_distance(elements[i], centers[k], nb_dim);
     }
 
+    unsigned nb_clusters_check = 0;
+
     do {
       double min_dist = INFINITY;
       unsigned ck = 0; ///< The next closest cluster
       end = true;
 
+      nb_clusters_check++;
+
       // Search closest cluster, that not associated
       for (size_t k = 0; k < nb_clusters; k++) {
         if (!new_asso[k]) {
@@ -118,7 +122,7 @@ void r2_assign(double **elements, double **centers, bool **asso,
         end = false;              // Not the end
       }
 
-    } while (!end);
+    } while (!end && nb_clusters_check<=nb_clusters);
 
     // If the new association is better than previous iteration, choose it
     if (new_dist <= withinss[i]) {