Merge paralellized version of Nerve_GIC fix for CoordGIC from Nerve_GIC branch

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@3552 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 384a6362a19da625b09879ad6eb7573c48a52940

1 files changed, 11 insertions, 2 deletions

diff --git a/src/Nerve_GIC/include/gudhi/GIC.h b/src/Nerve_GIC/include/gudhi/GIC.h
index aa6478e5..05c6a386 100644
--- a/src/Nerve_GIC/include/gudhi/GIC.h
+++ b/src/Nerve_GIC/include/gudhi/GIC.h
@@ -415,7 +415,6 @@ class Cover_complex {
   double set_graph_from_automatic_rips(Distance distance, int N = 100) {
     int m = floor(n / std::exp((1 + rate_power) * std::log(std::log(n) / std::log(rate_constant))));
     m = std::min(m, n - 1);
-    std::vector<int> samples(m);
     double delta = 0;
 
     if (verbose) std::cout << n << " points in R^" << data_dimension << std::endl;
@@ -424,7 +423,9 @@ class Cover_complex {
     if (distances.size() == 0) compute_pairwise_distances(distance);
 
     #ifdef GUDHI_USE_TBB
-      tbb::parallel_for(0, N, [&](int i){
+    tbb::mutex deltamutex;
+    tbb::parallel_for(0, N, [&](int i){
+        std::vector<int> samples(m);
         SampleWithoutReplacement(n, m, samples);
         double hausdorff_dist = 0;
         for (int j = 0; j < n; j++) {
@@ -432,10 +433,13 @@ class Cover_complex {
           for (int k = 1; k < m; k++) mj = std::min(mj, distances[j][samples[k]]);
           hausdorff_dist = std::max(hausdorff_dist, mj);
         }
+        deltamutex.lock();
         delta += hausdorff_dist / N;
+        deltamutex.unlock();
       });
     #else
       for (int i = 0; i < N; i++) {
+        std::vector<int> samples(m);
         SampleWithoutReplacement(n, m, samples);
         double hausdorff_dist = 0;
         for (int j = 0; j < n; j++) {
@@ -717,6 +721,7 @@ class Cover_complex {
 
     #ifdef GUDHI_USE_TBB
       if (verbose) std::cout << "Computing connected components (parallelized)..." << std::endl;
+      tbb::mutex covermutex, idmutex;
       tbb::parallel_for(0, res, [&](int i){
         // Compute connected components
         Graph G = one_skeleton.create_subgraph();
@@ -735,16 +740,20 @@ class Cover_complex {
           int identifier = ((i + component[j])*(i + component[j]) + 3 * i + component[j]) / 2;
 
           // Update covers
+          covermutex.lock();
           cover[preimages[i][j]].push_back(identifier);
           cover_back[identifier].push_back(preimages[i][j]);
           cover_fct[identifier] = i;
           cover_std[identifier] = funcstd[i];
           cover_color[identifier].second += func_color[preimages[i][j]];
           cover_color[identifier].first += 1;
+          covermutex.unlock();
         }
 
         // Maximal dimension is total number of connected components
+        idmutex.lock();
         id += max + 1;
+        idmutex.unlock();
       });
     #else
       if (verbose) std::cout << "Computing connected components..." << std::endl;