Merge last trunk modifications

Fix copyright issues
Add Nerve_GIC as examples


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

Former-commit-id: ee046c4c043c7fb76f4b2ad6772229f3a837ae8f

1 files changed, 9 insertions, 10 deletions

diff --git a/src/Bitmap_cubical_complex/example/Random_bitmap_cubical_complex.cpp b/src/Bitmap_cubical_complex/example/Random_bitmap_cubical_complex.cpp
index 16ad65a0..f70558f2 100644
--- a/src/Bitmap_cubical_complex/example/Random_bitmap_cubical_complex.cpp
+++ b/src/Bitmap_cubical_complex/example/Random_bitmap_cubical_complex.cpp
@@ -20,7 +20,6 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 // for persistence algorithm
 #include <gudhi/reader_utils.h>
 #include <gudhi/Bitmap_cubical_complex.h>
@@ -34,10 +33,11 @@
 int main(int argc, char** argv) {
   srand(time(0));
 
-  std::cout << "This program computes persistent homology, by using bitmap_cubical_complex class, of cubical " <<
-      "complexes. The first parameter of the program is the dimension D of the bitmap. The next D parameters are " <<
-      "number of top dimensional cubes in each dimension of the bitmap. The program will create random cubical " <<
-      "complex of that sizes and compute persistent homology of it." << std::endl;
+  std::cout
+      << "This program computes persistent homology, by using bitmap_cubical_complex class, of cubical "
+      << "complexes. The first parameter of the program is the dimension D of the bitmap. The next D parameters are "
+      << "number of top dimensional cubes in each dimension of the bitmap. The program will create random cubical "
+      << "complex of that sizes and compute persistent homology of it." << std::endl;
 
   int p = 2;
   double min_persistence = 0;
@@ -47,16 +47,16 @@ int main(int argc, char** argv) {
     return 1;
   }
 
-  size_t dimensionOfBitmap = (size_t) atoi(argv[1]);
-  std::vector< unsigned > sizes;
+  size_t dimensionOfBitmap = (size_t)atoi(argv[1]);
+  std::vector<unsigned> sizes;
   size_t multipliers = 1;
   for (size_t dim = 0; dim != dimensionOfBitmap; ++dim) {
-    unsigned sizeInThisDimension = (unsigned) atoi(argv[2 + dim]);
+    unsigned sizeInThisDimension = (unsigned)atoi(argv[2 + dim]);
     sizes.push_back(sizeInThisDimension);
     multipliers *= sizeInThisDimension;
   }
 
-  std::vector< double > data;
+  std::vector<double> data;
   for (size_t i = 0; i != multipliers; ++i) {
     data.push_back(rand() / static_cast<double>(RAND_MAX));
   }
@@ -80,4 +80,3 @@ int main(int argc, char** argv) {
 
   return 0;
 }
-