summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfgodi <fgodi@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2016-12-16 12:56:39 +0000
committerfgodi <fgodi@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2016-12-16 12:56:39 +0000
commitf1a8c07758aa66c3a95effd7a898e8a063b5f3ce (patch)
tree10ff7be5c6f6bd797a2a11c18b4b495fd7b3e302 /src
parent5cc424d34f304fad2a8b462156672e2af25ab756 (diff)
small modifications (doc)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bottleneck_integration@1899 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: e1a9e88af05611d3572830a719ca9ee0d042144e
Diffstat (limited to 'src')
-rw-r--r--src/Bottleneck_distance/concept/Persistence_diagram.h2
-rw-r--r--src/Bottleneck_distance/test/bottleneck_chrono.cpp3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/Bottleneck_distance/concept/Persistence_diagram.h b/src/Bottleneck_distance/concept/Persistence_diagram.h
index e4766628..2d841086 100644
--- a/src/Bottleneck_distance/concept/Persistence_diagram.h
+++ b/src/Bottleneck_distance/concept/Persistence_diagram.h
@@ -29,7 +29,7 @@ namespace bottleneck_distance {
/** \brief Concept of Diagram_point. std::get<0>(point) must return the birth of the corresponding component and std::get<1>(point) its death.
* A valid implementation of this concept is std::pair<double,double>.
- * Birth must be 0 or positive, death should be larger than birth, death can be std::numeric_limits<double>::infinity() for components which stay alive.
+ * Death should be larger than birth, death can be std::numeric_limits<double>::infinity() for components which stay alive.
*
* \ingroup bottleneck_distance
*/
diff --git a/src/Bottleneck_distance/test/bottleneck_chrono.cpp b/src/Bottleneck_distance/test/bottleneck_chrono.cpp
index 1bff96f4..0a3bb012 100644
--- a/src/Bottleneck_distance/test/bottleneck_chrono.cpp
+++ b/src/Bottleneck_distance/test/bottleneck_chrono.cpp
@@ -51,9 +51,8 @@ int main(){
if(i%3==0)
v2.emplace_back(std::max(a,b),std::max(a,b)+y);
}
- double epsilon = std::numeric_limits<double>::epsilon();
std::chrono::steady_clock::time_point start = std::chrono::steady_clock::now();
- double b = bottleneck_distance(v1,v2, epsilon);
+ double b = bottleneck_distance(v1, v2);
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));