From de84fbf23d501acb8638c44692f97c61d0ba8ef4 Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Mon, 16 May 2022 10:28:43 +0200 Subject: [PATCH] Remove junk output to stdout from various tests --- tests/libslic3r/test_astar.cpp | 9 ------- tests/libslic3r/test_marchingsquares.cpp | 34 ++++++++++++------------ 2 files changed, 17 insertions(+), 26 deletions(-) diff --git a/tests/libslic3r/test_astar.cpp b/tests/libslic3r/test_astar.cpp index 176d7694ab..f673ad9fe6 100644 --- a/tests/libslic3r/test_astar.cpp +++ b/tests/libslic3r/test_astar.cpp @@ -54,18 +54,9 @@ TEST_CASE("astar algorithm test over 3D point grid", "[AStar]") { auto pgrid = point_grid(ex_seq, vol, {0.1f, 0.1f, 0.1f}); - size_t target = pgrid.point_count() - 1; - - std::cout << "Tracing route to " << pgrid.get_coord(target).transpose() << std::endl; PointGridTracer pgt{pgrid, pgrid.point_count() - 1}; std::vector out; bool found = astar::search_route(pgt, size_t(0), std::back_inserter(out)); - std::cout << "Route taken: "; - for (size_t i : out) { - std::cout << "(" << pgrid.get_coord(i).transpose() << ") "; - } - std::cout << std::endl; - REQUIRE(found); } diff --git a/tests/libslic3r/test_marchingsquares.cpp b/tests/libslic3r/test_marchingsquares.cpp index 32b137175a..0fbe6a5e34 100644 --- a/tests/libslic3r/test_marchingsquares.cpp +++ b/tests/libslic3r/test_marchingsquares.cpp @@ -325,9 +325,9 @@ static void recreate_object_from_rasters(const std::string &objname, float lh) { double disp_w = 120.96; double disp_h = 68.04; -#ifndef NDEBUG - size_t cntr = 0; -#endif +//#ifndef NDEBUG +// size_t cntr = 0; +//#endif for (ExPolygons &layer : layers) { auto rst = create_raster(res, disp_w, disp_h); @@ -335,11 +335,11 @@ static void recreate_object_from_rasters(const std::string &objname, float lh) { rst.draw(island); } -#ifndef NDEBUG - std::fstream out(objname + std::to_string(cntr) + ".png", std::ios::out); - out << rst.encode(sla::PNGRasterEncoder{}); - out.close(); -#endif +//#ifndef NDEBUG +// std::fstream out(objname + std::to_string(cntr) + ".png", std::ios::out); +// out << rst.encode(sla::PNGRasterEncoder{}); +// out.close(); +//#endif ExPolygons layer_ = sla::raster_to_polygons(rst); // float delta = scaled(std::min(rst.pixel_dimensions().h_mm, @@ -347,19 +347,19 @@ static void recreate_object_from_rasters(const std::string &objname, float lh) { // layer_ = expolygons_simplify(layer_, delta); -#ifndef NDEBUG - SVG svg(objname + std::to_string(cntr) + ".svg", BoundingBox(Point{0, 0}, Point{scaled(disp_w), scaled(disp_h)})); - svg.draw(layer_); - svg.draw(layer, "green"); - svg.Close(); -#endif +//#ifndef NDEBUG +// SVG svg(objname + std::to_string(cntr) + ".svg", BoundingBox(Point{0, 0}, Point{scaled(disp_w), scaled(disp_h)})); +// svg.draw(layer_); +// svg.draw(layer, "green"); +// svg.Close(); +//#endif double layera = 0., layera_ = 0.; for (auto &p : layer) layera += p.area(); for (auto &p : layer_) layera_ += p.area(); -#ifndef NDEBUG - std::cout << cntr++ << std::endl; -#endif +//#ifndef NDEBUG +// std::cout << cntr++ << std::endl; +//#endif double diff = std::abs(layera_ - layera); REQUIRE((diff <= 0.1 * layera || diff < scaled(1.) * scaled(1.)));