diff options
| author | MathieuCarriere <mathieu.carriere3@gmail.com> | 2020-04-28 10:31:12 -0400 |
|---|---|---|
| committer | MathieuCarriere <mathieu.carriere3@gmail.com> | 2020-04-28 10:31:12 -0400 |
| commit | 51ca2370ae27bec052bb4fffafc8a718ac306264 (patch) | |
| tree | 67e1ea14d4c290295b0298dba0d701303a53f3b6 /src/Bottleneck_distance/doc/Intro_bottleneck_distance.h | |
| parent | 910f29401e053f668e4d277af098295ab05e6022 (diff) | |
| parent | 0fb22e4c499b665ad505e5d9d2c325f7561f69c4 (diff) | |
fix conflict
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 * |