Memory leak fix

Neplex · Dec 6, 2017 · 06300df · 06300df
1 parent 43af319
commit 06300df
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 11 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: COveR
 Title: Clustering with Overlaps
-Version: 1.0.0
+Version: 1.0.3
 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"))
@@ -17,5 +17,3 @@ LazyData: true
 RoxygenNote: 6.0.1
 Suggests: testthat
 SystemRequirements: Gnu Scientific Library version >= 1.12
-
-
diff --git a/R/r1okm.R b/R/r1okm.R
@@ -37,7 +37,6 @@ r1okm <- function(x, centers, alpha = 0, nstart = 10, trace = FALSE, iter.max =
     centers <- as.matrix(data.matrix(centers))
     nc <- nrow(centers)
     c <- as.numeric(as.vector(centers))
-    print(c)
     if (ncol(centers) != ncol(x))
       stop("x and centers must have the same number of dimensions")
 

diff --git a/R/r2okm.R b/R/r2okm.R
@@ -37,7 +37,6 @@ r2okm <- function(x, centers, lambda = 0, nstart = 10, trace = FALSE, iter.max =
     centers <- as.matrix(data.matrix(centers))
     nc <- nrow(centers)
     c <- as.numeric(as.vector(centers))
-    print(c)
     if (ncol(centers) != ncol(x))
       stop("x and centers must have the same number of dimensions")
 

diff --git a/src/icmeans/icmeans.h b/src/icmeans/icmeans.h
@@ -89,7 +89,7 @@ double ic_getBetweenss(Interval **centers, unsigned nb_clusters,
   for (size_t k = 0; k < nb_clusters; k++) {
 
     // Get the mean element of other centers
-    Interval mean[nb_interval];
+    Interval* mean = new_array_Interval(nb_interval);
     for (size_t j = 0; j < nb_interval; j++) {
       mean[j].min = 0;
       mean[j].max = 0;
@@ -115,6 +115,8 @@ double ic_getBetweenss(Interval **centers, unsigned nb_clusters,
       res += haus_distance(centers[k], mean, nb_interval);
       break;
     }
+
+    delete_array(&mean);
   }
 
   return res;

diff --git a/src/ikmeans/ikmeans.h b/src/ikmeans/ikmeans.h
@@ -71,7 +71,7 @@ double ik_getBetweenss(Interval **centers, unsigned nb_clusters,
   for (size_t k = 0; k < nb_clusters; k++) {
 
     // Get the mean element of other centers
-    Interval mean[nb_interval];
+    Interval* mean = new_array_Interval(nb_interval);
     for (size_t j = 0; j < nb_interval; j++) {
       mean[j].min = 0;
       mean[j].max = 0;
@@ -97,6 +97,8 @@ double ik_getBetweenss(Interval **centers, unsigned nb_clusters,
       res += haus_distance(centers[k], mean, nb_interval);
       break;
     }
+
+    delete_array(&mean);
   }
 
   return res;

diff --git a/src/ineokm/ineokm.h b/src/ineokm/ineokm.h
@@ -14,7 +14,7 @@ double ineo_betweenss(Interval **centers, unsigned nb_clusters,
   for (size_t k = 0; k < nb_clusters; k++) {
 
     // Get the mean element of other centers
-    Interval mean[nb_interval];
+    Interval* mean = new_array_Interval(nb_interval);
     for (size_t j = 0; j < nb_interval; j++) {
       mean[j].min = 0;
       mean[j].max = 0;
@@ -32,6 +32,8 @@ double ineo_betweenss(Interval **centers, unsigned nb_clusters,
 
     // Sum distance
     res += square_distance(centers[k], mean, nb_interval);
+
+    delete_array(&mean);
   }
 
   return res;

diff --git a/src/neokm/neokm.h b/src/neokm/neokm.h
@@ -13,7 +13,7 @@ double neo_betweenss(double **centers, unsigned nb_clusters, unsigned nb_dim) {
   for (size_t k = 0; k < nb_clusters; k++) {
 
     // Get the mean element of other clusters center
-    double mean[nb_dim];
+    double* mean = new_array_double(nb_dim);
     for (size_t j = 0; j < nb_dim; j++) {
       for (size_t i = 0; i < nb_clusters; i++) {
         if (i != k) {
@@ -25,6 +25,8 @@ double neo_betweenss(double **centers, unsigned nb_clusters, unsigned nb_dim) {
 
     // Sum distance
     res += vector_square_distance(centers[k], mean, nb_dim);
+
+    delete_array(&mean);
   }
 
   return res;

diff --git a/src/r1okm/r1okm.h b/src/r1okm/r1okm.h
@@ -13,7 +13,7 @@ double r1_betweenss(double **centers, unsigned nb_clusters, unsigned nb_dim) {
   for (size_t k = 0; k < nb_clusters; k++) {
 
     // Get the mean element of other clusters center
-    double mean[nb_dim];
+    double* mean = new_array_double(nb_dim);
     for (size_t j = 0; j < nb_dim; j++) {
       for (size_t i = 0; i < nb_clusters; i++) {
         if (i != k) {
@@ -25,6 +25,8 @@ double r1_betweenss(double **centers, unsigned nb_clusters, unsigned nb_dim) {
 
     // Sum distance
     res += vector_square_distance(centers[k], mean, nb_dim);
+
+    delete_array(&mean);
   }
 
   return res;

diff --git a/src/r2okm/r2okm.h b/src/r2okm/r2okm.h
@@ -13,7 +13,7 @@ double r2_betweenss(double **centers, unsigned nb_clusters, unsigned nb_dim) {
   for (size_t k = 0; k < nb_clusters; k++) {
 
     // Get the mean element of other clusters center
-    double mean[nb_dim];
+    double* mean = new_array_double(nb_dim);
     for (size_t j = 0; j < nb_dim; j++) {
       for (size_t i = 0; i < nb_clusters; i++) {
         if (i != k) {
@@ -25,6 +25,8 @@ double r2_betweenss(double **centers, unsigned nb_clusters, unsigned nb_dim) {
 
     // Sum distance
     res += vector_square_distance(centers[k], mean, nb_dim);
+
+    delete_array(&mean);
   }
 
   return res;