diff options
| author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-03-22 11:06:52 +0100 |
|---|---|---|
| committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-03-22 11:06:52 +0100 |
| commit | cd47fa8e718f6ede07aead032d524022bd68b608 (patch) | |
| tree | 5c451ce83cff35c8962f2a06da5f950eb91ce1dc /src/Bottleneck_distance/doc/Intro_bottleneck_distance.h | |
| parent | 6225d21fa6fd87edf10731df87cd3a7099049358 (diff) | |
| parent | 49f9e5cc6bf933705500ad96d674df6a9df7f713 (diff) | |
Merge master and resolve conflicts
Diffstat (limited to 'src/Bottleneck_distance/doc/Intro_bottleneck_distance.h')
| -rw-r--r-- | src/Bottleneck_distance/doc/Intro_bottleneck_distance.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Bottleneck_distance/doc/Intro_bottleneck_distance.h b/src/Bottleneck_distance/doc/Intro_bottleneck_distance.h index bbc952e1..2a988b4b 100644 --- a/src/Bottleneck_distance/doc/Intro_bottleneck_distance.h +++ b/src/Bottleneck_distance/doc/Intro_bottleneck_distance.h @@ -52,7 +52,7 @@ int main() { diag2.emplace_back(0., 13.); double b = Gudhi::persistence_diagram::bottleneck_distance(diag1, diag2); - std::cout << "Bottleneck distance = " << b << std::endl; + std::clog << "Bottleneck distance = " << b << std::endl; } * \endcode * |