copyrigths

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

Former-commit-id: 0f17a81c0c8ef507d49f0b8a78afc195a957e7f1

5 files changed, 32 insertions, 33 deletions

diff --git a/src/Bottleneck_distance/concept/Persistence_diagram.h b/src/Bottleneck_distance/concept/Persistence_diagram.h
index 1ab768ba..fe13e859 100644
--- a/src/Bottleneck_distance/concept/Persistence_diagram.h
+++ b/src/Bottleneck_distance/concept/Persistence_diagram.h
@@ -2,9 +2,9 @@
  *    (Geometric Understanding in Higher Dimensions) is a generic C++ 
  *    library for computational topology.
  *
- *    Author(s):       François Godi
+ *    Author:       François Godi
  *
- *    Copyright (C) 2016  INRIA
+ *    Copyright (C) 2015  INRIA
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
diff --git a/src/Bottleneck_distance/doc/Intro_bottleneck_distance.h b/src/Bottleneck_distance/doc/Intro_bottleneck_distance.h
index ccb558c5..1f443f7f 100644
--- a/src/Bottleneck_distance/doc/Intro_bottleneck_distance.h
+++ b/src/Bottleneck_distance/doc/Intro_bottleneck_distance.h
@@ -2,9 +2,9 @@
  *    (Geometric Understanding in Higher Dimensions) is a generic C++
  *    library for computational topology.
  *
- *    Author(s):       François Godi
+ *    Author:       François Godi
  *
- *    Copyright (C) 2015  INRIA Sophia-Antipolis (France)
+ *    Copyright (C) 2015  INRIA (France)
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
diff --git a/src/Bottleneck_distance/example/bottleneck_example.cpp b/src/Bottleneck_distance/example/bottleneck_example.cpp
index b1b98a82..28e458a5 100644
--- a/src/Bottleneck_distance/example/bottleneck_example.cpp
+++ b/src/Bottleneck_distance/example/bottleneck_example.cpp
@@ -2,9 +2,9 @@
  *    (Geometric Understanding in Higher Dimensions) is a generic C++
  *    library for computational topology.
  *
- *    Author(s):       Francois Godi, small modifications by Pawel Dlotko
+ *    Authors:       Francois Godi, small modifications by Pawel Dlotko
  *
- *    Copyright (C) 2015  INRIA Saclay (France)
+ *    Copyright (C) 2015  INRIA (France)
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
diff --git a/src/Bottleneck_distance/test/bottleneck_chrono.cpp b/src/Bottleneck_distance/test/bottleneck_chrono.cpp
index 4c4f4ee6..a7440ecd 100644
--- a/src/Bottleneck_distance/test/bottleneck_chrono.cpp
+++ b/src/Bottleneck_distance/test/bottleneck_chrono.cpp
@@ -2,9 +2,9 @@
  *    (Geometric Understanding in Higher Dimensions) is a generic C++
  *    library for computational topology.
  *
- *    Author(s):       Francois Godi
+ *    Author:       Francois Godi
  *
- *    Copyright (C) 2015  INRIA Sophia-Antipolis (France)
+ *    Copyright (C) 2015  INRIA (France)
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
@@ -34,29 +34,28 @@ int main(){
     std::ofstream objetfichier;
     objetfichier.open("results.csv", std::ios::out);
 
-    for(int n=0; n<=4000; n+=400){
-        std::uniform_real_distribution<double> unif1(0.,upper_bound);
-        std::uniform_real_distribution<double> unif2(upper_bound/1000.,upper_bound/100.);
-        std::default_random_engine re;
-        std::vector< std::pair<double, double> > v1, v2;
-        for (int i = 0; i < n; i++) {
-            double a = unif1(re);
-            double b = unif1(re);
-            double x = unif2(re);
-            double y = unif2(re);
-            v1.emplace_back(std::min(a,b), std::max(a,b));
-            v2.emplace_back(std::min(a,b)+std::min(x,y), std::max(a,b)+std::max(x,y));
-            if(i%5==0)
-                v1.emplace_back(std::min(a,b),std::min(a,b)+x);
-            if(i%3==0)
-                v2.emplace_back(std::max(a,b),std::max(a,b)+y);
-        }
-        std::chrono::steady_clock::time_point start = std::chrono::steady_clock::now();
-        double b = compute(v1,v2, 0.0001);
-        std::chrono::steady_clock::time_point end = std::chrono::steady_clock::now();
-        typedef std::chrono::duration<int,std::milli> millisecs_t;
-        millisecs_t duration(std::chrono::duration_cast<millisecs_t>(end-start));
-        objetfichier << n << ";" << duration.count() << ";" << b << std::endl;
+    int n = 1200;
+    std::uniform_real_distribution<double> unif1(0.,upper_bound);
+    std::uniform_real_distribution<double> unif2(upper_bound/1000.,upper_bound/100.);
+    std::default_random_engine re;
+    std::vector< std::pair<double, double> > v1, v2;
+    for (int i = 0; i < n; i++) {
+        double a = unif1(re);
+        double b = unif1(re);
+        double x = unif2(re);
+        double y = unif2(re);
+        v1.emplace_back(std::min(a,b), std::max(a,b));
+        v2.emplace_back(std::min(a,b)+std::min(x,y), std::max(a,b)+std::max(x,y));
+        if(i%5==0)
+            v1.emplace_back(std::min(a,b),std::min(a,b)+x);
+        if(i%3==0)
+            v2.emplace_back(std::max(a,b),std::max(a,b)+y);
     }
+    std::chrono::steady_clock::time_point start = std::chrono::steady_clock::now();
+    double b = compute(v1,v2, 0.0001);
+    std::chrono::steady_clock::time_point end = std::chrono::steady_clock::now();
+    typedef std::chrono::duration<int,std::milli> millisecs_t;
+    millisecs_t duration(std::chrono::duration_cast<millisecs_t>(end-start));
+    objetfichier << n << ";" << duration.count() << ";" << b << std::endl;
     objetfichier.close();
 }
diff --git a/src/Bottleneck_distance/test/bottleneck_unit_test.cpp b/src/Bottleneck_distance/test/bottleneck_unit_test.cpp
index e2cd3c05..31ba18ad 100644
--- a/src/Bottleneck_distance/test/bottleneck_unit_test.cpp
+++ b/src/Bottleneck_distance/test/bottleneck_unit_test.cpp
@@ -2,9 +2,9 @@
  *    (Geometric Understanding in Higher Dimensions) is a generic C++
  *    library for computational topology.
  *
- *    Author(s):       Francois Godi
+ *    Author:       Francois Godi
  *
- *    Copyright (C) 2015  INRIA Sophia-Antipolis (France)
+ *    Copyright (C) 2015  INRIA (France)
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by