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/Bitmap_cubical_complex/example/Random_bitmap_cubical_complex.cpp | |
parent | 910f29401e053f668e4d277af098295ab05e6022 (diff) | |
parent | 0fb22e4c499b665ad505e5d9d2c325f7561f69c4 (diff) |
fix conflict
Diffstat (limited to 'src/Bitmap_cubical_complex/example/Random_bitmap_cubical_complex.cpp')
-rw-r--r-- | src/Bitmap_cubical_complex/example/Random_bitmap_cubical_complex.cpp | 2 |
1 files changed, 1 insertions, 1 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 46ea8f2e..e5512418 100644 --- a/src/Bitmap_cubical_complex/example/Random_bitmap_cubical_complex.cpp +++ b/src/Bitmap_cubical_complex/example/Random_bitmap_cubical_complex.cpp @@ -21,7 +21,7 @@ int main(int argc, char** argv) { srand(time(0)); - std::cout + std::clog << "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 " |