From 09d913dac67bb2d3b3f37be3d15be07dae897b05 Mon Sep 17 00:00:00 2001 From: Adam Getchell Date: Mon, 9 Oct 2023 21:46:54 -0700 Subject: [PATCH] De-cluttering test printouts - Removed unnecessary test printouts in the code - Updated vcpkgGitCommitId to ae360361a434310ffee36d84eb01c033b648fb22 in multiple workflows - Modified classify_cells function to be const --- .github/workflows/codecov-upload.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/linux-clang-pkgx.yml | 2 +- .github/workflows/linux-clang.yml | 2 +- .github/workflows/linux-gcc.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/sonarcloud.yml | 2 +- .github/workflows/windows-msvc.yml | 2 +- .github/workflows/windows-pkgx.yml | 2 +- include/Foliated_triangulation.hpp | 7 +++++-- tests/Foliated_triangulation_test.cpp | 4 ++++ tests/Geometry_test.cpp | 4 +++- 12 files changed, 21 insertions(+), 12 deletions(-) diff --git a/.github/workflows/codecov-upload.yml b/.github/workflows/codecov-upload.yml index 73e050ee6..e4bff5f72 100644 --- a/.github/workflows/codecov-upload.yml +++ b/.github/workflows/codecov-upload.yml @@ -28,7 +28,7 @@ jobs: - name: Restore artifacts or setup vcpkg uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: 7e4d2ff73b643ca2c685c6cfe0783a0f62cfb15c + vcpkgGitCommitId: ae360361a434310ffee36d84eb01c033b648fb22 - name: Configure run: cmake -G Ninja -D CMAKE_BUILD_TYPE=RelWithDebInfo -D ENABLE_TESTING:BOOL=TRUE -D ENABLE_COVERAGE:BOOL=TRUE -S . -B build diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index be4792893..b4796bb0c 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -67,7 +67,7 @@ jobs: - name: Restore artifacts or setup vcpkg uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: 7e4d2ff73b643ca2c685c6cfe0783a0f62cfb15c + vcpkgGitCommitId: ae360361a434310ffee36d84eb01c033b648fb22 - name: Configure run: cmake --preset=build diff --git a/.github/workflows/linux-clang-pkgx.yml b/.github/workflows/linux-clang-pkgx.yml index da2e997f5..22c3a9b21 100644 --- a/.github/workflows/linux-clang-pkgx.yml +++ b/.github/workflows/linux-clang-pkgx.yml @@ -27,7 +27,7 @@ jobs: - name: Restore artifacts or setup vcpkg uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: 7e4d2ff73b643ca2c685c6cfe0783a0f62cfb15c + vcpkgGitCommitId: ae360361a434310ffee36d84eb01c033b648fb22 - name: Configure run: cmake --preset=build diff --git a/.github/workflows/linux-clang.yml b/.github/workflows/linux-clang.yml index 1b429df5f..b849a02dd 100644 --- a/.github/workflows/linux-clang.yml +++ b/.github/workflows/linux-clang.yml @@ -27,7 +27,7 @@ jobs: - name: Restore artifacts or setup vcpkg uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: 7e4d2ff73b643ca2c685c6cfe0783a0f62cfb15c + vcpkgGitCommitId: ae360361a434310ffee36d84eb01c033b648fb22 - name: Configure run: cmake --preset=build diff --git a/.github/workflows/linux-gcc.yml b/.github/workflows/linux-gcc.yml index 1e1482d3c..06a73fca2 100644 --- a/.github/workflows/linux-gcc.yml +++ b/.github/workflows/linux-gcc.yml @@ -27,7 +27,7 @@ jobs: - name: Restore artifacts or setup vcpkg uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: 7e4d2ff73b643ca2c685c6cfe0783a0f62cfb15c + vcpkgGitCommitId: ae360361a434310ffee36d84eb01c033b648fb22 - name: Configure run: cmake --preset=build diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 70f28d739..d407ca17d 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -19,7 +19,7 @@ jobs: - name: Restore artifacts or setup vcpkg uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: 7e4d2ff73b643ca2c685c6cfe0783a0f62cfb15c + vcpkgGitCommitId: ae360361a434310ffee36d84eb01c033b648fb22 - name: Configure run: cmake --preset=build diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index e2ae58a0c..f008f0389 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -31,7 +31,7 @@ jobs: - name: Restore artifacts or setup vcpkg uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: 7e4d2ff73b643ca2c685c6cfe0783a0f62cfb15c + vcpkgGitCommitId: ae360361a434310ffee36d84eb01c033b648fb22 - name: Configure run: cmake -G Ninja -D CMAKE_BUILD_TYPE=RelWithDebInfo -D ENABLE_TESTING:BOOL=TRUE -D ENABLE_COVERAGE:BOOL=TRUE -S . -B build diff --git a/.github/workflows/windows-msvc.yml b/.github/workflows/windows-msvc.yml index 5fa7df9a8..15abbcb27 100644 --- a/.github/workflows/windows-msvc.yml +++ b/.github/workflows/windows-msvc.yml @@ -24,7 +24,7 @@ jobs: - name: Restore artifacts, or setup vcpkg uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: 7e4d2ff73b643ca2c685c6cfe0783a0f62cfb15c + vcpkgGitCommitId: ae360361a434310ffee36d84eb01c033b648fb22 - name: Install vcpkg packages and configure CMake run: | diff --git a/.github/workflows/windows-pkgx.yml b/.github/workflows/windows-pkgx.yml index 99df8a9de..9fb580b1f 100644 --- a/.github/workflows/windows-pkgx.yml +++ b/.github/workflows/windows-pkgx.yml @@ -24,7 +24,7 @@ jobs: - name: Restore artifacts, or setup vcpkg uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: 7e4d2ff73b643ca2c685c6cfe0783a0f62cfb15c + vcpkgGitCommitId: ae360361a434310ffee36d84eb01c033b648fb22 - name: Install vcpkg packages and configure CMake run: | diff --git a/include/Foliated_triangulation.hpp b/include/Foliated_triangulation.hpp index d0b5e5d13..aecf66f7c 100644 --- a/include/Foliated_triangulation.hpp +++ b/include/Foliated_triangulation.hpp @@ -836,7 +836,10 @@ namespace foliated_triangulations std::inserter(vertices_to_remove, vertices_to_remove.begin()), find_bad_vertex); // Remove the vertices - fmt::print("There are {} invalid vertices.\n", vertices_to_remove.size()); +#ifndef NDEBUG + spdlog::warn("There are {} invalid vertices.\n", + vertices_to_remove.size()); +#endif t_triangulation.remove(vertices_to_remove.begin(), vertices_to_remove.end()); assert(t_triangulation.tds().is_valid()); @@ -1493,7 +1496,7 @@ namespace foliated_triangulations /// @brief Classify cells /// @param cells The container of simplices to classify /// @return A container of simplices with Cell_type written to cell->info() - [[nodiscard]] static auto classify_cells(Cell_container const& cells) + [[nodiscard]] auto classify_cells(Cell_container const& cells) const -> Cell_container { assert(cells.size() == number_of_finite_cells()); diff --git a/tests/Foliated_triangulation_test.cpp b/tests/Foliated_triangulation_test.cpp index 4d9bc4de4..e51aba908 100644 --- a/tests/Foliated_triangulation_test.cpp +++ b/tests/Foliated_triangulation_test.cpp @@ -858,8 +858,10 @@ SCENARIO("FoliatedTriangulation_3 functions from Delaunay3" * { CHECK_FALSE(triangulation.is_initialized()); // Human verification +#ifndef NDEBUG fmt::print("Unfixed triangulation:\n"); triangulation.print_cells(); +#endif } THEN("After being fixed, Delaunay3 functions work as expected.") { @@ -883,7 +885,9 @@ SCENARIO("FoliatedTriangulation_3 functions from Delaunay3" * fmt::print("Base Delaunay dimension is: {}\n", triangulation.dimension()); // Human verification +#ifndef NDEBUG utilities::print_delaunay(triangulation.delaunay()); +#endif } } WHEN("Constructing the default triangulation.") diff --git a/tests/Geometry_test.cpp b/tests/Geometry_test.cpp index 676e0d3f7..7a7530961 100644 --- a/tests/Geometry_test.cpp +++ b/tests/Geometry_test.cpp @@ -102,11 +102,13 @@ SCENARIO("3-Geometry classification" * doctest::test_suite("geometry")) triangulation.number_of_vertices())); // Human verification - triangulation.print_cells(); fmt::print("There are {} edges.\n", geometry.N1); fmt::print("There are {} timelike edges and {} spacelike edges.\n", geometry.N1_TL, geometry.N1_SL); +#ifndef NDEBUG + triangulation.print_cells(); triangulation.print_edges(); +#endif fmt::print( "There are {} vertices with a max timevalue of {} and a min " "timevalue of {}.\n",