From e57945179b393aca885f3f16285c671d2cc135af Mon Sep 17 00:00:00 2001 From: Hanif Koh Date: Mon, 19 Oct 2026 15:40:06 +0800 Subject: [PATCH] Remove Disabled, Duplicate and Library-Only Unit Tests Delete test cases that never run (#if 0 blocks, [NotWorking] cases, commented-out Perl ports, blocks behind undefined macros), cases that cannot fail, cases that only exercise boost::polygon directly, and cases whose assertions another test already makes on the same path. Remove the helpers, includes and fixture only those cases used. --- tests/data/test_stl/ASCII/20mmbox-CR.stl | 1 - tests/fff_print/test_fill.cpp | 289 ---- tests/fff_print/test_flow.cpp | 17 - tests/fff_print/test_gcodewriter.cpp | 15 - tests/fff_print/test_helpers.cpp | 24 - tests/fff_print/test_imex_mode_gcode.cpp | 18 - tests/fff_print/test_mixed_filament.cpp | 15 - tests/fff_print/test_multifilament.cpp | 26 - tests/fff_print/test_print.cpp | 49 - tests/fff_print/test_skirt_brim.cpp | 24 - .../fff_print/test_slicing_pipeline_hook.cpp | 8 - tests/fff_print/test_trianglemesh.cpp | 72 - tests/fff_print/test_wipe.cpp | 15 - tests/libslic3r/test_3mf.cpp | 63 - tests/libslic3r/test_arrange.cpp | 9 - tests/libslic3r/test_caddocument.cpp | 171 --- tests/libslic3r/test_clipper_utils.cpp | 45 - tests/libslic3r/test_config.cpp | 39 - .../test_elephant_foot_compensation.cpp | 31 - tests/libslic3r/test_fill_plane_path.cpp | 17 - tests/libslic3r/test_geometry.cpp | 69 - tests/libslic3r/test_imex_helpers.cpp | 15 - tests/libslic3r/test_indexed_triangle_set.cpp | 63 - tests/libslic3r/test_ordering_strategies.cpp | 10 - tests/libslic3r/test_precise_seam.cpp | 19 - tests/libslic3r/test_sketchconstraints.cpp | 24 - tests/libslic3r/test_stl.cpp | 11 - tests/libslic3r/test_texture_displacement.cpp | 27 - tests/libslic3r/test_vendor_cache.cpp | 22 - tests/libslic3r/test_voronoi.cpp | 1322 ----------------- tests/slic3rutils/slic3rutils_tests_main.cpp | 60 - tests/slic3rutils/test_action_source.cpp | 28 - tests/slic3rutils/test_plugin_config.cpp | 16 - 33 files changed, 2634 deletions(-) delete mode 100644 tests/data/test_stl/ASCII/20mmbox-CR.stl diff --git a/tests/data/test_stl/ASCII/20mmbox-CR.stl b/tests/data/test_stl/ASCII/20mmbox-CR.stl deleted file mode 100644 index 53c85bb281..0000000000 --- a/tests/data/test_stl/ASCII/20mmbox-CR.stl +++ /dev/null @@ -1 +0,0 @@ -solid STL generated by MeshLab facet normal 0.000000e+00 -0.000000e+00 -1.000000e+00 outer loop vertex 2.000000e+01 2.000000e+01 0.000000e+00 vertex 2.000000e+01 0.000000e+00 0.000000e+00 vertex 0.000000e+00 0.000000e+00 0.000000e+00 endloop endfacet facet normal -0.000000e+00 0.000000e+00 -1.000000e+00 outer loop vertex 2.000000e+01 2.000000e+01 0.000000e+00 vertex 0.000000e+00 0.000000e+00 0.000000e+00 vertex 0.000000e+00 2.000000e+01 0.000000e+00 endloop endfacet facet normal 0.000000e+00 0.000000e+00 1.000000e+00 outer loop vertex 2.000000e+01 2.000000e+01 2.000000e+01 vertex 0.000000e+00 2.000000e+01 2.000000e+01 vertex 0.000000e+00 0.000000e+00 2.000000e+01 endloop endfacet facet normal 0.000000e+00 0.000000e+00 1.000000e+00 outer loop vertex 2.000000e+01 2.000000e+01 2.000000e+01 vertex 0.000000e+00 0.000000e+00 2.000000e+01 vertex 2.000000e+01 0.000000e+00 2.000000e+01 endloop endfacet facet normal 1.000000e+00 0.000000e+00 -0.000000e+00 outer loop vertex 2.000000e+01 2.000000e+01 0.000000e+00 vertex 2.000000e+01 2.000000e+01 2.000000e+01 vertex 2.000000e+01 0.000000e+00 2.000000e+01 endloop endfacet facet normal 1.000000e+00 0.000000e+00 0.000000e+00 outer loop vertex 2.000000e+01 2.000000e+01 0.000000e+00 vertex 2.000000e+01 0.000000e+00 2.000000e+01 vertex 2.000000e+01 0.000000e+00 0.000000e+00 endloop endfacet facet normal 0.000000e+00 -1.000000e+00 0.000000e+00 outer loop vertex 2.000000e+01 0.000000e+00 0.000000e+00 vertex 2.000000e+01 0.000000e+00 2.000000e+01 vertex 0.000000e+00 0.000000e+00 2.000000e+01 endloop endfacet facet normal 0.000000e+00 -1.000000e+00 0.000000e+00 outer loop vertex 2.000000e+01 0.000000e+00 0.000000e+00 vertex 0.000000e+00 0.000000e+00 2.000000e+01 vertex 0.000000e+00 0.000000e+00 0.000000e+00 endloop endfacet facet normal -1.000000e+00 0.000000e+00 0.000000e+00 outer loop vertex 0.000000e+00 0.000000e+00 0.000000e+00 vertex 0.000000e+00 0.000000e+00 2.000000e+01 vertex 0.000000e+00 2.000000e+01 2.000000e+01 endloop endfacet facet normal -1.000000e+00 0.000000e+00 0.000000e+00 outer loop vertex 0.000000e+00 0.000000e+00 0.000000e+00 vertex 0.000000e+00 2.000000e+01 2.000000e+01 vertex 0.000000e+00 2.000000e+01 0.000000e+00 endloop endfacet facet normal 0.000000e+00 1.000000e+00 0.000000e+00 outer loop vertex 2.000000e+01 2.000000e+01 2.000000e+01 vertex 2.000000e+01 2.000000e+01 0.000000e+00 vertex 0.000000e+00 2.000000e+01 0.000000e+00 endloop endfacet facet normal 0.000000e+00 1.000000e+00 0.000000e+00 outer loop vertex 2.000000e+01 2.000000e+01 2.000000e+01 vertex 0.000000e+00 2.000000e+01 0.000000e+00 vertex 0.000000e+00 2.000000e+01 2.000000e+01 endloop endfacet endsolid vcg \ No newline at end of file diff --git a/tests/fff_print/test_fill.cpp b/tests/fff_print/test_fill.cpp index 1fbedcda8f..e14a05861e 100644 --- a/tests/fff_print/test_fill.cpp +++ b/tests/fff_print/test_fill.cpp @@ -44,7 +44,6 @@ #include "libslic3r/Layer.hpp" #include "libslic3r/Print.hpp" #include "libslic3r/PrintConfig.hpp" -#include "libslic3r/SVG.hpp" #include "libslic3r/libslic3r.h" #include "test_helpers.hpp" @@ -53,15 +52,6 @@ using namespace Slic3r; bool test_if_solid_surface_filled(const ExPolygon& expolygon, double flow_spacing, double angle = 0, double density = 1.0); -#if 0 -TEST_CASE("Adjusted solid distance", "[Fill]") { - int surface_width = 250; - int distance = Slic3r::Flow::solid_spacing(surface_width, 47); - REQUIRE(distance == Catch::Approx(50)); - REQUIRE(surface_width % distance == 0); -} -#endif - TEST_CASE("Pattern path length", "[Fill]") { std::unique_ptr filler(Slic3r::Fill::new_from_type("rectilinear")); filler->angle = float(-(PI)/2.0); @@ -120,15 +110,6 @@ TEST_CASE("Pattern path length", "[Fill]") { filler->angle = float(angle); ExPolygon e(test_square, test_hole); Slic3r::Polylines paths = test(e); -#if 0 - { - BoundingBox bbox = get_extents(e); - SVG svg("c:\\data\\temp\\square_with_holes.svg", bbox); - svg.draw(e); - svg.draw(paths); - svg.Close(); - } -#endif REQUIRE((paths.size() >= 1 && paths.size() <= 3)); // paths don't cross hole REQUIRE(diff_pl(paths, offset(e, float(SCALED_EPSILON*10))).size() == 0); @@ -175,25 +156,6 @@ TEST_CASE("Pattern path length", "[Fill]") { } } - #if 0 // Disabled temporarily due to precision issues on the Mac VM - SECTION("Solid surface fill") { - Slic3r::Points points { - Point::new_scale(6883102, 9598327.01296997), - Point::new_scale(6883102, 20327272.01297), - Point::new_scale(3116896, 20327272.01297), - Point::new_scale(3116896, 9598327.01296997) - }; - Slic3r::ExPolygon expolygon(points); - - REQUIRE(test_if_solid_surface_filled(expolygon, 0.55) == true); - for (size_t i = 0; i <= 20; ++i) - { - expolygon.scale(1.05); - REQUIRE(test_if_solid_surface_filled(expolygon, 0.55) == true); - } - } - #endif - SECTION("Solid surface fill") { Slic3r::Points points { Slic3r::Point(59515297,5422499),Slic3r::Point(59531249,5578697),Slic3r::Point(59695801,6123186), @@ -226,245 +188,6 @@ TEST_CASE("Pattern path length", "[Fill]") { } } -/* -{ - my $collection = Slic3r::Polyline::Collection->new( - Slic3r::Polyline->new([0,15], [0,18], [0,20]), - Slic3r::Polyline->new([0,10], [0,8], [0,5]), - ); - is_deeply - [ map $_->[Y], map @$_, @{$collection->chained_path_from(Slic3r::Point->new(0,30), 0)} ], - [20, 18, 15, 10, 8, 5], - 'chained path'; -} - -{ - my $collection = Slic3r::Polyline::Collection->new( - Slic3r::Polyline->new([4,0], [10,0], [15,0]), - Slic3r::Polyline->new([10,5], [15,5], [20,5]), - ); - is_deeply - [ map $_->[X], map @$_, @{$collection->chained_path_from(Slic3r::Point->new(30,0), 0)} ], - [reverse 4, 10, 15, 10, 15, 20], - 'chained path'; -} - -{ - my $collection = Slic3r::ExtrusionPath::Collection->new( - map Slic3r::ExtrusionPath->new(polyline => $_, role => 0, mm3_per_mm => 1), - Slic3r::Polyline->new([0,15], [0,18], [0,20]), - Slic3r::Polyline->new([0,10], [0,8], [0,5]), - ); - is_deeply - [ map $_->[Y], map @{$_->polyline}, @{$collection->chained_path_from(Slic3r::Point->new(0,30), 0)} ], - [20, 18, 15, 10, 8, 5], - 'chained path'; -} - -{ - my $collection = Slic3r::ExtrusionPath::Collection->new( - map Slic3r::ExtrusionPath->new(polyline => $_, role => 0, mm3_per_mm => 1), - Slic3r::Polyline->new([15,0], [10,0], [4,0]), - Slic3r::Polyline->new([10,5], [15,5], [20,5]), - ); - is_deeply - [ map $_->[X], map @{$_->polyline}, @{$collection->chained_path_from(Slic3r::Point->new(30,0), 0)} ], - [reverse 4, 10, 15, 10, 15, 20], - 'chained path'; -} - -for my $pattern (qw(rectilinear honeycomb hilbertcurve concentric)) { - my $config = Slic3r::Config->new_from_defaults; - $config->set('fill_pattern', $pattern); - $config->set('external_fill_pattern', $pattern); - $config->set('perimeters', 1); - $config->set('skirts', 0); - $config->set('fill_density', 20); - $config->set('layer_height', 0.05); - $config->set('perimeter_extruder', 1); - $config->set('infill_extruder', 2); - my $print = Slic3r::Test::init_print('20mm_cube', config => $config, scale => 2); - ok my $gcode = Slic3r::Test::gcode($print), "successful $pattern infill generation"; - my $tool = undef; - my @perimeter_points = my @infill_points = (); - Slic3r::GCode::Reader->new->parse($gcode, sub { - my ($self, $cmd, $args, $info) = @_; - - if ($cmd =~ /^T(\d+)/) { - $tool = $1; - } elsif ($cmd eq 'G1' && $info->{extruding} && $info->{dist_XY} > 0) { - if ($tool == $config->perimeter_extruder-1) { - push @perimeter_points, Slic3r::Point->new_scale($args->{X}, $args->{Y}); - } elsif ($tool == $config->infill_extruder-1) { - push @infill_points, Slic3r::Point->new_scale($args->{X}, $args->{Y}); - } - } - }); - my $convex_hull = convex_hull(\@perimeter_points); - ok !(defined first { !$convex_hull->contains_point($_) } @infill_points), "infill does not exceed perimeters ($pattern)"; -} - -{ - my $config = Slic3r::Config->new_from_defaults; - $config->set('infill_only_where_needed', 1); - $config->set('bottom_solid_layers', 0); - $config->set('infill_extruder', 2); - $config->set('infill_extrusion_width', 0.5); - $config->set('fill_density', 40); - $config->set('cooling', 0); # for preventing speeds from being altered - $config->set('first_layer_speed', '100%'); # for preventing speeds from being altered - - my $test = sub { - my $print = Slic3r::Test::init_print('pyramid', config => $config); - - my $tool = undef; - my @infill_extrusions = (); # array of polylines - Slic3r::GCode::Reader->new->parse(Slic3r::Test::gcode($print), sub { - my ($self, $cmd, $args, $info) = @_; - - if ($cmd =~ /^T(\d+)/) { - $tool = $1; - } elsif ($cmd eq 'G1' && $info->{extruding} && $info->{dist_XY} > 0) { - if ($tool == $config->infill_extruder-1) { - push @infill_extrusions, Slic3r::Line->new_scale( - [ $self->X, $self->Y ], - [ $info->{new_X}, $info->{new_Y} ], - ); - } - } - }); - return 0 if !@infill_extrusions; # prevent calling convex_hull() with no points - - my $convex_hull = convex_hull([ map $_->pp, map @$_, @infill_extrusions ]); - return unscale unscale sum(map $_->area, @{offset([$convex_hull], scale(+$config->infill_extrusion_width/2))}); - }; - - my $tolerance = 5; # mm^2 - - $config->set('solid_infill_below_area', 0); - ok $test->() < $tolerance, - 'no infill is generated when using infill_only_where_needed on a pyramid'; - - $config->set('solid_infill_below_area', 70); - ok abs($test->() - $config->solid_infill_below_area) < $tolerance, - 'infill is only generated under the forced solid shells'; -} - -{ - my $config = Slic3r::Config->new_from_defaults; - $config->set('skirts', 0); - $config->set('perimeters', 1); - $config->set('fill_density', 0); - $config->set('top_solid_layers', 0); - $config->set('bottom_solid_layers', 0); - $config->set('solid_infill_below_area', 20000000); - $config->set('solid_infill_every_layers', 2); - $config->set('perimeter_speed', 99); - $config->set('external_perimeter_speed', 99); - $config->set('cooling', 0); - $config->set('first_layer_speed', '100%'); - - my $print = Slic3r::Test::init_print('20mm_cube', config => $config); - my %layers_with_extrusion = (); - Slic3r::GCode::Reader->new->parse(Slic3r::Test::gcode($print), sub { - my ($self, $cmd, $args, $info) = @_; - - if ($cmd eq 'G1' && $info->{dist_XY} > 0 && $info->{extruding}) { - if (($args->{F} // $self->F) != $config->perimeter_speed*60) { - $layers_with_extrusion{$self->Z} = ($args->{F} // $self->F); - } - } - }); - - ok !%layers_with_extrusion, - "solid_infill_below_area and solid_infill_every_layers are ignored when fill_density is 0"; -} - -{ - my $config = Slic3r::Config->new_from_defaults; - $config->set('skirts', 0); - $config->set('perimeters', 3); - $config->set('fill_density', 0); - $config->set('layer_height', 0.2); - $config->set('first_layer_height', 0.2); - $config->set('nozzle_diameter', [0.35]); - $config->set('infill_extruder', 2); - $config->set('solid_infill_extruder', 2); - $config->set('infill_extrusion_width', 0.52); - $config->set('solid_infill_extrusion_width', 0.52); - $config->set('first_layer_extrusion_width', 0); - - my $print = Slic3r::Test::init_print('A', config => $config); - my %infill = (); # Z => [ Line, Line ... ] - my $tool = undef; - Slic3r::GCode::Reader->new->parse(Slic3r::Test::gcode($print), sub { - my ($self, $cmd, $args, $info) = @_; - - if ($cmd =~ /^T(\d+)/) { - $tool = $1; - } elsif ($cmd eq 'G1' && $info->{extruding} && $info->{dist_XY} > 0) { - if ($tool == $config->infill_extruder-1) { - my $z = 1 * $self->Z; - $infill{$z} ||= []; - push @{$infill{$z}}, Slic3r::Line->new_scale( - [ $self->X, $self->Y ], - [ $info->{new_X}, $info->{new_Y} ], - ); - } - } - }); - my $grow_d = scale($config->infill_extrusion_width)/2; - my $layer0_infill = union([ map @{$_->grow($grow_d)}, @{ $infill{0.2} } ]); - my $layer1_infill = union([ map @{$_->grow($grow_d)}, @{ $infill{0.4} } ]); - my $diff = diff($layer0_infill, $layer1_infill); - $diff = offset2_ex($diff, -$grow_d, +$grow_d); - $diff = [ grep { $_->area > 2*(($grow_d*2)**2) } @$diff ]; - is scalar(@$diff), 0, 'no missing parts in solid shell when fill_density is 0'; -} - -{ - # GH: #2697 - my $config = Slic3r::Config->new_from_defaults; - $config->set('perimeter_extrusion_width', 0.72); - $config->set('top_infill_extrusion_width', 0.1); - $config->set('infill_extruder', 2); # in order to distinguish infill - $config->set('solid_infill_extruder', 2); # in order to distinguish infill - - my $print = Slic3r::Test::init_print('20mm_cube', config => $config); - my %infill = (); # Z => [ Line, Line ... ] - my %other = (); # Z => [ Line, Line ... ] - my $tool = undef; - Slic3r::GCode::Reader->new->parse(Slic3r::Test::gcode($print), sub { - my ($self, $cmd, $args, $info) = @_; - - if ($cmd =~ /^T(\d+)/) { - $tool = $1; - } elsif ($cmd eq 'G1' && $info->{extruding} && $info->{dist_XY} > 0) { - my $z = 1 * $self->Z; - my $line = Slic3r::Line->new_scale( - [ $self->X, $self->Y ], - [ $info->{new_X}, $info->{new_Y} ], - ); - if ($tool == $config->infill_extruder-1) { - $infill{$z} //= []; - push @{$infill{$z}}, $line; - } else { - $other{$z} //= []; - push @{$other{$z}}, $line; - } - } - }); - my $top_z = max(keys %infill); - my $top_infill_grow_d = scale($config->top_infill_extrusion_width)/2; - my $top_infill = union([ map @{$_->grow($top_infill_grow_d)}, @{ $infill{$top_z} } ]); - my $perimeters_grow_d = scale($config->perimeter_extrusion_width)/2; - my $perimeters = union([ map @{$_->grow($perimeters_grow_d)}, @{ $other{$top_z} } ]); - my $covered = union_ex([ @$top_infill, @$perimeters ]); - my @holes = map @{$_->holes}, @$covered; - ok sum(map unscale unscale $_->area*-1, @holes) < 1, 'no gaps between top solid infill and perimeters'; -} -*/ - bool test_if_solid_surface_filled(const ExPolygon& expolygon, double flow_spacing, double angle, double density) { std::unique_ptr filler(Slic3r::Fill::new_from_type("rectilinear")); @@ -498,18 +221,6 @@ bool test_if_solid_surface_filled(const ExPolygon& expolygon, double flow_spacin const double scaled_flow_spacing = std::pow(scale_(flow_spacing), 2); uncovered.erase(std::remove_if(uncovered.begin(), uncovered.end(), [scaled_flow_spacing](const ExPolygon& poly) { return poly.area() < scaled_flow_spacing; }), uncovered.end()); -#if 0 - if (! uncovered.empty()) { - BoundingBox bbox = get_extents(expolygon.contour); - bbox.merge(get_extents(uncovered)); - bbox.merge(get_extents(grown_paths)); - SVG svg("c:\\data\\temp\\test_if_solid_surface_filled.svg", bbox); - svg.draw(expolygon); - svg.draw(uncovered, "red"); - svg.Close(); - } -#endif - return uncovered.empty(); // solid surface is fully filled } diff --git a/tests/fff_print/test_flow.cpp b/tests/fff_print/test_flow.cpp index f3e8abd02e..39f3358fa5 100644 --- a/tests/fff_print/test_flow.cpp +++ b/tests/fff_print/test_flow.cpp @@ -58,23 +58,6 @@ SCENARIO("Flow math for non-bridges", "[Flow]") { } } } - -#if 0 - /// Check for an edge case in the maths where the spacing could be 0; original - /// math is 0.99. Slic3r issue #4654 - GIVEN("Input spacing of 0.414159 and a total width of 2") { - double in_spacing = 0.414159; - double total_width = 2.0; - auto flow = Flow::new_from_spacing(1.0, 0.4, 0.3); - WHEN("solid_spacing() is called") { - double result = flow.solid_spacing(total_width, in_spacing); - THEN("Yielded spacing is greater than 0") { - REQUIRE(result > 0); - } - } - } -#endif - } /// Spacing, width calculation for bridge extrusions diff --git a/tests/fff_print/test_gcodewriter.cpp b/tests/fff_print/test_gcodewriter.cpp index d491527db6..90c71a66f0 100644 --- a/tests/fff_print/test_gcodewriter.cpp +++ b/tests/fff_print/test_gcodewriter.cpp @@ -142,21 +142,6 @@ SCENARIO("z_hop lifts the nozzle when a lift is requested", "[GCodeWriter]") { } } -SCENARIO("Origin manipulation", "[GCodeWriter]") { - Slic3r::GCode gcodegen; - WHEN("set_origin to (10,0)") { - gcodegen.set_origin(Vec2d(10,0)); - REQUIRE(gcodegen.origin() == Vec2d(10, 0)); - } - WHEN("set_origin to (10,0) and translate by (5, 5)") { - gcodegen.set_origin(Vec2d(10,0)); - gcodegen.set_origin(gcodegen.origin() + Vec2d(5, 5)); - THEN("origin returns reference to point") { - REQUIRE(gcodegen.origin() == Vec2d(15,5)); - } - } -} - TEST_CASE("A cached config slot is looked up again whenever its key changes", "[GCodeWriter]") { GCode::ConfigIndexCache cache; diff --git a/tests/fff_print/test_helpers.cpp b/tests/fff_print/test_helpers.cpp index daa8132d5d..bb7e16dfff 100644 --- a/tests/fff_print/test_helpers.cpp +++ b/tests/fff_print/test_helpers.cpp @@ -502,27 +502,3 @@ std::vector role_sequence(const std::string &gcode, const std::vect } } } // namespace Slic3r::Test - -#include -#include "libslic3r/Arrange.hpp" -#include "libslic3r/Model.hpp" - -SCENARIO("init_print functionality", "[test_helpers]") { - GIVEN("A default config") { - Slic3r::DynamicPrintConfig config = Slic3r::DynamicPrintConfig::full_print_config(); - WHEN("init_print is called with a single mesh.") { - Slic3r::Model model; - Slic3r::Print print; - Slic3r::Test::init_print({ Slic3r::Test::cube(20) }, print, model, config); - THEN("One mesh/printobject is in the resulting Print object.") { - REQUIRE(print.objects().size() == 1); - } - THEN("print.process() doesn't crash.") { - REQUIRE_NOTHROW(print.process()); - } - THEN("Export gcode functions outputs text.") { - REQUIRE(! Slic3r::Test::gcode(print).empty()); - } - } - } -} diff --git a/tests/fff_print/test_imex_mode_gcode.cpp b/tests/fff_print/test_imex_mode_gcode.cpp index f27cc64c3d..f8ce3f4ce0 100644 --- a/tests/fff_print/test_imex_mode_gcode.cpp +++ b/tests/fff_print/test_imex_mode_gcode.cpp @@ -327,24 +327,6 @@ TEST_CASE("A printer with IMEX disabled resolves the mode placeholders to nothin CHECK_FALSE(has_line(gcode, kQuadScript)); } -// The placeholders are set unconditionally, ahead of the is_imex check, so they are defined for -// every printer. A single-extruder preset that mentions {imex_mode} must expand it to an empty -// string rather than fail the export on an unknown variable. -TEST_CASE("IMEX mode placeholders are defined on an ordinary single-extruder printer", - "[ImexModeGcode][IMEX]") -{ - const std::string gcode = slice({ cube(20) }, { - { "skirt_loops", "0" }, - { "brim_type", "no_brim" }, - { "gcode_flavor", "klipper" }, - { "machine_start_gcode", kReportStartGcode }, - }); - - CHECK(has_line(gcode, ";IMEX_MODE:")); - CHECK(has_line(gcode, ";IMEX_MODE_INDEX:0")); - CHECK(has_line(gcode, ";IMEX_MODE_GCODE:")); -} - // In a parallel mode no tool changes occur, so every active carriage has to be addressed // explicitly: once before the print for pressure advance, and again at the second layer for the // drop from the initial-layer temperature. Nothing else in the suite covers either emission, and diff --git a/tests/fff_print/test_mixed_filament.cpp b/tests/fff_print/test_mixed_filament.cpp index 3322020360..35e82fe0fa 100644 --- a/tests/fff_print/test_mixed_filament.cpp +++ b/tests/fff_print/test_mixed_filament.cpp @@ -66,21 +66,6 @@ void count_mixed(ToolOrdering &to, size_t &groups, size_t &resolutions) } // namespace -TEST_CASE("enable_mixed_color_sublayer reaches the Print config", "[MixedFilament]") -{ - Print print; - Model model; - init_print({cube(20)}, print, model, mixed_config(true)); - - // The option lives in PrintConfig; if it did not survive Print::apply the slicer would - // silently fall back to the whole-layer path. - CHECK(print.config().enable_mixed_color_sublayer.value == true); - REQUIRE(print.config().filament_is_mixed.values.size() == 3); - CHECK(print.config().filament_is_mixed.values[2] == true); - REQUIRE(print.config().filament_mixed_components.values.size() == 3); - CHECK(print.config().filament_mixed_components.values[2] == "1,2"); -} - TEST_CASE("Mixed filament splits layers into sub-layers when the option is on", "[MixedFilament]") { Print print; diff --git a/tests/fff_print/test_multifilament.cpp b/tests/fff_print/test_multifilament.cpp index b7fccf2890..d1f4f35af3 100644 --- a/tests/fff_print/test_multifilament.cpp +++ b/tests/fff_print/test_multifilament.cpp @@ -840,32 +840,6 @@ static void all_regions_on_filament(DynamicPrintConfig &config, int filament_1ba config.set_deserialize_strict({ { key, std::to_string(filament_1based) } }); } -// IMEX parallel modes emit per-carriage temperatures from a branch that is mutually -// exclusive with the standard per-extruder path, and that branch skipped the head the -// print's own toolpaths run on. That head therefore never received its 1st->2nd layer -// transition and held nozzle_temperature_initial_layer for the whole job. -TEST_CASE("Parallel-mode IMEX prints transition the printing head to its second-layer temperature", - "[MultiFilament][IMEX]") -{ - DynamicPrintConfig config = multifilament_config(7); - imex_7x4_printer(config); - all_regions_on_filament(config, 1); // filament 1 => logical slot 0 => physical head 0 - // The multi-extruder normalization collapses per-filament temperature vectors to a - // single value, so heads are told apart by their tool qualifier, not by temperature. - config.set_deserialize_strict({ - { "imex_parallel_mode", "copy" }, - { "nozzle_temperature_initial_layer", "200" }, - { "nozzle_temperature", "240" }, - }); - - const std::string gcode = slice({ cube(20) }, config); - - // Head 0 runs the print's own toolpaths and must step 200 -> 240 at the second layer. - CHECK(gcode.find("M104 S240 T0") != std::string::npos); - // Head 1 is the copy carriage; it already worked and must keep working. - CHECK(gcode.find("M104 S240 T1") != std::string::npos); -} - // IMEX supplements is_extruder_used for the secondary carriages a parallel mode drives. // `primary` drives exactly one tool, so the supplement must not run: routing every region // to filament 6 puts the initial tool on physical head 2, while the mode's only declared diff --git a/tests/fff_print/test_print.cpp b/tests/fff_print/test_print.cpp index 670c2aa7c1..7a75ac7154 100644 --- a/tests/fff_print/test_print.cpp +++ b/tests/fff_print/test_print.cpp @@ -54,8 +54,6 @@ #include #include #include -#include -#include #include #include #include @@ -794,25 +792,6 @@ TEST_CASE("Print statistics in custom G-code match the final print statistics", } } -TEST_CASE("export_gcode writes G-code without a result pointer", "[Print][export_gcode]") -{ - Print print; - Model model; - Slic3r::Test::init_print({cube(20)}, print, model); - print.process(); - - SECTION("non-BBL printer") {} - SECTION("BBL printer") { print.is_BBL_printer() = true; } - - ScopedTemporaryFile temp(".gcode"); - REQUIRE_NOTHROW(print.export_gcode(temp.string(), nullptr, nullptr)); - - std::ifstream in(temp.string()); - const std::string gcode((std::istreambuf_iterator(in)), std::istreambuf_iterator()); - - REQUIRE_FALSE(gcode.empty()); -} - TEST_CASE("Exporting a sliced print again gives the same G-code", "[Print][export_gcode][Regression]") { const int instances = GENERATE(1, 3); @@ -1062,34 +1041,6 @@ TEST_CASE("Belt printers keep the part fan off within the band above the belt", CHECK(clear_fan_off == 0); } -// Organic supports under an overhang on a belt printer reach below the object's first layer, -// where the virtual belt raft layers sit at negative Z. The lowest of them used to get a -// negative height and abort slicing with a negative flow error. -TEST_CASE("Belt printers slice organic tree supports that reach the belt", "[Print][belt][Support]") -{ - DynamicPrintConfig config = DynamicPrintConfig::full_print_config(); - config.set_deserialize_strict({ - { "belt_printer", 1 }, - { "belt_slice_rotation", "x" }, - { "belt_slice_rotation_angle", 45 }, - { "gcode_remap_x", "rev_x" }, - { "gcode_remap_y", "pos_z" }, - { "gcode_remap_z", "pos_y" }, - { "layer_height", 0.2 }, - { "initial_layer_print_height", 0.2 }, - { "skirt_loops", 0 }, - { "z_hop", 0 }, - { "enable_support", 1 }, - { "support_type", "tree(auto)" }, - { "support_style", "organic" }, - { "machine_start_gcode", "T[initial_tool]\n" }, - { "layer_change_gcode", "G92 E0\n" }, - }); - std::string gcode; - REQUIRE_NOTHROW(gcode = slice({ TestMesh::overhang }, config)); - CHECK(! gcode.empty()); -} - TEST_CASE("Slicing errors are reported per object with the object's name", "[Print]") { Print print; diff --git a/tests/fff_print/test_skirt_brim.cpp b/tests/fff_print/test_skirt_brim.cpp index c51dd5ebc6..307f6b5ff5 100644 --- a/tests/fff_print/test_skirt_brim.cpp +++ b/tests/fff_print/test_skirt_brim.cpp @@ -837,30 +837,6 @@ TEST_CASE("Belt brim on an object layer precedes its perimeters, once", "[SkirtB CHECK(role_passes(gc, "brim") <= bands); } -// B - single extruder (filament id 1). Every band must survive the 1-based -> 0-based -// filament-id conversion the apron path performs: a wrong conversion drops all single-extruder -// bands, so the pass count would collapse. The expected count is derived from the sliced -// layers, not a ratio. -TEST_CASE("Belt brim on a single extruder emits every band once", "[SkirtBrim][belt]") -{ - DynamicPrintConfig config = belt_brim_config(); - config.set_deserialize_strict({ - { "brim_type", "outer_only" }, - { "brim_width", 4 }, - { "brim_object_gap", 0 }, - }); - Print print; - Model model; - init_print({ cube(20) }, print, model, config); - const std::string gc = gcode(print); - - const PrintObject &object = *print.objects().front(); - const int expected = nonempty_belt_brim_layers(object) + belt_brim_apron_bands(object); - REQUIRE(expected > 0); - CHECK(role_layers(gc, "brim") == expected); - CHECK(belt_tools_for_role(gc, "brim") == std::set{ 0 }); // filament 1 -> tool 0 -} - // Number of brim segments the belt brim generator produced for `object`: the lattice // lines of every per-layer band plus the apron prologue. Each segment is written as one // extruding move, so this is what a G-code count has to match. A pass count cannot see a diff --git a/tests/fff_print/test_slicing_pipeline_hook.cpp b/tests/fff_print/test_slicing_pipeline_hook.cpp index 500cace206..1691e74d27 100644 --- a/tests/fff_print/test_slicing_pipeline_hook.cpp +++ b/tests/fff_print/test_slicing_pipeline_hook.cpp @@ -27,14 +27,6 @@ TEST_CASE("slicing_pipeline_plugin option exists and defaults empty", "[slicing_ #include "libslic3r/Print.hpp" -TEST_CASE("slicing pipeline hook setter is a no-op-safe injection", "[slicing_pipeline]") { - int calls = 0; - Slic3r::Print::set_slicing_pipeline_hook_fn( - [&](Slic3r::Print&, const Slic3r::PrintObject*, Slic3r::SlicingPipelineStepPlugin){ ++calls; }); - Slic3r::Print::set_slicing_pipeline_hook_fn(nullptr); // reset — must be legal - CHECK(calls == 0); -} - #include #include using namespace Slic3r::Test; diff --git a/tests/fff_print/test_trianglemesh.cpp b/tests/fff_print/test_trianglemesh.cpp index ab5c334d2e..705c89f126 100644 --- a/tests/fff_print/test_trianglemesh.cpp +++ b/tests/fff_print/test_trianglemesh.cpp @@ -10,8 +10,6 @@ #include #include #include -#include -#include #include #include #include "libslic3r/ExPolygon.hpp" @@ -59,12 +57,6 @@ SCENARIO("Basic mesh statistics", "[TriangleMesh]") { REQUIRE(cube.facets_count() == facets.size()); } -#if 0 - THEN( "Number of normals is equal to the number of facets.") { - REQUIRE(cube.normals().size() == facets.size()); - } -#endif - THEN( "center() returns the center of the object.") { REQUIRE(cube.center() == Vec3d(10.0,10.0,10.0)); } @@ -265,20 +257,6 @@ SCENARIO("Split functionality", "[TriangleMesh]") { } } -SCENARIO("Mesh merge functions", "[TriangleMesh]") { - GIVEN( "Two 20mm cubes, each with one corner on the origin") { - auto cube = make_cube(); - TriangleMesh cube2(cube); - - WHEN( "The two meshes are merged") { - cube.merge(cube2); - THEN( "There are twice as many facets in the merged mesh as the original.") { - REQUIRE(cube.facets_count() == 2 * cube2.facets_count()); - } - } - } -} - SCENARIO("Cut behavior", "[TriangleMesh]") { GIVEN( "A 20mm cube with one corner on the origin") { auto cube = make_cube(); @@ -306,53 +284,3 @@ SCENARIO("Cut behavior", "[TriangleMesh]") { } } } -#ifdef TEST_PERFORMANCE -TEST_CASE("Large mesh slices within the time budget (#4486)", "[TriangleMesh][Regression]") { - TriangleMesh mesh; - DynamicPrintConfig config = Slic3r::DynamicPrintConfig::full_print_config(); - mesh.ReadSTLFile(std::string(testfile_dir) + "test_trianglemesh/4486/100_000.stl"); - - config.set("layer_height", 500); - config.set("first_layer_height", 250); - config.set("nozzle_diameter", 500); - - Slic3r::Print print; - Slic3r::Model model; - Slic3r::Test::init_print({mesh}, print, model, config); - - print.status_cb = [] (int ln, const std::string& msg) { Slic3r::Log::info("Print") << ln << " " << msg << "\n";}; - - std::future fut = std::async([&print] () { print.process(); }); - std::chrono::milliseconds span {120000}; - bool timedout {false}; - if(fut.wait_for(span) == std::future_status::timeout) { - timedout = true; - } - REQUIRE(timedout == false); - -} -#endif // TEST_PERFORMANCE - -#ifdef BUILD_PROFILE -TEST_CASE("Large mesh slicing profile (#4486)", "[TriangleMesh][Profile]") { - TriangleMesh mesh; - DynamicPrintConfig config = Slic3r::DynamicPrintConfig::full_print_config(); - mesh.ReadSTLFile(std::string(testfile_dir) + "test_trianglemesh/4486/10_000.stl"); - - config.set("layer_height", 500); - config.set("first_layer_height", 250); - config.set("nozzle_diameter", 500); - config.set("fill_density", "5%"); - - Slic3r::Print print; - Slic3r::Model model; - Slic3r::Test::init_print({mesh}, print, model, config); - - print.status_cb = [] (int ln, const std::string& msg) { Slic3r::Log::info("Print") << ln << " " << msg << "\n";}; - - print.process(); - - REQUIRE(true); - -} -#endif //BUILD_PROFILE diff --git a/tests/fff_print/test_wipe.cpp b/tests/fff_print/test_wipe.cpp index 83a31e8137..8e2284b1ce 100644 --- a/tests/fff_print/test_wipe.cpp +++ b/tests/fff_print/test_wipe.cpp @@ -348,21 +348,6 @@ TEST_CASE("Inactive inward wipe settings preserve the exported trajectory", "[Wi CHECK_FALSE(trajectories_differ(regular_paths, inward_paths)); } -TEST_CASE("Inward wipe changes the exported trajectory when outer wall width is Auto", "[Wipe][Regression]") -{ - const char *wall_generator = GENERATE("classic", "arachne"); - INFO("wall generator: " << wall_generator); - - const std::vector regular = wipe_destinations( - slice({make_cube(10., 10., 1.)}, wipe_config(wall_generator, false))); - const std::vector inward = wipe_destinations( - slice({make_cube(10., 10., 1.)}, wipe_config(wall_generator, true))); - - REQUIRE_FALSE(regular.empty()); - REQUIRE_FALSE(inward.empty()); - REQUIRE(trajectories_differ(regular, inward)); -} - TEST_CASE("Inward wipe recognizes an external wall starting on an overhang", "[Wipe][Regression]") { const char *wall_generator = GENERATE("classic", "arachne"); diff --git a/tests/libslic3r/test_3mf.cpp b/tests/libslic3r/test_3mf.cpp index f7b5049ebe..4339aae1cc 100644 --- a/tests/libslic3r/test_3mf.cpp +++ b/tests/libslic3r/test_3mf.cpp @@ -1647,69 +1647,6 @@ SCENARIO("Legacy 3MF without published metadata loads unchanged", "[3mf]") { } } -// Locks the serialization contract of the orca_published_material_keys metadata: the per-entry JSON -// must survive a store_bbs_3mf -> load_bbs_3mf round-trip verbatim, exactly like orca_published_keys. -SCENARIO("Published 3MF round-trips the published_material_keys metadata", "[3mf]") { - GIVEN("a model carrying published material keys metadata") { - Model model; - std::string src_file = std::string(TEST_DATA_DIR) + "/test_3mf/Prusa.stl"; - REQUIRE(load_stl(src_file.c_str(), &model)); - model.add_default_instances(); - - const std::string material_keys_json = - R"([{"material":{"filament_type":"PLA","filament_vendor":"Generic","filament_id":"GFL99"},"slot":0,"keys":["filament_retraction_length","filament_z_hop"]}])"; - - model.model_info = std::make_shared(); - model.model_info->metadata_items[ORCA_PUBLISHED_MATERIAL_TAG] = material_keys_json; - - ScopedTemporaryDir backup_dir("orca_pub_mat"); - model.set_backup_path(backup_dir.string()); - - WHEN("stored to and reloaded from a .3mf") { - ScopedTemporaryFile temp(".3mf"); - const std::string test_file = temp.string(); - - DynamicPrintConfig config = DynamicPrintConfig::full_print_config(); - StoreParams store_params; - store_params.path = test_file.c_str(); - store_params.model = &model; - store_params.config = &config; - store_params.strategy = SaveStrategy::Zip64 | SaveStrategy::Silence; - REQUIRE(store_bbs_3mf(store_params)); - - Model dst_model; - DynamicPrintConfig dst_config; - ConfigSubstitutionContext ctxt{ ForwardCompatibilitySubstitutionRule::Enable }; - PlateDataPtrs dst_plates; - std::vector project_presets; - bool is_bbl_3mf = false, is_orca_3mf = false; - Semver file_version; - bool loaded = load_bbs_3mf(test_file.c_str(), &dst_config, &ctxt, &dst_model, &dst_plates, - &project_presets, &is_bbl_3mf, &is_orca_3mf, &file_version, nullptr, - LoadStrategy::LoadModel | LoadStrategy::LoadConfig); - THEN("the published material keys metadata round-trips unchanged") { - REQUIRE(loaded); - REQUIRE(dst_model.model_info != nullptr); - REQUIRE(dst_model.model_info->metadata_items[ORCA_PUBLISHED_MATERIAL_TAG] == material_keys_json); - - // The value must parse back to one material entry carrying the nested identity - // object, the author slot ordinal and the key list. - nlohmann::json entries = nlohmann::json::parse(material_keys_json); - REQUIRE(entries.is_array()); - REQUIRE(entries.size() == 1); - REQUIRE(entries[0]["material"]["filament_type"] == "PLA"); - REQUIRE(entries[0]["material"]["filament_vendor"] == "Generic"); - REQUIRE(entries[0]["material"]["filament_id"] == "GFL99"); - REQUIRE(entries[0]["slot"] == 0); - REQUIRE(entries[0]["keys"].is_array()); - REQUIRE(entries[0]["keys"].size() == 2); - REQUIRE(entries[0]["keys"][0] == "filament_retraction_length"); - } - release_PlateData_list(dst_plates); - } - } -} - SCENARIO("Minimal published 3MF omits project config, preset dumps and slicer tags", "[3mf]") { GIVEN("a multi-instance model carrying published metadata and a published_config payload") { Model model; diff --git a/tests/libslic3r/test_arrange.cpp b/tests/libslic3r/test_arrange.cpp index 030dd9e4b6..7446704b5e 100644 --- a/tests/libslic3r/test_arrange.cpp +++ b/tests/libslic3r/test_arrange.cpp @@ -159,15 +159,6 @@ TEST_CASE("overlap_area detects overlap and ignores touching edges", "[Arrange]" } } -TEST_CASE("Arrange places every item on the physical bed", "[Arrange]") -{ - ArrangePolygons items = squares(5, 20.); - arrange(items, bed(200, 200), quiet_params(scaled(1.))); - - for (const ArrangePolygon &ap : items) - REQUIRE(ap.bed_idx == 0); -} - TEST_CASE("Arranged items stay within the bed", "[Arrange]") { ArrangePolygons items = squares(6, 30.); diff --git a/tests/libslic3r/test_caddocument.cpp b/tests/libslic3r/test_caddocument.cpp index 4ee1de587d..dad283d1cd 100644 --- a/tests/libslic3r/test_caddocument.cpp +++ b/tests/libslic3r/test_caddocument.cpp @@ -2061,49 +2061,6 @@ TEST_CASE("mass properties: invalid body index", "[CadDocument]") REQUIRE_FALSE(mp3.valid); } -TEST_CASE("serialize_recipe roundtrip with two bodies", "[CadDocument]") -{ - using Catch::Matchers::WithinRel; - CadDocument doc; - - // Body 1: rectangle sketch + extrude + fillet - int sk1 = doc.add_sketch(SketchShape::Rectangle, SketchPlane::XY(), - 20, 20, 10, "Rect1"); - REQUIRE(sk1 >= 0); - doc.add_extrude(sk1, 10.0, false, BooleanMode::New, "Extrude1"); - doc.add_fillet(2.0, FaceGroup::All, "Fillet1"); - REQUIRE(doc.recompute()); - REQUIRE(doc.error.empty()); - - // Body 2: circle sketch + extrude (separate New body) - SketchEntity circ; - circ.type = SketchEntity::Type::Circle; - circ.center = Vec2d(0, 0); - circ.radius = 8.0; - int sk2 = doc.add_sketch_entities({circ}, SketchPlane::XZ(), "Circle2"); - doc.add_extrude(sk2, 6.0, false, BooleanMode::New, "Extrude2"); - REQUIRE(doc.recompute()); - REQUIRE(doc.error.empty()); - - REQUIRE(doc.bodies.size() >= 2); - std::vector orig_vols; - for (const auto& b : doc.bodies) - orig_vols.push_back(double(SketchEngine::tessellate(b.shape).volume())); - - auto blob = doc.serialize_recipe(); - REQUIRE_FALSE(blob.empty()); - - CadDocument doc2; - REQUIRE(doc2.deserialize_recipe(blob)); - REQUIRE(doc2.error.empty()); - REQUIRE(doc2.bodies.size() == doc.bodies.size()); - - for (size_t i = 0; i < doc.bodies.size(); ++i) { - double v2 = double(SketchEngine::tessellate(doc2.bodies[i].shape).volume()); - REQUIRE_THAT(v2, WithinRel(orig_vols[i], 1e-6)); - } -} - TEST_CASE("deserialize_recipe rejects future version with error", "[CadDocument]") { CadDocument doc; @@ -2147,41 +2104,6 @@ TEST_CASE("deserialize_recipe handles empty blob without throwing", "[CadDocumen REQUIRE_FALSE(doc.error.empty()); } -TEST_CASE("deserialize_recipe error is non-empty on every failure path", "[CadDocument]") -{ - CadDocument doc; - auto reset = [&]() { doc = CadDocument{}; }; - - // too new - { - std::ostringstream oss; - { cereal::BinaryOutputArchive ar(oss); uint32_t v = 999; ar(v); } - reset(); - REQUIRE_FALSE(doc.deserialize_recipe(oss.str())); - REQUIRE_FALSE(doc.error.empty()); - } - // too old - { - std::ostringstream oss; - { cereal::BinaryOutputArchive ar(oss); uint32_t v = 1; ar(v); } - reset(); - REQUIRE_FALSE(doc.deserialize_recipe(oss.str())); - REQUIRE_FALSE(doc.error.empty()); - } - // truncated / garbage - { - reset(); - REQUIRE_FALSE(doc.deserialize_recipe("not a valid blob \x00\x01\x02")); - REQUIRE_FALSE(doc.error.empty()); - } - // empty - { - reset(); - REQUIRE_FALSE(doc.deserialize_recipe("")); - REQUIRE_FALSE(doc.error.empty()); - } -} - TEST_CASE("a v4 project still opens", "[CadDocument][recipe]") { // The regression guard for everyone who already has projects: a pre-framing v4 @@ -4209,25 +4131,6 @@ static CadDocument make_golden_doc_v1() return doc; } -TEST_CASE("regenerate golden recipe fixture", "[.regen]") -{ - CadDocument doc = make_golden_doc_v1(); - // ponytail: serialize_recipe() only needs features, recompute is unnecessary - // for a fixture that exercises the serialization format. - auto blob = doc.serialize_recipe(); - REQUIRE_FALSE(blob.empty()); - - // Version-free on purpose: this writes whatever today's format is, so a version bump does - // not have to remember to edit it. The version-stamped fixtures beside it are frozen - // evidence from older builds and are never regenerated. - std::string path = std::string(TEST_DATA_DIR) + "/cad_recipe_current.bin"; - std::ofstream ofs(path, std::ios::binary); - REQUIRE(ofs.is_open()); - ofs.write(blob.data(), static_cast(blob.size())); - ofs.close(); - SUCCEED("Fixture written to " << path); -} - // The previous format's real blob, kept on disk deliberately. It is the only thing that can // prove the version gate does its job: a v3 recipe carries FEWER fields per feature than this // build reads, so without the bump to v4 it would have passed the gate and had two ints read @@ -5692,45 +5595,6 @@ TEST_CASE("surface-loft round-trip serialize/deserialize", "[CadDocument][surfac // --- Mate tests (M8a) --- -TEST_CASE("fastened mate with zero offset/angle", "[CadDocument][mate]") -{ - using Catch::Matchers::WithinAbs; - - CadDocument doc; - int sk_box = doc.add_sketch(SketchShape::Rectangle, SketchPlane::XY(), 10, 10, 0, "Box"); - doc.add_extrude(sk_box, 5.0, false, BooleanMode::New, "BoxExt"); - REQUIRE(doc.recompute()); - REQUIRE(doc.error.empty()); - - int cs_fixed = doc.add_coordsys(CoordSysType::PointWorld, Vec3d(5, 5, 5), "CS_Fixed"); - doc.features[cs_fixed].coordsys_body = 0; - REQUIRE(doc.recompute()); - REQUIRE(doc.error.empty()); - - int sk_cyl = doc.add_sketch(SketchShape::Circle, SketchPlane::XY(), 0, 0, 3, "Cyl"); - doc.add_extrude(sk_cyl, 10.0, false, BooleanMode::New, "CylExt"); - REQUIRE(doc.recompute()); - REQUIRE(doc.error.empty()); - REQUIRE(doc.bodies.size() == 2); - - int cs_moving = doc.add_coordsys(CoordSysType::PointWorld, Vec3d(0, 0, 5), "CS_Moving"); - doc.features[cs_moving].coordsys_body = 1; - REQUIRE(doc.recompute()); - REQUIRE(doc.error.empty()); - - int mi = doc.add_mate(0, cs_fixed, cs_moving, 0.0, 0.0, false, "Mate"); - REQUIRE(mi >= 0); - REQUIRE(doc.recompute()); - REQUIRE(doc.error.empty()); - - GProp_GProps props; - BRepGProp::VolumeProperties(doc.bodies[1].shape, props); - gp_Pnt com = props.CentreOfMass(); - REQUIRE_THAT(double(com.X()), WithinAbs(5.0, 1e-4)); - REQUIRE_THAT(double(com.Y()), WithinAbs(5.0, 1e-4)); - REQUIRE_THAT(double(com.Z()), WithinAbs(5.0, 1e-4)); -} - TEST_CASE("fastened mate with offset", "[CadDocument][mate]") { using Catch::Matchers::WithinAbs; @@ -5927,30 +5791,6 @@ TEST_CASE("mate round-trip serialization", "[CadDocument][mate]") REQUIRE(mf->mate_flip == true); } -TEST_CASE("version 2 blob is rejected", "[CadDocument][mate]") -{ - - CadDocument doc; - int sk = doc.add_sketch(SketchShape::Rectangle, SketchPlane::XY(), 10, 10, 0, "Box"); - doc.add_extrude(sk, 5.0, false, BooleanMode::New, "E"); - REQUIRE(doc.recompute()); - REQUIRE(doc.error.empty()); - - std::ostringstream oss; - { - cereal::BinaryOutputArchive ar(oss); - uint32_t fake_v = 2; - ar(fake_v); - ar(doc.features); - ar(doc.variables); - } - std::string blob = oss.str(); - - CadDocument fresh; - REQUIRE_FALSE(fresh.deserialize_recipe(blob)); - REQUIRE_CONTAINS(fresh.error, "older version"); -} - TEST_CASE("mate error: out of range connectors", "[CadDocument][mate]") { @@ -7693,17 +7533,6 @@ TEST_CASE("two holes are both subtracted", "[CadDocument][sketchwire]") REQUIRE_THAT(double(doc.display_mesh.volume()), Catch::Matchers::WithinRel(expected, 0.01)); } -TEST_CASE("a lone circle still extrudes exactly as before", "[CadDocument][sketchwire]") -{ - std::vector ents = { circle_entity({0, 0}, 8.0) }; - CadDocument doc = plate_doc(ents, 5.0); - - REQUIRE(doc.recompute()); - REQUIRE(doc.error.empty()); - const double expected = M_PI * 64.0 * 5.0; - REQUIRE_THAT(double(doc.display_mesh.volume()), Catch::Matchers::WithinRel(expected, 0.01)); -} - TEST_CASE("a closed polygon still extrudes exactly as before", "[CadDocument][sketchwire]") { std::vector ents = rect_entities(20, 20); diff --git a/tests/libslic3r/test_clipper_utils.cpp b/tests/libslic3r/test_clipper_utils.cpp index c9026a9ba2..ce38d2fcfd 100644 --- a/tests/libslic3r/test_clipper_utils.cpp +++ b/tests/libslic3r/test_clipper_utils.cpp @@ -155,51 +155,6 @@ SCENARIO("Various Clipper operations - xs/t/11_clipper.t", "[ClipperUtils]") { REQUIRE(result.front().length() == Catch::Approx(subject.length())); } } - -#if 0 - { - # Clipper does not preserve polyline orientation - my $polyline = Slic3r::Polyline->new([50, 150], [300, 150]); - my $result = Slic3r::Geometry::Clipper::intersection_pl([$polyline], [$square]); - is scalar(@$result), 1, 'intersection_pl - correct number of result lines'; - is_deeply $result->[0]->pp, [[100, 150], [200, 150]], 'clipped line orientation is preserved'; - } - { - # Clipper does not preserve polyline orientation - my $polyline = Slic3r::Polyline->new([300, 150], [50, 150]); - my $result = Slic3r::Geometry::Clipper::intersection_pl([$polyline], [$square]); - is scalar(@$result), 1, 'intersection_pl - correct number of result lines'; - is_deeply $result->[0]->pp, [[200, 150], [100, 150]], 'clipped line orientation is preserved'; - } - { - # Disabled until Clipper bug #127 is fixed - my $subject = [ - Slic3r::Polyline->new([-90000000, -100000000], [-90000000, 100000000]), # vertical - Slic3r::Polyline->new([-100000000, -10000000], [100000000, -10000000]), # horizontal - Slic3r::Polyline->new([-100000000, 0], [100000000, 0]), # horizontal - Slic3r::Polyline->new([-100000000, 10000000], [100000000, 10000000]), # horizontal - ]; - my $clip = Slic3r::Polygon->new(# a circular, convex, polygon - [99452190, 10452846], [97814760, 20791169], [95105652, 30901699], [91354546, 40673664], [86602540, 50000000], - [80901699, 58778525], [74314483, 66913061], [66913061, 74314483], [58778525, 80901699], [50000000, 86602540], - [40673664, 91354546], [30901699, 95105652], [20791169, 97814760], [10452846, 99452190], [0, 100000000], - [-10452846, 99452190], [-20791169, 97814760], [-30901699, 95105652], [-40673664, 91354546], - [-50000000, 86602540], [-58778525, 80901699], [-66913061, 74314483], [-74314483, 66913061], - [-80901699, 58778525], [-86602540, 50000000], [-91354546, 40673664], [-95105652, 30901699], - [-97814760, 20791169], [-99452190, 10452846], [-100000000, 0], [-99452190, -10452846], - [-97814760, -20791169], [-95105652, -30901699], [-91354546, -40673664], [-86602540, -50000000], - [-80901699, -58778525], [-74314483, -66913061], [-66913061, -74314483], [-58778525, -80901699], - [-50000000, -86602540], [-40673664, -91354546], [-30901699, -95105652], [-20791169, -97814760], - [-10452846, -99452190], [0, -100000000], [10452846, -99452190], [20791169, -97814760], - [30901699, -95105652], [40673664, -91354546], [50000000, -86602540], [58778525, -80901699], - [66913061, -74314483], [74314483, -66913061], [80901699, -58778525], [86602540, -50000000], - [91354546, -40673664], [95105652, -30901699], [97814760, -20791169], [99452190, -10452846], [100000000, 0] - ); - my $result = Slic3r::Geometry::Clipper::intersection_pl($subject, [$clip]); - is scalar(@$result), scalar(@$subject), 'intersection_pl - expected number of polylines'; - is sum(map scalar(@$_), @$result), scalar(@$subject) * 2, 'intersection_pl - expected number of points in polylines'; - } -#endif } SCENARIO("Various Clipper operations - t/clipper.t", "[ClipperUtils]") { diff --git a/tests/libslic3r/test_config.cpp b/tests/libslic3r/test_config.cpp index 20177bcc07..60c394fee1 100644 --- a/tests/libslic3r/test_config.cpp +++ b/tests/libslic3r/test_config.cpp @@ -643,45 +643,6 @@ SCENARIO("update_non_diff_values_to_base_config keeps a project's changed values } } -// SCENARIO("DynamicPrintConfig JSON serialization", "[Config]") { -// WHEN("DynamicPrintConfig is serialized and deserialized") { -// auto now = std::chrono::high_resolution_clock::now(); -// auto timestamp = now.time_since_epoch().count(); -// std::stringstream ss; -// ss << "catch_test_serialization_" << timestamp << ".json"; -// std::string filename = (fs::temp_directory_path() / ss.str()).string(); - -// TODO: Finish making a unit test for JSON serialization -// FullPrintConfig full_print_config; -// DynamicPrintConfig cfg; -// cfg.apply(full_print_config, false); - -// std::string serialized; -// try { -// std::ostringstream ss; -// cereal::BinaryOutputArchive oarchive(ss); -// oarchive(cfg); -// serialized = ss.str(); -// } catch (const std::runtime_error & /* e */) { -// // e.what(); -// } -// CAPTURE(serialized.length()); - -// THEN("Config object contains ini file options.") { -// DynamicPrintConfig cfg2; -// try { -// std::stringstream ss(serialized); -// cereal::BinaryInputArchive iarchive(ss); -// iarchive(cfg2); -// } catch (const std::runtime_error & /* e */) { -// // e.what(); -// } -// CAPTURE(cfg.diff_report(cfg2)); -// REQUIRE(cfg == cfg2); -// } -// } -// } - TEST_CASE("save_to_json round-trips plugin capability references as strings", "[Config][plugins]") { ScopedTemporaryFile tmp(".json"); const std::vector refs = { diff --git a/tests/libslic3r/test_elephant_foot_compensation.cpp b/tests/libslic3r/test_elephant_foot_compensation.cpp index 6388dab184..62a2bcd894 100644 --- a/tests/libslic3r/test_elephant_foot_compensation.cpp +++ b/tests/libslic3r/test_elephant_foot_compensation.cpp @@ -17,10 +17,6 @@ using namespace Slic3r; // #define TESTS_EXPORT_SVGS -namespace Slic3r { - Points mittered_offset_path_scaled(const Points& contour, const std::vector& deltas, double miter_limit); -} - static ExPolygon spirograph_gear_1mm() { ExPolygon out; @@ -479,33 +475,6 @@ SCENARIO("Elephant foot compensation", "[ElephantFoot]") { } } -#if 0 - GIVEN("Varying inner offset") { - ExPolygon input = spirograph_gear_1mm().simplify(SCALED_EPSILON).front(); - ExPolygon output; - std::vector deltas(input.contour.points.size(), scale_(1.)); - // mittered_offset_path_scaled_points is commented out somewhere above - output.contour.points = Slic3r::mittered_offset_path_scaled_points(input.contour.points, deltas, 2.); -#ifdef TESTS_EXPORT_SVGS - { - SVG svg(debug_out_path("elephant_foot_compensation_0.svg").c_str(), get_extents(output)); - svg.draw(input, "blue"); - svg.draw_outline(output, "black", coord_t(scale_(0.01))); - } -#endif /* TESTS_EXPORT_SVGS */ - for (size_t i = 0; i <= deltas.size() / 2; ++ i) - deltas[i] = deltas[deltas.size() - i - 1] = scale_(1.) * double(i) / (0.5 * double(deltas.size())); - output.contour.points = Slic3r::mittered_offset_path_scaled_points(input.contour.points, deltas, 2.); -#ifdef TESTS_EXPORT_SVGS - { - SVG svg(debug_out_path("elephant_foot_compensation_varying.svg").c_str(), get_extents(output)); - svg.draw(input, "blue"); - svg.draw_outline(output, "black", coord_t(scale_(0.01))); - } -#endif /* TESTS_EXPORT_SVGS */ - } -#endif - GIVEN("Rectangle with a narrow part sticking out") { // Rectangle ExPolygon expoly; diff --git a/tests/libslic3r/test_fill_plane_path.cpp b/tests/libslic3r/test_fill_plane_path.cpp index e28d74b4fc..7b0f6c8a95 100644 --- a/tests/libslic3r/test_fill_plane_path.cpp +++ b/tests/libslic3r/test_fill_plane_path.cpp @@ -208,20 +208,3 @@ TEST_CASE("Octagram spiral smooth factor controls corner curvature", "[FillPlane REQUIRE(path_length(half_smooth) < path_length(sharp)); REQUIRE(invalid_factor == sharp); } - -TEST_CASE("Hilbert curve smooth factor controls corner curvature", "[FillPlanePath]") -{ - const Points sharp = TestableHilbertCurve().generate_points(0.005); - const Points half_smooth = TestableHilbertCurve().generate_points(0.005, 0.5); - const Points full_smooth = TestableHilbertCurve().generate_points(0.005, 1.); - const Points invalid_factor = TestableHilbertCurve().generate_points( - 0.005, std::numeric_limits::quiet_NaN()); - - REQUIRE(full_smooth.front() == half_smooth.front()); - REQUIRE(full_smooth.back() == half_smooth.back()); - REQUIRE(path_length(full_smooth) < path_length(half_smooth)); - REQUIRE(invalid_factor == sharp); - - for (size_t i = 1; i < full_smooth.size(); ++i) - REQUIRE((full_smooth[i] - full_smooth[i - 1]).squaredNorm() > 0); -} diff --git a/tests/libslic3r/test_geometry.cpp b/tests/libslic3r/test_geometry.cpp index a8a6315628..09ed61a6b5 100644 --- a/tests/libslic3r/test_geometry.cpp +++ b/tests/libslic3r/test_geometry.cpp @@ -18,8 +18,6 @@ #include "libslic3r/ClipperUtils.hpp" #include "libslic3r/ShortestPath.hpp" -//#include -//#include "libnest2d/tools/benchmark.h" #include "libslic3r/SVG.hpp" #include "../libnest2d/printer_parts.hpp" @@ -605,73 +603,6 @@ TEST_CASE("Convex polygon intersection on two overlapping squares", "[Geometry][ REQUIRE(is_inters == true); } -//// Only for benchmarking -//static Polygon gen_convex_poly(std::mt19937_64 &rg, size_t point_cnt) -//{ -// std::uniform_int_distribution dist(0, 100); - -// Polygon out; -// out.points.reserve(point_cnt); - -// coord_t tr = dist(rg) * 2 / SCALING_FACTOR; - -// for (size_t i = 0; i < point_cnt; ++i) -// out.points.emplace_back(tr + dist(rg) / SCALING_FACTOR, -// tr + dist(rg) / SCALING_FACTOR); - -// return Geometry::convex_hull(out.points); -//} -//TEST_CASE("Convex polygon intersection test on random polygons", "[Geometry]") { -// constexpr size_t TEST_CNT = 1000; -// constexpr size_t POINT_CNT = 1000; - -// auto seed = std::random_device{}(); -//// unsigned long seed = 2525634386; -// std::mt19937_64 rg{seed}; -// Benchmark bench; - -// auto tests = reserve_vector>(TEST_CNT); -// auto results = reserve_vector(TEST_CNT); -// auto expects = reserve_vector(TEST_CNT); - -// for (size_t i = 0; i < TEST_CNT; ++i) { -// tests.emplace_back(gen_convex_poly(rg, POINT_CNT), gen_convex_poly(rg, POINT_CNT)); -// } - -// bench.start(); -// for (const auto &test : tests) -// results.emplace_back(Geometry::convex_polygons_intersect(test.first, test.second)); -// bench.stop(); - -// std::cout << "Test time: " << bench.getElapsedSec() << std::endl; - -// bench.start(); -// for (const auto &test : tests) -// expects.emplace_back(!intersection(test.first, test.second).empty()); -// bench.stop(); - -// std::cout << "Clipper time: " << bench.getElapsedSec() << std::endl; - -// REQUIRE(results.size() == expects.size()); - -// auto seedstr = std::to_string(seed); -// for (size_t i = 0; i < results.size(); ++i) { -// // std::cout << expects[i] << " "; - -// if (results[i] != expects[i]) { -// SVG svg{std::string("fail_seed") + seedstr + "_" + std::to_string(i) + ".svg"}; -// svg.draw(tests[i].first, "blue"); -// svg.draw(tests[i].second, "green"); -// svg.Close(); - -// // std::cout << std::endl; -// } -// REQUIRE(results[i] == expects[i]); -// } -// std::cout << std::endl; - -//} - struct Pair { size_t first, second; diff --git a/tests/libslic3r/test_imex_helpers.cpp b/tests/libslic3r/test_imex_helpers.cpp index 10240d7232..7bf0bad4f3 100644 --- a/tests/libslic3r/test_imex_helpers.cpp +++ b/tests/libslic3r/test_imex_helpers.cpp @@ -71,15 +71,6 @@ TEST_CASE("effective_physical_extruder_map - degenerate nozzle count still yield REQUIRE(effective_physical_extruder_map(nullptr, 0).values == std::vector{0}); } -TEST_CASE("effective_physical_extruder_map - IDEX ghost-color regression guard", "[IMEX]") { - // Dual extruder, no authored map. Before the GUI fix this produced a black ghost on T1 - // because first_filament_for_physical_head({0}, 1) == -1. - auto default_pem = make_pem({0}); - auto pem = effective_physical_extruder_map(&default_pem, 2); - REQUIRE(first_filament_for_physical_head(pem, 0) == 0); - REQUIRE(first_filament_for_physical_head(pem, 1) == 1); // no longer -1 -} - TEST_CASE("imex_pem_tool_for - non-parallel mode returns -1", "[IMEX]") { // Empty mode string (not in IMEX) and "primary" (IMEX present but not parallel) both // short-circuit to bare-firmware PA/temp emission. @@ -1058,12 +1049,6 @@ TEST_CASE("compute_imex_slice_offset - flag on + copy mode returns primary zone REQUIRE_THAT(z.y(), WithinAbs(40.0, 1e-9)); } -TEST_CASE("compute_imex_slice_offset - flag on + mirror mode returns primary zone center", "[IMEX]") { - auto z = compute_imex_slice_offset(true, "mirror", kPrimaryZoneCenteredAt60_40); - REQUIRE_THAT(z.x(), WithinAbs(60.0, 1e-9)); - REQUIRE_THAT(z.y(), WithinAbs(40.0, 1e-9)); -} - TEST_CASE("compute_imex_slice_offset - user-defined non-primary mode names trigger shift", "[IMEX]") { // Mode names are user-defined; anything not "primary" or "" should activate. auto z = compute_imex_slice_offset(true, "iq-copy", kPrimaryZoneCenteredAt60_40); diff --git a/tests/libslic3r/test_indexed_triangle_set.cpp b/tests/libslic3r/test_indexed_triangle_set.cpp index 202c1ad889..13942a7316 100644 --- a/tests/libslic3r/test_indexed_triangle_set.cpp +++ b/tests/libslic3r/test_indexed_triangle_set.cpp @@ -6,7 +6,6 @@ #include "libslic3r/Point.hpp" #include "libslic3r/libslic3r.h" #include -#include #include #include #include @@ -117,68 +116,6 @@ TEST_CASE("Split two watertight meshes", "[its_split][its]") { } #include -static float triangle_area(const Vec3f &v0, const Vec3f &v1, const Vec3f &v2) -{ - Vec3f ab = v1 - v0; - Vec3f ac = v2 - v0; - return ab.cross(ac).norm() / 2.f; -} - -static float triangle_area(const stl_triangle_vertex_indices &triangle_indices, const std::vector &vertices) -{ - return triangle_area(vertices[triangle_indices[0]], - vertices[triangle_indices[1]], - vertices[triangle_indices[2]]); -} - -#if 0 -// clang complains about unused functions -static std::mt19937 create_random_generator() { - std::random_device rd; - std::mt19937 gen(rd()); - return gen; -} -#endif - -std::vector its_sample_surface(const indexed_triangle_set &its, - double sample_per_mm2, - std::mt19937 random_generator) // = create_random_generator()) -{ - std::vector samples; - std::uniform_real_distribution rand01(0.f, 1.f); - for (const auto &triangle_indices : its.indices) { - float area = triangle_area(triangle_indices, its.vertices); - float countf; - float fractional = std::modf(area * sample_per_mm2, &countf); - int count = static_cast(countf); - - float generate = rand01(random_generator); - if (generate < fractional) ++count; - if (count == 0) continue; - - const Vec3f &v0 = its.vertices[triangle_indices[0]]; - const Vec3f &v1 = its.vertices[triangle_indices[1]]; - const Vec3f &v2 = its.vertices[triangle_indices[2]]; - for (int c = 0; c < count; c++) { - // barycentric coordinate - Vec3f b; - b[0] = rand01(random_generator); - b[1] = rand01(random_generator); - if ((b[0] + b[1]) > 1.f) { - b[0] = 1.f - b[0]; - b[1] = 1.f - b[1]; - } - b[2] = 1.f - b[0] - b[1]; - Vec3f pos; - for (int i = 0; i < 3; i++) { - pos[i] = b[0] * v0[i] + b[1] * v1[i] + b[2] * v2[i]; - } - samples.push_back(pos); - } - } - return samples; -} - #include "libslic3r/AABBTreeIndirect.hpp" diff --git a/tests/libslic3r/test_ordering_strategies.cpp b/tests/libslic3r/test_ordering_strategies.cpp index 97e5a83f60..016fdc635d 100644 --- a/tests/libslic3r/test_ordering_strategies.cpp +++ b/tests/libslic3r/test_ordering_strategies.cpp @@ -261,16 +261,6 @@ TEST_CASE("snake_core produces valid paths on ring", "[Snake]") { REQUIRE(is_permutation(p2, centers.size())); } -// --- Core Strategy Tests: Random Layout --- - -TEST_CASE("snake_core produces valid paths on random input", "[Snake]") { - Points centers = make_random_16(); - - auto p2 = snake_core(centers); - - REQUIRE(is_permutation(p2, centers.size())); -} - // --- Quality Comparison Tests --- TEST_CASE("snake has no crossings on random input", "[Snake]") { diff --git a/tests/libslic3r/test_precise_seam.cpp b/tests/libslic3r/test_precise_seam.cpp index d31c645f13..0a9e756ef6 100644 --- a/tests/libslic3r/test_precise_seam.cpp +++ b/tests/libslic3r/test_precise_seam.cpp @@ -730,25 +730,6 @@ TEST_CASE("Neighboring vertices distinguish repeated anchors on different lobes" CHECK(edges == std::vector{0, 2, 3, 4, 6, 7}); } -TEST_CASE("Modifier holes subtract coverage while separate components add intervals", "[PreciseSeam][SegmentExtraction]") -{ - const Polygon perimeter = rectangle(0, 0, 20, 20); - ExPolygon area(rectangle(1, -3, 10, 3)); - area.holes.push_back(rectangle(4, -1, 7, 1)); - area.holes.back().reverse(); - const auto result = PreciseSeam::extract_perimeter_segments(PreciseSeam::PreparedPerimeter(perimeter), - PreciseSeam::prepare_modifier_regions({area, ExPolygon(rectangle(14, -3, 18, 3))}), ModelVolumeType::PRECISE_SEAM_CENTER); - check_provenance(perimeter, result); - REQUIRE(result.segments.size() == 3); - const std::vector starts{mm(1, 0), mm(7, 0), mm(14, 0)}; - const std::vector ends{mm(4, 0), mm(10, 0), mm(18, 0)}; - for (size_t i = 0; i < 3; ++i) { - CHECK(result.segments[i].polyline.points.front() == starts[i]); - CHECK(result.segments[i].polyline.points.back() == ends[i]); - } - CHECK_FALSE(result.full_containment); -} - TEST_CASE("Full coverage is distinct from an empty or point-only intersection", "[PreciseSeam][SegmentExtraction]") { const bool reverse = GENERATE(false, true); diff --git a/tests/libslic3r/test_sketchconstraints.cpp b/tests/libslic3r/test_sketchconstraints.cpp index 36dabce84f..2e522682c7 100644 --- a/tests/libslic3r/test_sketchconstraints.cpp +++ b/tests/libslic3r/test_sketchconstraints.cpp @@ -239,30 +239,6 @@ TEST_CASE("DistanceX on two Points binds real roles with non-negative prefill", REQUIRE(p.defs[0].eb == 0); } -TEST_CASE("Horizontal on a Point rejects with NeedALine", "[SketchConstraints]") -{ - std::vector ents = { mk_point(1, 2) }; - ConstraintPlan p = plan_entity_constraint(ents, 0, -1, -1, SketchConstraintType::Horizontal); - REQUIRE(p.kind == ConstraintPlan::Kind::Reject); - REQUIRE(p.reason == ConstraintReject::NeedALine); -} - -TEST_CASE("Angle on two Circles rejects with NeedTwoLines", "[SketchConstraints]") -{ - std::vector ents = { mk_circle(0, 0, 1), mk_circle(5, 0, 1) }; - ConstraintPlan p = plan_entity_constraint(ents, 0, 1, -1, SketchConstraintType::Angle); - REQUIRE(p.kind == ConstraintPlan::Kind::Reject); - REQUIRE(p.reason == ConstraintReject::NeedTwoLines); -} - -TEST_CASE("Parallel on a Line + Circle rejects with NeedTwoLines (new guard)", "[SketchConstraints]") -{ - std::vector ents = { mk_line(0, 0, 1, 0), mk_circle(5, 0, 1) }; - ConstraintPlan p = plan_entity_constraint(ents, 0, 1, -1, SketchConstraintType::Parallel); - REQUIRE(p.kind == ConstraintPlan::Kind::Reject); - REQUIRE(p.reason == ConstraintReject::NeedTwoLines); -} - TEST_CASE("Equal on two Circles promotes to EqualRadius", "[SketchConstraints]") { std::vector ents = { mk_circle(0, 0, 1), mk_circle(5, 0, 2) }; diff --git a/tests/libslic3r/test_stl.cpp b/tests/libslic3r/test_stl.cpp index c6703739ff..83d013923a 100644 --- a/tests/libslic3r/test_stl.cpp +++ b/tests/libslic3r/test_stl.cpp @@ -44,17 +44,6 @@ SCENARIO("Reading an STL file", "[stl]") { REQUIRE(is_approx(model.objects.front()->volumes.front()->mesh().size(), Vec3d(20, 20, 20))); } } -#if 0 - // ASCII STLs ending with just carriage returns are not supported. These were used by the old Macs, while the Unix based MacOS uses LFs as any other Unix. - WHEN("line endings CR") { - Slic3r::Model model; - THEN("load should succeed") { - REQUIRE(Slic3r::load_stl(stl_path("ASCII/20mmbox-CR.stl").c_str(), &model)); - REQUIRE(is_approx(model.objects.front()->volumes.front()->mesh().size(), Vec3d(20, 20, 20))); - } - } - -#endif WHEN("nonstandard STL file (text after ending tags, invalid normals, for example infinities)") { Slic3r::Model model; THEN("load should succeed") { diff --git a/tests/libslic3r/test_texture_displacement.cpp b/tests/libslic3r/test_texture_displacement.cpp index 4c3e74d705..3202faffc8 100644 --- a/tests/libslic3r/test_texture_displacement.cpp +++ b/tests/libslic3r/test_texture_displacement.cpp @@ -3285,33 +3285,6 @@ TEST_CASE("a ModelUV layer falls back to Triplanar when the volume carries no UV CHECK_THAT((no_channel.vertices[i] - as_triplanar.vertices[i]).norm(), WithinAbs(0.f, 1e-5f)); } -TEST_CASE("a bake with colour off on every layer reports no colour at all", "[TextureDisplacement]") -{ - const indexed_triangle_set cube = its_make_cube(10., 10., 10.); - - TextureDisplacementLayer layer; - layer.slot = 0; - layer.depth_mm = 1.0f; - layer.tiling_scale = 5.0f; - layer.image_data = make_flat_rgb_png(200, 40, 10); // has colour to give... - layer.color_enabled = false; // ...but is not asked for it - - TextureDisplacementFacetsData facets{}; - facets[0] = paint_whole_mesh(cube); - - std::vector triangle_color; - TextureColorRequest request; - request.quantize = [](const Vec3f &) { return 0; }; // would colour everything, if asked - request.out_triangle = &triangle_color; - - const indexed_triangle_set out = build_texture_displacement(cube, {layer}, facets, classic_options(), {}, &request); - REQUIRE_FALSE(out.vertices.empty()); - // Every entry 0 ("this triangle takes no colour from the texture"), so the commit leaves whatever - // the model was already painted with exactly as it was. - for (const uint8_t entry : triangle_color) - CHECK(entry == 0); -} - TEST_CASE("transfer_uv_channel resamples a UV channel onto a subdivided copy of the same surface", "[TextureDisplacement]") { diff --git a/tests/libslic3r/test_vendor_cache.cpp b/tests/libslic3r/test_vendor_cache.cpp index b78ce77e1f..88dcf56369 100644 --- a/tests/libslic3r/test_vendor_cache.cpp +++ b/tests/libslic3r/test_vendor_cache.cpp @@ -1110,28 +1110,6 @@ TEST_CASE("a cache with the wrong cache version is rejected", "[VendorCache]") REQUIRE(!out.load_vendor_cache(cache.string(), vid, Semver("1.0.0"))); } -TEST_CASE("a cache truncated mid-blob is rejected", "[VendorCache]") -{ - TempDir tmp; - const std::string vid = "Acme"; - const fs::path cache = tmp.path / "vendor.opc"; - - REQUIRE(save_one_vendor(cache.string(), one_vendor(vid), vid, "1.0.0", - {filament_entry(vid + " PLA")})); - - { - std::ifstream in(cache.string(), std::ios::binary); - std::vector buf(30); // 20-byte header + 10 bytes of blob - in.read(buf.data(), 30); - in.close(); - std::ofstream out(cache.string(), std::ios::binary | std::ios::trunc); - out.write(buf.data(), 30); - } - - PresetBundle out; - REQUIRE(!out.load_vendor_cache(cache.string(), vid, Semver("1.0.0"))); -} - TEST_CASE("printer model bed texture fields survive a cache round-trip", "[VendorCache]") { TempDir tmp; diff --git a/tests/libslic3r/test_voronoi.cpp b/tests/libslic3r/test_voronoi.cpp index a08b84d3eb..f3263d224b 100644 --- a/tests/libslic3r/test_voronoi.cpp +++ b/tests/libslic3r/test_voronoi.cpp @@ -20,7 +20,6 @@ #include "libslic3r/libslic3r.h" #include #include -#include #include // #define VORONOI_DEBUG_OUT @@ -34,1318 +33,6 @@ using namespace Slic3r; using VD = Geometry::VoronoiDiagram; using BoostVD = boost::polygon::voronoi_diagram; -// https://svn.boost.org/trac10/ticket/12067 -// This bug seems to be confirmed. -// Vojtech supposes that there may be no Voronoi edges produced for -// the 1st and last sweep line positions. -TEST_CASE("Voronoi missing edges - points 12067", "[Voronoi]") -{ - Points pts { - { -10, -20 }, - { 10, -20 }, - { 5, 0 }, - { 10, 20 }, - { -10, 20 }, - { -5, 0 } - }; - -#if 0 - for (Point &p : pts) { - Vec2d q = p.cast(); - p.x() = scale_(p.x()); - p.y() = scale_(p.y()); - } -#endif - -#if 0 - // Try to rotate, maybe the issue is caused by incorrect handling of vertical or horizontal edges? - double a = 0.18764587962597876897475f; - double c = cos(a); - double s = sin(a); - for (Point &p : poly.points) { - Vec2d q = p.cast(); - p.x() = coord_t(q.x() * c + q.y() * s + 0.5); - p.y() = coord_t(- q.x() * s + q.y() * c + 0.5); - } -#endif - - // Construction of the Voronoi Diagram. - BoostVD vd; - construct_voronoi(pts.begin(), pts.end(), &vd); - -#ifdef VORONOI_DEBUG_OUT - dump_voronoi_to_svg(debug_out_path("voronoi-pts.svg").c_str(), - vd, pts, Lines()); -#endif - -// REQUIRE(closest_point.z() == Catch::Approx(1.)); -} - -// https://svn.boost.org/trac10/ticket/12707 -// This issue is confirmed, there are no self intersections in the polygon. -// A minimal test case is created at the end of this test, -// a new issue opened with the minimal test case: -// https://github.com/boostorg/polygon/issues/43 -TEST_CASE("Voronoi missing edges - Alessandro gapfill 12707", "[Voronoi]") -{ - Lines lines0 { - { { 42127548, 699996}, { 42127548, 10135750 } }, - { { 42127548, 10135750}, { 50487352, 10135750 } }, - { { 50487352, 10135750}, { 50487352, 699995 } }, - { { 50487352, 699995}, { 51187348, 0 } }, - { { 51187348, 0}, { 64325952, 0 } }, - { { 64325952, 0}, { 64325952, 699996 } }, - { { 64325952, 699996}, { 51187348, 699996 } }, - { { 51187348, 699996}, { 51187348, 10835701 } }, - { { 51187348, 10835701}, { 41427552, 10835701 } }, - { { 41427552, 10835701}, { 41427552, 699996 } }, - { { 41427552, 699996}, { 28664848, 699996 } }, - { { 28664848, 699996}, { 28664848, 10835701 } }, - { { 28664848, 10835701}, { 19280052, 10835701 } }, - { { 19280052, 10835701}, { 27964852, 699996 } }, - { { 27964852, 699996}, { 28664848, 0 } }, - { { 28664848, 0}, { 41427551, 0 } }, - { { 41427551, 0}, { 42127548, 699996 } } - }; - - Lines lines1 { - { { 42127548, 699996}, { 42127548, 10135750 } }, - { { 42127548, 10135750}, { 50487352, 10135750 } }, - { { 50487352, 10135750}, { 50487352, 699995 } }, - { { 50487352, 699995}, { 51187348, 0 } }, - { { 51187348, 0}, { 51187348, 10835701 } }, - { { 51187348, 10835701}, { 41427552, 10835701 } }, - { { 41427552, 10835701}, { 41427552, 699996 } }, - { { 41427552, 699996}, { 28664848, 699996 } }, - { { 28664848, 699996}, { 28664848, 10835701 } }, - { { 28664848, 10835701}, { 19280052, 10835701 } }, - { { 19280052, 10835701}, { 27964852, 699996 } }, - { { 27964852, 699996}, { 28664848, 0 } }, - { { 28664848, 0}, { 41427551, 0 } }, - { { 41427551, 0}, { 42127548, 699996 } } - }; - - Lines lines2 { - { { 42127548, 699996}, { 42127548, 10135750 } }, - { { 42127548, 10135750}, { 50487352, 10135750 } }, - { { 50487352, 10135750}, { 50487352, 699995 } }, - { { 50487352, 699995}, { 51187348, 0 } }, - { { 51187348, 0}, { 51187348, 10835701 } }, - { { 51187348, 10835701}, { 41427552, 10835701 } }, - { { 41427552, 10835701}, { 41427552, 699996 } }, - { { 41427552, 699996}, { 28664848, 699996 } }, - { { 28664848, 699996}, { 28664848, 10835701 } }, - { { 28664848, 10835701}, { 19280052, 10835701 } }, - { { 19280052, 10835701}, { 28664848, 0 } }, - { { 28664848, 0}, { 41427551, 0 } }, - { { 41427551, 0}, { 42127548, 699996 } } - }; - - Lines lines3 { - { { 42127548, 699996}, { 42127548, 10135750 } }, - { { 42127548, 10135750}, { 50487352, 10135750 } }, - { { 50487352, 10135750}, { 50487352, 699995 } }, - { { 50487352, 699995}, { 51187348, 0 } }, - { { 51187348, 0}, { 51187348, 10835701 } }, - { { 51187348, 10835701}, { 41427552, 10835701 } }, - { { 41427552, 10835701}, { 41427552, 699996 } }, - { { 41427552, 699996}, { 41427551, 0 } }, - { { 41427551, 0}, { 42127548, 699996 } } - }; - - Lines lines4 { - { { 42127548, 699996}, { 42127548, 10135750 } }, - { { 42127548, 10135750}, { 50487352, 10135750 } }, - { { 50487352, 10135750}, { 50487352, 699995 } }, - { { 50487352, 699995}, { 51187348, 0 } }, - { { 51187348, 0}, { 51187348, 10835701 } }, - { { 51187348, 10835701}, { 41427552, 10835701 } }, - { { 41427552, 10835701}, { 41427551, 0 } }, - { { 41427551, 0}, { 42127548, 699996 } } - }; - - Polygon poly { - { 0, 10000000}, - { 700000, 1}, // it has to be 1, higher number, zero or -1 work. - { 700000, 9000000}, - { 9100000, 9000000}, - { 9100000, 0}, - {10000000, 10000000} - }; - -#if 1 - // Try to rotate, maybe the issue is caused by incorrect handling of vertical or horizontal edges? - double a = 0.18764587962597876897475f; - double c = cos(a); - double s = sin(a); - for (Point &p : poly.points) { - Vec2d q = p.cast(); - p.x() = coord_t(q.x() * c + q.y() * s + 0.5); - p.y() = coord_t(- q.x() * s + q.y() * c + 0.5); - } -#endif - - std::mt19937 gen; - std::uniform_int_distribution dist(-100, 100); -#if 0 - for (Point &p : poly.points) { - // Wiggle the points a bit to find out whether this fixes the voronoi diagram for this particular polygon. - p.x() = (p.x() += dist(gen)); - p.y() = (p.y() += dist(gen)); - } -#endif - - REQUIRE(intersecting_edges({ poly }).empty()); - - Lines lines = to_lines(poly); - BoostVD vd; - construct_voronoi(lines.begin(), lines.end(), &vd); - -#ifdef VORONOI_DEBUG_OUT - dump_voronoi_to_svg(debug_out_path("voronoi-lines.svg").c_str(), - vd, Points(), lines); -#endif -} - -TEST_CASE("Voronoi weirdness", "[Voronoi]") -{ - Polygon poly2 { - { 0, 0 }, - { 70000000, 0 }, - { 70000000, 1300000 }, -// { 70000001, 14000000 } - { 70700000, 14000000 } - }; - - Polygon poly5 { - { 35058884, -25732145 }, - { 35058884, -19586070 }, - { 32753739, -20246796 }, - { 28756244, -21010725 }, - { 24657532, -21657939 }, - { 20836260, -21960233 }, - { 16115145, -22070742 }, - { 11850152, -21839761 }, - { 7646240, -21470177 }, - { 3607605, -20786940 }, - { 1280947, -20329742 }, - { -292823, -19963790 }, - { -3844469, -18809741 }, - { -7237277, -17593723 }, - { -10225900, -16143761 }, - { -13030266, -14643721 }, - { -15404294, -12977561 }, - { -17601713, -11280712 }, - { -19241930, -9435607 }, - { -20714420, -7583739 }, - { -21726144, -5664355 }, - { -22579294, -3741947 }, - { -22966684, -1786321 }, - { -23200322, 170140 }, - { -22966684, 2126602 }, - { -22579296, 4082227 }, - { -21726148, 6004637 }, - { -20714424, 7924020 }, - { -19241932, 9775888 }, - { -17601717, 11620994 }, - { -15404423, 13317749 }, - { -13030276, 14984003 }, - { -10225910, 16484042 }, - { -7237288, 17934005 }, - { -3844482, 19150025 }, - { -292841, 20304074 }, - { 1280949, 20670031 }, - { 3607587, 21127226 }, - { 7646218, 21810465 }, - { 11850128, 22180055 }, - { 16115122, 22411036 }, - { 20836263, 22300531 }, - { 24657513, 21998239 }, - { 28756227, 21351025 }, - { 32753725, 20587092 }, - { 35058893, 19926309 }, - { 35058893, 35000000 }, - { -31657232, 35000000 }, - { -31657202, -35000000 }, - { 35058881, -35000000 } - }; - - Polygon poly7 { - { 35058884, -25732145 }, - { 35058884, -19586070 }, - { -31657202, -35000000 }, - { 35058881, -35000000 } - }; - -// coord_t shift = 35058881; -// coord_t shift_ok = 17000000; - coord_t shift = 35058881; - Polygon poly { - // <-4, 0>: bug - // -5: ok - // 1 - ok - { 0 + shift, -35000000 }, - { 0 + shift, -25732145 }, - { 0 + shift, -19586070 }, - { -66716086 + shift, -35000000 } - }; - - REQUIRE(intersecting_edges({ poly }).empty()); - REQUIRE(poly.area() > 0.); - -#if 0 - // Try to rotate, maybe the issue is caused by incorrect handling of vertical or horizontal edges? - double a = 0.18764587962597876897475f; - double c = cos(a); - double s = sin(a); - for (Point &p : poly.points) { - Vec2d q = p.cast(); - p.x() = coord_t(q.x() * c + q.y() * s + 0.5); - p.y() = coord_t(- q.x() * s + q.y() * c + 0.5); - } -#endif - - BoostVD vd; - Lines lines = to_lines(poly); - construct_voronoi(lines.begin(), lines.end(), &vd); - -#ifdef VORONOI_DEBUG_OUT - dump_voronoi_to_svg(debug_out_path("voronoi-weirdness.svg").c_str(), - vd, Points(), lines); -#endif -} - -// https://svn.boost.org/trac10/ticket/12903 -// division by zero reported, but this issue is most likely a non-issue, as it produces an infinity for the interval of validity -// of the floating point calculation, therefore forcing a recalculation with extended accuracy. -TEST_CASE("Voronoi division by zero 12903", "[Voronoi]") -{ - Points pts { { 1, 1 }, { 3, 1 }, { 1, 3 }, { 3, 3 }, - { -1, 1 }, { 1, -1 }, { 5, 1 }, { 3, -1 }, - { -1, 3 }, { 1, 5 }, { 5, 3 }, { 3, 5 } }; - { - auto pts2 { pts }; - std::sort(pts2.begin(), pts2.end(), [](auto &l, auto &r) { return (l.x() == r.x()) ? l.y() < r.y() : l.x() < r.x(); }); - // No point removed -> no duplicate. - REQUIRE(std::unique(pts2.begin(), pts2.end()) == pts2.end()); - } - - BoostVD vd; - construct_voronoi(pts.begin(), pts.end(), &vd); - -#ifdef VORONOI_DEBUG_OUT - // Scale the voronoi vertices and input points, so that the dump_voronoi_to_svg will display them correctly. - for (auto &pt : vd.vertices()) { - const_cast(pt.x()) = scale_(pt.x()); - const_cast(pt.y()) = scale_(pt.y()); - } - for (auto &pt : pts) - pt = Point::new_scale(pt.x(), pt.y()); - dump_voronoi_to_svg(debug_out_path("voronoi-div-by-zero.svg").c_str(), vd, pts, Lines()); -#endif -} - -// https://svn.boost.org/trac10/ticket/12139 -// Funny sample from a dental industry? -// Vojtech confirms this test fails and rightly so, because the input data contain self intersections. -// This test is suppressed. -TEST_CASE("Voronoi NaN coordinates 12139", "[Voronoi][.][!mayfail]") -{ - Lines lines = { - { { 260500,1564400 }, { 261040,1562960 } }, - { { 261040,1562960 }, { 260840,1561780 } }, - { { 260840,1561780 }, { 262620,1561480 } }, - { { 262620,1561480 }, { 263160,1561220 } }, - { { 263160,1561220 }, { 264100,1563259 } }, - { { 264100,1563259 }, { 262380,1566980 } }, - { { 262380,1566980 }, { 260500,1564400 } }, - { { 137520,1851640 }, { 132160,1851100 } }, - { { 132160,1851100 }, { 126460,1848779 } }, - { { 126460,1848779 }, { 123960,1847320 } }, - { { 123960,1847320 }, { 120960,1844559 } }, - { { 120960,1844559 }, { 119640,1843040 } }, - { { 119640,1843040 }, { 118320,1840900 } }, - { { 118320,1840900 }, { 117920,1838120 } }, - { { 117920,1838120 }, { 118219,1833340 } }, - { { 118219,1833340 }, { 116180,1835000 } }, - { { 116180,1835000 }, { 115999,1834820 } }, - { { 115999,1834820 }, { 114240,1836340 } }, - { { 114240,1836340 }, { 112719,1837260 } }, - { { 112719,1837260 }, { 109460,1838239 } }, - { { 109460,1838239 }, { 103639,1837480 } }, - { { 103639,1837480 }, { 99819,1835460 } }, - { { 99819,1835460 }, { 96320,1834260 } }, - { { 96320,1834260 }, { 95339,1834260 } }, - { { 95339,1834260 }, { 93660,1833720 } }, - { { 93660,1833720 }, { 90719,1833300 } }, - { { 90719,1833300 }, { 87860,1831660 } }, - { { 87860,1831660 }, { 84580,1830499 } }, - { { 84580,1830499 }, { 79780,1827419 } }, - { { 79780,1827419 }, { 76020,1824280 } }, - { { 76020,1824280 }, { 73680,1821180 } }, - { { 73680,1821180 }, { 72560,1818960 } }, - { { 72560,1818960 }, { 71699,1817719 } }, - { { 71699,1817719 }, { 70280,1814260 } }, - { { 70280,1814260 }, { 69460,1811060 } }, - { { 69460,1811060 }, { 69659,1807320 } }, - { { 69659,1807320 }, { 69640,1803300 } }, - { { 69640,1803300 }, { 69360,1799780 } }, - { { 69360,1799780 }, { 69320,1796720 } }, - { { 69320,1796720 }, { 69640,1793980 } }, - { { 69640,1793980 }, { 70160,1791780 } }, - { { 70160,1791780 }, { 72460,1784879 } }, - { { 72460,1784879 }, { 74420,1780780 } }, - { { 74420,1780780 }, { 76500,1772899 } }, - { { 76500,1772899 }, { 76760,1769359 } }, - { { 76760,1769359 }, { 76480,1766259 } }, - { { 76480,1766259 }, { 76839,1760360 } }, - { { 76839,1760360 }, { 77539,1756680 } }, - { { 77539,1756680 }, { 80540,1748140 } }, - { { 80540,1748140 }, { 84200,1742619 } }, - { { 84200,1742619 }, { 90900,1735220 } }, - { { 90900,1735220 }, { 94159,1732679 } }, - { { 94159,1732679 }, { 101259,1729559 } }, - { { 101259,1729559 }, { 107299,1727939 } }, - { { 107299,1727939 }, { 110979,1727919 } }, - { { 110979,1727919 }, { 113499,1727240 } }, - { { 113499,1727240 }, { 113619,1727359 } }, - { { 113619,1727359 }, { 114280,1727280 } }, - { { 114280,1727280 }, { 131440,1732560 } }, - { { 131440,1732560 }, { 118140,1727119 } }, - { { 118140,1727119 }, { 117120,1723759 } }, - { { 117120,1723759 }, { 113840,1720660 } }, - { { 113840,1720660 }, { 111399,1716760 } }, - { { 111399,1716760 }, { 109700,1712979 } }, - { { 109700,1712979 }, { 108879,1708400 } }, - { { 108879,1708400 }, { 108060,1696360 } }, - { { 108060,1696360 }, { 110040,1687760 } }, - { { 110040,1687760 }, { 112140,1682480 } }, - { { 112140,1682480 }, { 112540,1681780 } }, - { { 112540,1681780 }, { 115260,1678320 } }, - { { 115260,1678320 }, { 118720,1675320 } }, - { { 118720,1675320 }, { 126100,1670980 } }, - { { 126100,1670980 }, { 132400,1668080 } }, - { { 132400,1668080 }, { 136700,1667440 } }, - { { 136700,1667440 }, { 142440,1667159 } }, - { { 142440,1667159 }, { 143340,1666720 } }, - { { 143340,1666720 }, { 138679,1661319 } }, - { { 138679,1661319 }, { 137240,1657480 } }, - { { 137240,1657480 }, { 136760,1650739 } }, - { { 136760,1650739 }, { 136780,1647339 } }, - { { 136780,1647339 }, { 135940,1644280 } }, - { { 135940,1644280 }, { 136000,1640820 } }, - { { 136000,1640820 }, { 135480,1638020 } }, - { { 135480,1638020 }, { 137060,1634220 } }, - { { 137060,1634220 }, { 136320,1631340 } }, - { { 136320,1631340 }, { 134620,1629700 } }, - { { 134620,1629700 }, { 132460,1628199 } }, - { { 132460,1628199 }, { 132299,1627860 } }, - { { 132299,1627860 }, { 138360,1618020 } }, - { { 138360,1618020 }, { 142440,1611859 } }, - { { 142440,1611859 }, { 143180,1611299 } }, - { { 143180,1611299 }, { 144000,1611259 } }, - { { 144000,1611259 }, { 145960,1612540 } }, - { { 145960,1612540 }, { 146720,1613700 } }, - { { 146720,1613700 }, { 147700,1613539 } }, - { { 147700,1613539 }, { 148520,1614039 } }, - { { 148520,1614039 }, { 149840,1613740 } }, - { { 149840,1613740 }, { 150620,1614079 } }, - { { 150620,1614079 }, { 154760,1612740 } }, - { { 154760,1612740 }, { 159000,1608420 } }, - { { 159000,1608420 }, { 161120,1606780 } }, - { { 161120,1606780 }, { 164060,1605139 } }, - { { 164060,1605139 }, { 168079,1603620 } }, - { { 168079,1603620 }, { 170240,1603400 } }, - { { 170240,1603400 }, { 172400,1603499 } }, - { { 172400,1603499 }, { 194440,1613740 } }, - { { 194440,1613740 }, { 195880,1616460 } }, - { { 195880,1616460 }, { 197060,1618140 } }, - { { 197060,1618140 }, { 198039,1617860 } }, - { { 198039,1617860 }, { 198739,1618900 } }, - { { 198739,1618900 }, { 200259,1619200 } }, - { { 200259,1619200 }, { 201940,1618920 } }, - { { 201940,1618920 }, { 201700,1617139 } }, - { { 201700,1617139 }, { 203860,1618179 } }, - { { 203860,1618179 }, { 203500,1617540 } }, - { { 203500,1617540 }, { 205000,1616579 } }, - { { 205000,1616579 }, { 206780,1615020 } }, - { { 206780,1615020 }, { 210159,1614059 } }, - { { 210159,1614059 }, { 217080,1611080 } }, - { { 217080,1611080 }, { 219200,1611579 } }, - { { 219200,1611579 }, { 223219,1610980 } }, - { { 223219,1610980 }, { 224580,1610540 } }, - { { 224580,1610540 }, { 227460,1611440 } }, - { { 227460,1611440 }, { 229359,1611859 } }, - { { 229359,1611859 }, { 230620,1612580 } }, - { { 230620,1612580 }, { 232340,1614460 } }, - { { 232340,1614460 }, { 232419,1617040 } }, - { { 232419,1617040 }, { 231740,1619480 } }, - { { 231740,1619480 }, { 231880,1624899 } }, - { { 231880,1624899 }, { 231540,1625820 } }, - { { 231540,1625820 }, { 231700,1627079 } }, - { { 231700,1627079 }, { 231320,1628239 } }, - { { 231320,1628239 }, { 231420,1636080 } }, - { { 231420,1636080 }, { 231099,1637200 } }, - { { 231099,1637200 }, { 228660,1643280 } }, - { { 228660,1643280 }, { 227699,1644960 } }, - { { 227699,1644960 }, { 226080,1651140 } }, - { { 226080,1651140 }, { 225259,1653420 } }, - { { 225259,1653420 }, { 225159,1655399 } }, - { { 225159,1655399 }, { 223760,1659260 } }, - { { 223760,1659260 }, { 219860,1666360 } }, - { { 219860,1666360 }, { 219180,1667220 } }, - { { 219180,1667220 }, { 212580,1673680 } }, - { { 212580,1673680 }, { 207880,1676460 } }, - { { 207880,1676460 }, { 205560,1677560 } }, - { { 205560,1677560 }, { 199700,1678920 } }, - { { 199700,1678920 }, { 195280,1679420 } }, - { { 195280,1679420 }, { 193939,1679879 } }, - { { 193939,1679879 }, { 188780,1679440 } }, - { { 188780,1679440 }, { 188100,1679639 } }, - { { 188100,1679639 }, { 186680,1679339 } }, - { { 186680,1679339 }, { 184760,1679619 } }, - { { 184760,1679619 }, { 183520,1681440 } }, - { { 183520,1681440 }, { 183860,1682200 } }, - { { 183860,1682200 }, { 186620,1686120 } }, - { { 186620,1686120 }, { 190380,1688380 } }, - { { 190380,1688380 }, { 192780,1690739 } }, - { { 192780,1690739 }, { 195860,1694839 } }, - { { 195860,1694839 }, { 196620,1696539 } }, - { { 196620,1696539 }, { 197540,1701819 } }, - { { 197540,1701819 }, { 198939,1705699 } }, - { { 198939,1705699 }, { 198979,1711819 } }, - { { 198979,1711819 }, { 198240,1716900 } }, - { { 198240,1716900 }, { 197440,1720139 } }, - { { 197440,1720139 }, { 195340,1724639 } }, - { { 195340,1724639 }, { 194040,1726140 } }, - { { 194040,1726140 }, { 192559,1728239 } }, - { { 192559,1728239 }, { 187780,1732339 } }, - { { 187780,1732339 }, { 182519,1735520 } }, - { { 182519,1735520 }, { 181239,1736140 } }, - { { 181239,1736140 }, { 177340,1737619 } }, - { { 177340,1737619 }, { 175439,1738140 } }, - { { 175439,1738140 }, { 171380,1738880 } }, - { { 171380,1738880 }, { 167860,1739059 } }, - { { 167860,1739059 }, { 166040,1738920 } }, - { { 166040,1738920 }, { 163680,1738539 } }, - { { 163680,1738539 }, { 157660,1736859 } }, - { { 157660,1736859 }, { 154900,1735460 } }, - { { 154900,1735460 }, { 151420,1735159 } }, - { { 151420,1735159 }, { 142100,1736160 } }, - { { 142100,1736160 }, { 140880,1735920 } }, - { { 140880,1735920 }, { 142820,1736859 } }, - { { 142820,1736859 }, { 144080,1737240 } }, - { { 144080,1737240 }, { 144280,1737460 } }, - { { 144280,1737460 }, { 144239,1738120 } }, - { { 144239,1738120 }, { 144980,1739420 } }, - { { 144980,1739420 }, { 146340,1741039 } }, - { { 146340,1741039 }, { 147160,1741720 } }, - { { 147160,1741720 }, { 154260,1745800 } }, - { { 154260,1745800 }, { 156560,1746879 } }, - { { 156560,1746879 }, { 165180,1752679 } }, - { { 165180,1752679 }, { 168240,1755860 } }, - { { 168240,1755860 }, { 170940,1759260 } }, - { { 170940,1759260 }, { 173440,1762079 } }, - { { 173440,1762079 }, { 174540,1764079 } }, - { { 174540,1764079 }, { 176479,1766640 } }, - { { 176479,1766640 }, { 178900,1768960 } }, - { { 178900,1768960 }, { 180819,1772780 } }, - { { 180819,1772780 }, { 181479,1776859 } }, - { { 181479,1776859 }, { 181660,1788499 } }, - { { 181660,1788499 }, { 181460,1791740 } }, - { { 181460,1791740 }, { 181160,1792840 } }, - { { 181160,1792840 }, { 179580,1797180 } }, - { { 179580,1797180 }, { 174620,1808960 } }, - { { 174620,1808960 }, { 174100,1809839 } }, - { { 174100,1809839 }, { 171660,1812419 } }, - { { 171660,1812419 }, { 169639,1813840 } }, - { { 169639,1813840 }, { 168880,1814720 } }, - { { 168880,1814720 }, { 168960,1815980 } }, - { { 168960,1815980 }, { 169979,1819160 } }, - { { 169979,1819160 }, { 170080,1820159 } }, - { { 170080,1820159 }, { 168280,1830540 } }, - { { 168280,1830540 }, { 167580,1832200 } }, - { { 167580,1832200 }, { 165679,1835720 } }, - { { 165679,1835720 }, { 164720,1836819 } }, - { { 164720,1836819 }, { 161840,1841740 } }, - { { 161840,1841740 }, { 159880,1843519 } }, - { { 159880,1843519 }, { 158959,1844120 } }, - { { 158959,1844120 }, { 154960,1847500 } }, - { { 154960,1847500 }, { 152140,1848580 } }, - { { 152140,1848580 }, { 150440,1849520 } }, - { { 150440,1849520 }, { 144940,1850980 } }, - { { 144940,1850980 }, { 138340,1851700 } }, - { { 138340,1851700 }, { 137520,1851640 } }, - { { 606940,1873860 }, { 602860,1872460 } }, - { { 602860,1872460 }, { 600680,1871539 } }, - { { 600680,1871539 }, { 599300,1870640 } }, - { { 599300,1870640 }, { 598120,1869579 } }, - { { 598120,1869579 }, { 594680,1867180 } }, - { { 594680,1867180 }, { 589680,1861460 } }, - { { 589680,1861460 }, { 586300,1855020 } }, - { { 586300,1855020 }, { 584700,1848060 } }, - { { 584700,1848060 }, { 585199,1843499 } }, - { { 585199,1843499 }, { 584000,1842079 } }, - { { 584000,1842079 }, { 582900,1841480 } }, - { { 582900,1841480 }, { 581020,1839899 } }, - { { 581020,1839899 }, { 579440,1838040 } }, - { { 579440,1838040 }, { 577840,1834299 } }, - { { 577840,1834299 }, { 576160,1831859 } }, - { { 576160,1831859 }, { 574540,1828499 } }, - { { 574540,1828499 }, { 572140,1822860 } }, - { { 572140,1822860 }, { 570180,1815219 } }, - { { 570180,1815219 }, { 570080,1812280 } }, - { { 570080,1812280 }, { 570340,1808300 } }, - { { 570340,1808300 }, { 570160,1807119 } }, - { { 570160,1807119 }, { 570140,1804039 } }, - { { 570140,1804039 }, { 571640,1796660 } }, - { { 571640,1796660 }, { 571740,1794680 } }, - { { 571740,1794680 }, { 572279,1794039 } }, - { { 572279,1794039 }, { 575480,1788300 } }, - { { 575480,1788300 }, { 576379,1787419 } }, - { { 576379,1787419 }, { 577020,1786120 } }, - { { 577020,1786120 }, { 578000,1785100 } }, - { { 578000,1785100 }, { 579960,1783720 } }, - { { 579960,1783720 }, { 581420,1782079 } }, - { { 581420,1782079 }, { 585480,1778440 } }, - { { 585480,1778440 }, { 586680,1777079 } }, - { { 586680,1777079 }, { 590520,1774639 } }, - { { 590520,1774639 }, { 592440,1773199 } }, - { { 592440,1773199 }, { 595160,1772260 } }, - { { 595160,1772260 }, { 598079,1770920 } }, - { { 598079,1770920 }, { 601420,1769019 } }, - { { 601420,1769019 }, { 606400,1767280 } }, - { { 606400,1767280 }, { 607320,1766620 } }, - { { 607320,1766620 }, { 605760,1766460 } }, - { { 605760,1766460 }, { 604420,1766780 } }, - { { 604420,1766780 }, { 601660,1766579 } }, - { { 601660,1766579 }, { 597160,1766980 } }, - { { 597160,1766980 }, { 591420,1766720 } }, - { { 591420,1766720 }, { 585360,1765460 } }, - { { 585360,1765460 }, { 578540,1763680 } }, - { { 578540,1763680 }, { 574020,1761599 } }, - { { 574020,1761599 }, { 572520,1760560 } }, - { { 572520,1760560 }, { 570959,1759000 } }, - { { 570959,1759000 }, { 566580,1755620 } }, - { { 566580,1755620 }, { 563820,1752000 } }, - { { 563820,1752000 }, { 563140,1751380 } }, - { { 563140,1751380 }, { 560800,1747899 } }, - { { 560800,1747899 }, { 558640,1742280 } }, - { { 558640,1742280 }, { 557860,1741620 } }, - { { 557860,1741620 }, { 555820,1739099 } }, - { { 555820,1739099 }, { 553920,1737540 } }, - { { 553920,1737540 }, { 551900,1735179 } }, - { { 551900,1735179 }, { 551180,1733880 } }, - { { 551180,1733880 }, { 549540,1729559 } }, - { { 549540,1729559 }, { 548860,1720720 } }, - { { 548860,1720720 }, { 549080,1719099 } }, - { { 549080,1719099 }, { 548200,1714700 } }, - { { 548200,1714700 }, { 547560,1713860 } }, - { { 547560,1713860 }, { 544500,1711259 } }, - { { 544500,1711259 }, { 543939,1709780 } }, - { { 543939,1709780 }, { 544520,1705439 } }, - { { 544520,1705439 }, { 543520,1701519 } }, - { { 543520,1701519 }, { 543920,1699319 } }, - { { 543920,1699319 }, { 546360,1697440 } }, - { { 546360,1697440 }, { 546680,1695419 } }, - { { 546680,1695419 }, { 545600,1694180 } }, - { { 545600,1694180 }, { 543220,1692000 } }, - { { 543220,1692000 }, { 538260,1685139 } }, - { { 538260,1685139 }, { 537540,1683000 } }, - { { 537540,1683000 }, { 537020,1682220 } }, - { { 537020,1682220 }, { 535560,1675940 } }, - { { 535560,1675940 }, { 535940,1671220 } }, - { { 535940,1671220 }, { 536320,1669379 } }, - { { 536320,1669379 }, { 535420,1666400 } }, - { { 535420,1666400 }, { 533540,1664460 } }, - { { 533540,1664460 }, { 530720,1662860 } }, - { { 530720,1662860 }, { 529240,1662260 } }, - { { 529240,1662260 }, { 528780,1659160 } }, - { { 528780,1659160 }, { 528820,1653560 } }, - { { 528820,1653560 }, { 529779,1650900 } }, - { { 529779,1650900 }, { 536760,1640840 } }, - { { 536760,1640840 }, { 540360,1636120 } }, - { { 540360,1636120 }, { 541160,1635380 } }, - { { 541160,1635380 }, { 544719,1629480 } }, - { { 544719,1629480 }, { 545319,1626140 } }, - { { 545319,1626140 }, { 543560,1623740 } }, - { { 543560,1623740 }, { 539880,1620739 } }, - { { 539880,1620739 }, { 533400,1617300 } }, - { { 533400,1617300 }, { 527840,1613020 } }, - { { 527840,1613020 }, { 525200,1611579 } }, - { { 525200,1611579 }, { 524360,1610800 } }, - { { 524360,1610800 }, { 517320,1605739 } }, - { { 517320,1605739 }, { 516240,1604240 } }, - { { 516240,1604240 }, { 515220,1602000 } }, - { { 515220,1602000 }, { 514079,1594240 } }, - { { 514079,1594240 }, { 513740,1581460 } }, - { { 513740,1581460 }, { 514660,1577359 } }, - { { 514660,1577359 }, { 514660,1576380 } }, - { { 514660,1576380 }, { 514199,1575380 } }, - { { 514199,1575380 }, { 514680,1572860 } }, - { { 514680,1572860 }, { 513440,1573940 } }, - { { 513440,1573940 }, { 512399,1575580 } }, - { { 512399,1575580 }, { 511620,1576220 } }, - { { 511620,1576220 }, { 507840,1581880 } }, - { { 507840,1581880 }, { 504600,1584579 } }, - { { 504600,1584579 }, { 502440,1584599 } }, - { { 502440,1584599 }, { 499060,1584059 } }, - { { 499060,1584059 }, { 498019,1581960 } }, - { { 498019,1581960 }, { 497819,1581240 } }, - { { 497819,1581240 }, { 498019,1576039 } }, - { { 498019,1576039 }, { 497539,1574740 } }, - { { 497539,1574740 }, { 495459,1574460 } }, - { { 495459,1574460 }, { 492320,1575600 } }, - { { 492320,1575600 }, { 491040,1576360 } }, - { { 491040,1576360 }, { 490080,1575640 } }, - { { 490080,1575640 }, { 490020,1575040 } }, - { { 490020,1575040 }, { 490220,1574400 } }, - { { 490220,1574400 }, { 490819,1573440 } }, - { { 490819,1573440 }, { 492680,1568259 } }, - { { 492680,1568259 }, { 492920,1566799 } }, - { { 492920,1566799 }, { 495760,1563660 } }, - { { 495760,1563660 }, { 496100,1562139 } }, - { { 496100,1562139 }, { 497879,1560240 } }, - { { 497879,1560240 }, { 497059,1558020 } }, - { { 497059,1558020 }, { 495620,1557399 } }, - { { 495620,1557399 }, { 494800,1556839 } }, - { { 494800,1556839 }, { 493500,1555479 } }, - { { 493500,1555479 }, { 491860,1554100 } }, - { { 491860,1554100 }, { 487840,1552139 } }, - { { 487840,1552139 }, { 485900,1551720 } }, - { { 485900,1551720 }, { 483639,1555439 } }, - { { 483639,1555439 }, { 482080,1556480 } }, - { { 482080,1556480 }, { 480200,1556259 } }, - { { 480200,1556259 }, { 478519,1556259 } }, - { { 478519,1556259 }, { 474020,1554019 } }, - { { 474020,1554019 }, { 472660,1551539 } }, - { { 472660,1551539 }, { 471260,1549899 } }, - { { 471260,1549899 }, { 470459,1548020 } }, - { { 470459,1548020 }, { 469920,1545479 } }, - { { 469920,1545479 }, { 469079,1542939 } }, - { { 469079,1542939 }, { 469120,1541799 } }, - { { 469120,1541799 }, { 465840,1537139 } }, - { { 465840,1537139 }, { 463360,1539059 } }, - { { 463360,1539059 }, { 459680,1546900 } }, - { { 459680,1546900 }, { 458439,1547160 } }, - { { 458439,1547160 }, { 456480,1549319 } }, - { { 456480,1549319 }, { 454160,1551400 } }, - { { 454160,1551400 }, { 452819,1550820 } }, - { { 452819,1550820 }, { 451699,1549839 } }, - { { 451699,1549839 }, { 449620,1548440 } }, - { { 449620,1548440 }, { 449419,1548080 } }, - { { 449419,1548080 }, { 447879,1547720 } }, - { { 447879,1547720 }, { 446540,1546819 } }, - { { 446540,1546819 }, { 445720,1545640 } }, - { { 445720,1545640 }, { 444800,1545100 } }, - { { 444800,1545100 }, { 443500,1542899 } }, - { { 443500,1542899 }, { 443320,1541799 } }, - { { 443320,1541799 }, { 443519,1540220 } }, - { { 443519,1540220 }, { 445060,1537099 } }, - { { 445060,1537099 }, { 445840,1533040 } }, - { { 445840,1533040 }, { 442720,1529079 } }, - { { 442720,1529079 }, { 442479,1528360 } }, - { { 442479,1528360 }, { 436820,1529240 } }, - { { 436820,1529240 }, { 436279,1529200 } }, - { { 436279,1529200 }, { 433280,1529859 } }, - { { 433280,1529859 }, { 420220,1529899 } }, - { { 420220,1529899 }, { 414740,1528539 } }, - { { 414740,1528539 }, { 411340,1527960 } }, - { { 411340,1527960 }, { 406860,1524660 } }, - { { 406860,1524660 }, { 405379,1523080 } }, - { { 405379,1523080 }, { 403639,1520320 } }, - { { 403639,1520320 }, { 402040,1517220 } }, - { { 402040,1517220 }, { 400519,1517059 } }, - { { 400519,1517059 }, { 399180,1516720 } }, - { { 399180,1516720 }, { 395300,1515179 } }, - { { 395300,1515179 }, { 394780,1515080 } }, - { { 394780,1515080 }, { 394759,1515900 } }, - { { 394759,1515900 }, { 394339,1516579 } }, - { { 394339,1516579 }, { 393200,1516640 } }, - { { 393200,1516640 }, { 392599,1521799 } }, - { { 392599,1521799 }, { 391699,1525200 } }, - { { 391699,1525200 }, { 391040,1525600 } }, - { { 391040,1525600 }, { 390540,1526500 } }, - { { 390540,1526500 }, { 388999,1527939 } }, - { { 388999,1527939 }, { 387059,1531100 } }, - { { 387059,1531100 }, { 386540,1531440 } }, - { { 386540,1531440 }, { 382140,1531839 } }, - { { 382140,1531839 }, { 377360,1532619 } }, - { { 377360,1532619 }, { 375640,1532220 } }, - { { 375640,1532220 }, { 372580,1531019 } }, - { { 372580,1531019 }, { 371079,1529019 } }, - { { 371079,1529019 }, { 367280,1526039 } }, - { { 367280,1526039 }, { 366460,1521900 } }, - { { 366460,1521900 }, { 364320,1516400 } }, - { { 364320,1516400 }, { 363779,1515780 } }, - { { 363779,1515780 }, { 362220,1515320 } }, - { { 362220,1515320 }, { 361979,1515060 } }, - { { 361979,1515060 }, { 360820,1515739 } }, - { { 360820,1515739 }, { 353360,1518620 } }, - { { 353360,1518620 }, { 347840,1520080 } }, - { { 347840,1520080 }, { 342399,1521140 } }, - { { 342399,1521140 }, { 334899,1523380 } }, - { { 334899,1523380 }, { 333220,1523400 } }, - { { 333220,1523400 }, { 332599,1522919 } }, - { { 332599,1522919 }, { 329780,1521640 } }, - { { 329780,1521640 }, { 325360,1521220 } }, - { { 325360,1521220 }, { 319000,1520999 } }, - { { 319000,1520999 }, { 316180,1520240 } }, - { { 316180,1520240 }, { 312700,1518960 } }, - { { 312700,1518960 }, { 310520,1517679 } }, - { { 310520,1517679 }, { 309280,1517260 } }, - { { 309280,1517260 }, { 306440,1515040 } }, - { { 306440,1515040 }, { 304140,1512780 } }, - { { 304140,1512780 }, { 301640,1509720 } }, - { { 301640,1509720 }, { 301500,1509879 } }, - { { 301500,1509879 }, { 300320,1509059 } }, - { { 300320,1509059 }, { 299140,1507339 } }, - { { 299140,1507339 }, { 297340,1502659 } }, - { { 297340,1502659 }, { 298960,1508280 } }, - { { 298960,1508280 }, { 299120,1509299 } }, - { { 299120,1509299 }, { 298720,1510100 } }, - { { 298720,1510100 }, { 298420,1512240 } }, - { { 298420,1512240 }, { 297420,1514540 } }, - { { 297420,1514540 }, { 296900,1515340 } }, - { { 296900,1515340 }, { 294780,1517500 } }, - { { 294780,1517500 }, { 293040,1518380 } }, - { { 293040,1518380 }, { 289140,1521360 } }, - { { 289140,1521360 }, { 283600,1523300 } }, - { { 283600,1523300 }, { 280140,1525220 } }, - { { 280140,1525220 }, { 279620,1525679 } }, - { { 279620,1525679 }, { 274960,1527379 } }, - { { 274960,1527379 }, { 273440,1528819 } }, - { { 273440,1528819 }, { 269840,1532840 } }, - { { 269840,1532840 }, { 264800,1536240 } }, - { { 264800,1536240 }, { 261199,1540419 } }, - { { 261199,1540419 }, { 257359,1541400 } }, - { { 257359,1541400 }, { 250460,1539299 } }, - { { 250460,1539299 }, { 250240,1539400 } }, - { { 250240,1539400 }, { 249840,1540460 } }, - { { 249840,1540460 }, { 249779,1541140 } }, - { { 249779,1541140 }, { 248482,1539783 } }, - { { 248482,1539783 }, { 251320,1544120 } }, - { { 251320,1544120 }, { 252500,1548320 } }, - { { 252500,1548320 }, { 252519,1549740 } }, - { { 252519,1549740 }, { 253000,1553140 } }, - { { 253000,1553140 }, { 252920,1556539 } }, - { { 252920,1556539 }, { 253160,1556700 } }, - { { 253160,1556700 }, { 254019,1558220 } }, - { { 254019,1558220 }, { 253039,1559339 } }, - { { 253039,1559339 }, { 252300,1561920 } }, - { { 252300,1561920 }, { 251080,1565260 } }, - { { 251080,1565260 }, { 251120,1566160 } }, - { { 251120,1566160 }, { 249979,1570240 } }, - { { 249979,1570240 }, { 248799,1575380 } }, - { { 248799,1575380 }, { 247180,1579520 } }, - { { 247180,1579520 }, { 243380,1588440 } }, - { { 243380,1588440 }, { 241700,1591780 } }, - { { 241700,1591780 }, { 240280,1593080 } }, - { { 240280,1593080 }, { 231859,1598380 } }, - { { 231859,1598380 }, { 228840,1600060 } }, - { { 228840,1600060 }, { 226420,1601080 } }, - { { 226420,1601080 }, { 223620,1601940 } }, - { { 223620,1601940 }, { 220919,1603819 } }, - { { 220919,1603819 }, { 219599,1604420 } }, - { { 219599,1604420 }, { 218380,1605200 } }, - { { 218380,1605200 }, { 213219,1607260 } }, - { { 213219,1607260 }, { 210040,1607740 } }, - { { 210040,1607740 }, { 186439,1596440 } }, - { { 186439,1596440 }, { 185159,1594559 } }, - { { 185159,1594559 }, { 182239,1588300 } }, - { { 182239,1588300 }, { 181040,1585380 } }, - { { 181040,1585380 }, { 180380,1578580 } }, - { { 180380,1578580 }, { 180679,1573220 } }, - { { 180679,1573220 }, { 181220,1568539 } }, - { { 181220,1568539 }, { 181859,1565020 } }, - { { 181859,1565020 }, { 184499,1555500 } }, - { { 184499,1555500 }, { 183480,1558160 } }, - { { 183480,1558160 }, { 182600,1561700 } }, - { { 182600,1561700 }, { 171700,1554359 } }, - { { 171700,1554359 }, { 176880,1545920 } }, - { { 176880,1545920 }, { 189940,1529000 } }, - { { 189940,1529000 }, { 200040,1535759 } }, - { { 200040,1535759 }, { 207559,1531660 } }, - { { 207559,1531660 }, { 218039,1527520 } }, - { { 218039,1527520 }, { 222360,1526640 } }, - { { 222360,1526640 }, { 225439,1526440 } }, - { { 225439,1526440 }, { 231160,1527079 } }, - { { 231160,1527079 }, { 232300,1527399 } }, - { { 232300,1527399 }, { 236579,1529140 } }, - { { 236579,1529140 }, { 238139,1529120 } }, - { { 238139,1529120 }, { 238799,1529319 } }, - { { 238799,1529319 }, { 240999,1531780 } }, - { { 240999,1531780 }, { 238280,1528799 } }, - { { 238280,1528799 }, { 236900,1523840 } }, - { { 236900,1523840 }, { 236800,1522700 } }, - { { 236800,1522700 }, { 235919,1518880 } }, - { { 235919,1518880 }, { 236080,1514299 } }, - { { 236080,1514299 }, { 238260,1508380 } }, - { { 238260,1508380 }, { 240119,1505159 } }, - { { 240119,1505159 }, { 233319,1496360 } }, - { { 233319,1496360 }, { 239140,1490759 } }, - { { 239140,1490759 }, { 258760,1478080 } }, - { { 258760,1478080 }, { 263940,1484760 } }, - { { 263940,1484760 }, { 263460,1485159 } }, - { { 263460,1485159 }, { 265960,1483519 } }, - { { 265960,1483519 }, { 270380,1482020 } }, - { { 270380,1482020 }, { 272880,1481420 } }, - { { 272880,1481420 }, { 275700,1481400 } }, - { { 275700,1481400 }, { 278380,1481740 } }, - { { 278380,1481740 }, { 281220,1482979 } }, - { { 281220,1482979 }, { 284680,1484859 } }, - { { 284680,1484859 }, { 285979,1486140 } }, - { { 285979,1486140 }, { 290220,1489100 } }, - { { 290220,1489100 }, { 292680,1489520 } }, - { { 292680,1489520 }, { 293280,1490240 } }, - { { 293280,1490240 }, { 293140,1489160 } }, - { { 293140,1489160 }, { 293280,1488580 } }, - { { 293280,1488580 }, { 294100,1486980 } }, - { { 294100,1486980 }, { 294580,1484960 } }, - { { 294580,1484960 }, { 295680,1481660 } }, - { { 295680,1481660 }, { 297840,1477339 } }, - { { 297840,1477339 }, { 302240,1472280 } }, - { { 302240,1472280 }, { 307120,1469000 } }, - { { 307120,1469000 }, { 314500,1466340 } }, - { { 314500,1466340 }, { 324979,1464740 } }, - { { 324979,1464740 }, { 338999,1462059 } }, - { { 338999,1462059 }, { 345599,1461579 } }, - { { 345599,1461579 }, { 349020,1461620 } }, - { { 349020,1461620 }, { 353420,1461160 } }, - { { 353420,1461160 }, { 357000,1461500 } }, - { { 357000,1461500 }, { 359860,1461579 } }, - { { 359860,1461579 }, { 364520,1462740 } }, - { { 364520,1462740 }, { 367280,1464000 } }, - { { 367280,1464000 }, { 372020,1467560 } }, - { { 372020,1467560 }, { 373999,1469980 } }, - { { 373999,1469980 }, { 375580,1472240 } }, - { { 375580,1472240 }, { 376680,1474460 } }, - { { 376680,1474460 }, { 377259,1478620 } }, - { { 377259,1478620 }, { 379279,1480880 } }, - { { 379279,1480880 }, { 379260,1481600 } }, - { { 379260,1481600 }, { 378760,1482000 } }, - { { 378760,1482000 }, { 379300,1482040 } }, - { { 379300,1482040 }, { 380220,1482460 } }, - { { 380220,1482460 }, { 380840,1483020 } }, - { { 380840,1483020 }, { 385519,1482600 } }, - { { 385519,1482600 }, { 386019,1482320 } }, - { { 386019,1482320 }, { 386499,1481600 } }, - { { 386499,1481600 }, { 386540,1480139 } }, - { { 386540,1480139 }, { 387500,1478220 } }, - { { 387500,1478220 }, { 388280,1476100 } }, - { { 388280,1476100 }, { 390060,1473000 } }, - { { 390060,1473000 }, { 393659,1469460 } }, - { { 393659,1469460 }, { 396540,1467860 } }, - { { 396540,1467860 }, { 401260,1466040 } }, - { { 401260,1466040 }, { 406200,1465100 } }, - { { 406200,1465100 }, { 410920,1465439 } }, - { { 410920,1465439 }, { 420659,1467399 } }, - { { 420659,1467399 }, { 433500,1471480 } }, - { { 433500,1471480 }, { 441340,1473540 } }, - { { 441340,1473540 }, { 448620,1475139 } }, - { { 448620,1475139 }, { 450720,1475880 } }, - { { 450720,1475880 }, { 453299,1477059 } }, - { { 453299,1477059 }, { 456620,1478940 } }, - { { 456620,1478940 }, { 458480,1480399 } }, - { { 458480,1480399 }, { 461100,1482780 } }, - { { 461100,1482780 }, { 463820,1486519 } }, - { { 463820,1486519 }, { 464780,1488199 } }, - { { 464780,1488199 }, { 466579,1493960 } }, - { { 466579,1493960 }, { 467120,1497700 } }, - { { 467120,1497700 }, { 466999,1500280 } }, - { { 466999,1500280 }, { 467300,1502580 } }, - { { 467300,1502580 }, { 467399,1505280 } }, - { { 467399,1505280 }, { 466979,1506920 } }, - { { 466979,1506920 }, { 467920,1504780 } }, - { { 467920,1504780 }, { 468159,1505040 } }, - { { 468159,1505040 }, { 469400,1504859 } }, - { { 469400,1504859 }, { 470300,1505540 } }, - { { 470300,1505540 }, { 471240,1505200 } }, - { { 471240,1505200 }, { 471579,1504280 } }, - { { 471579,1504280 }, { 473939,1502379 } }, - { { 473939,1502379 }, { 476860,1500200 } }, - { { 476860,1500200 }, { 479800,1498620 } }, - { { 479800,1498620 }, { 480840,1498120 } }, - { { 480840,1498120 }, { 485220,1497480 } }, - { { 485220,1497480 }, { 489979,1497460 } }, - { { 489979,1497460 }, { 494899,1498700 } }, - { { 494899,1498700 }, { 500099,1501320 } }, - { { 500099,1501320 }, { 501439,1501839 } }, - { { 501439,1501839 }, { 503400,1502939 } }, - { { 503400,1502939 }, { 510760,1508340 } }, - { { 510760,1508340 }, { 513640,1510920 } }, - { { 513640,1510920 }, { 518579,1514599 } }, - { { 518579,1514599 }, { 519020,1515260 } }, - { { 519020,1515260 }, { 520700,1516480 } }, - { { 520700,1516480 }, { 524960,1521480 } }, - { { 524960,1521480 }, { 526820,1524820 } }, - { { 526820,1524820 }, { 528280,1527820 } }, - { { 528280,1527820 }, { 529120,1533120 } }, - { { 529120,1533120 }, { 528820,1537139 } }, - { { 528820,1537139 }, { 527020,1543920 } }, - { { 527020,1543920 }, { 526959,1546780 } }, - { { 526959,1546780 }, { 526420,1548060 } }, - { { 526420,1548060 }, { 527020,1547919 } }, - { { 527020,1547919 }, { 527620,1548160 } }, - { { 527620,1548160 }, { 528980,1548020 } }, - { { 528980,1548020 }, { 535180,1544980 } }, - { { 535180,1544980 }, { 540860,1542979 } }, - { { 540860,1542979 }, { 546480,1542720 } }, - { { 546480,1542720 }, { 547420,1542860 } }, - { { 547420,1542860 }, { 551800,1544140 } }, - { { 551800,1544140 }, { 558740,1547939 } }, - { { 558740,1547939 }, { 569920,1556259 } }, - { { 569920,1556259 }, { 573660,1560220 } }, - { { 573660,1560220 }, { 573040,1559500 } }, - { { 573040,1559500 }, { 574740,1559220 } }, - { { 574740,1559220 }, { 588480,1562899 } }, - { { 588480,1562899 }, { 585180,1576019 } }, - { { 585180,1576019 }, { 583440,1577979 } }, - { { 583440,1577979 }, { 584280,1582399 } }, - { { 584280,1582399 }, { 584520,1588960 } }, - { { 584520,1588960 }, { 583420,1601620 } }, - { { 583420,1601620 }, { 582840,1603880 } }, - { { 582840,1603880 }, { 579860,1611400 } }, - { { 579860,1611400 }, { 577980,1614579 } }, - { { 577980,1614579 }, { 577380,1616080 } }, - { { 577380,1616080 }, { 563800,1621579 } }, - { { 563800,1621579 }, { 561320,1622320 } }, - { { 561320,1622320 }, { 565080,1621960 } }, - { { 565080,1621960 }, { 571680,1620780 } }, - { { 571680,1620780 }, { 583260,1628340 } }, - { { 583260,1628340 }, { 583100,1630399 } }, - { { 583100,1630399 }, { 582200,1632160 } }, - { { 582200,1632160 }, { 595380,1627020 } }, - { { 595380,1627020 }, { 597400,1627320 } }, - { { 597400,1627320 }, { 602240,1628459 } }, - { { 602240,1628459 }, { 605660,1630260 } }, - { { 605660,1630260 }, { 610319,1634140 } }, - { { 610319,1634140 }, { 612340,1636319 } }, - { { 612340,1636319 }, { 614820,1638020 } }, - { { 614820,1638020 }, { 616460,1638740 } }, - { { 616460,1638740 }, { 620420,1639500 } }, - { { 620420,1639500 }, { 623000,1639280 } }, - { { 623000,1639280 }, { 624459,1639359 } }, - { { 624459,1639359 }, { 626180,1640159 } }, - { { 626180,1640159 }, { 627279,1640940 } }, - { { 627279,1640940 }, { 629980,1643759 } }, - { { 629980,1643759 }, { 632380,1648000 } }, - { { 632380,1648000 }, { 635020,1654800 } }, - { { 635020,1654800 }, { 636320,1659140 } }, - { { 636320,1659140 }, { 636680,1663620 } }, - { { 636680,1663620 }, { 636180,1665780 } }, - { { 636180,1665780 }, { 630620,1669720 } }, - { { 630620,1669720 }, { 628760,1672979 } }, - { { 628760,1672979 }, { 627540,1676859 } }, - { { 627540,1676859 }, { 627040,1680699 } }, - { { 627040,1680699 }, { 624700,1686500 } }, - { { 624700,1686500 }, { 623260,1688799 } }, - { { 623260,1688799 }, { 619620,1693799 } }, - { { 619620,1693799 }, { 621720,1694859 } }, - { { 621720,1694859 }, { 624940,1694379 } }, - { { 624940,1694379 }, { 627120,1695600 } }, - { { 627120,1695600 }, { 627740,1696120 } }, - { { 627740,1696120 }, { 631120,1697460 } }, - { { 631120,1697460 }, { 633980,1698340 } }, - { { 633980,1698340 }, { 638380,1700460 } }, - { { 638380,1700460 }, { 642660,1703300 } }, - { { 642660,1703300 }, { 643620,1704140 } }, - { { 643620,1704140 }, { 646300,1707000 } }, - { { 646300,1707000 }, { 649060,1710880 } }, - { { 649060,1710880 }, { 651160,1714879 } }, - { { 651160,1714879 }, { 651740,1716559 } }, - { { 651740,1716559 }, { 653139,1722619 } }, - { { 653139,1722619 }, { 653020,1728320 } }, - { { 653020,1728320 }, { 652719,1731420 } }, - { { 652719,1731420 }, { 651619,1736360 } }, - { { 651619,1736360 }, { 649819,1743160 } }, - { { 649819,1743160 }, { 646440,1749059 } }, - { { 646440,1749059 }, { 645219,1750399 } }, - { { 645219,1750399 }, { 643959,1752679 } }, - { { 643959,1752679 }, { 643959,1753740 } }, - { { 643959,1753740 }, { 642140,1754240 } }, - { { 642140,1754240 }, { 643760,1754099 } }, - { { 643760,1754099 }, { 644320,1754280 } }, - { { 644320,1754280 }, { 645000,1754879 } }, - { { 645000,1754879 }, { 646940,1755620 } }, - { { 646940,1755620 }, { 654779,1757820 } }, - { { 654779,1757820 }, { 661100,1761559 } }, - { { 661100,1761559 }, { 664099,1763980 } }, - { { 664099,1763980 }, { 668220,1768480 } }, - { { 668220,1768480 }, { 671920,1773640 } }, - { { 671920,1773640 }, { 674939,1779540 } }, - { { 674939,1779540 }, { 677760,1782440 } }, - { { 677760,1782440 }, { 679080,1785739 } }, - { { 679080,1785739 }, { 678780,1788100 } }, - { { 678780,1788100 }, { 678020,1791500 } }, - { { 678020,1791500 }, { 677120,1793600 } }, - { { 677120,1793600 }, { 676860,1795800 } }, - { { 676860,1795800 }, { 676440,1797320 } }, - { { 676440,1797320 }, { 676459,1798519 } }, - { { 676459,1798519 }, { 675620,1800159 } }, - { { 675620,1800159 }, { 675520,1801019 } }, - { { 675520,1801019 }, { 673360,1804899 } }, - { { 673360,1804899 }, { 672740,1807079 } }, - { { 672740,1807079 }, { 673300,1809260 } }, - { { 673300,1809260 }, { 674539,1811019 } }, - { { 674539,1811019 }, { 675499,1812020 } }, - { { 675499,1812020 }, { 677660,1817240 } }, - { { 677660,1817240 }, { 679659,1824280 } }, - { { 679659,1824280 }, { 680380,1828779 } }, - { { 680380,1828779 }, { 679519,1837999 } }, - { { 679519,1837999 }, { 677940,1844379 } }, - { { 677940,1844379 }, { 676940,1846900 } }, - { { 676940,1846900 }, { 675479,1849379 } }, - { { 675479,1849379 }, { 674000,1851200 } }, - { { 674000,1851200 }, { 671380,1853480 } }, - { { 671380,1853480 }, { 667019,1855240 } }, - { { 667019,1855240 }, { 662540,1856060 } }, - { { 662540,1856060 }, { 660960,1856599 } }, - { { 660960,1856599 }, { 656240,1857020 } }, - { { 656240,1857020 }, { 655600,1856960 } }, - { { 655600,1856960 }, { 652839,1855880 } }, - { { 652839,1855880 }, { 652019,1855840 } }, - { { 652019,1855840 }, { 651459,1855060 } }, - { { 651459,1855060 }, { 652179,1854359 } }, - { { 652179,1854359 }, { 652019,1849919 } }, - { { 652019,1849919 }, { 650620,1846920 } }, - { { 650620,1846920 }, { 647299,1844540 } }, - { { 647299,1844540 }, { 644500,1843819 } }, - { { 644500,1843819 }, { 641860,1844859 } }, - { { 641860,1844859 }, { 641059,1845340 } }, - { { 641059,1845340 }, { 638860,1845820 } }, - { { 638860,1845820 }, { 638000,1845820 } }, - { { 638000,1845820 }, { 636340,1845479 } }, - { { 636340,1845479 }, { 634980,1844800 } }, - { { 634980,1844800 }, { 632660,1842979 } }, - { { 632660,1842979 }, { 631140,1841120 } }, - { { 631140,1841120 }, { 629140,1839520 } }, - { { 629140,1839520 }, { 626640,1839540 } }, - { { 626640,1839540 }, { 624159,1840739 } }, - { { 624159,1840739 }, { 623820,1841380 } }, - { { 623820,1841380 }, { 622440,1842719 } }, - { { 622440,1842719 }, { 622100,1843680 } }, - { { 622100,1843680 }, { 623780,1846100 } }, - { { 623780,1846100 }, { 624580,1846920 } }, - { { 624580,1846920 }, { 626120,1856720 } }, - { { 626120,1856720 }, { 627440,1860000 } }, - { { 627440,1860000 }, { 628000,1864299 } }, - { { 628000,1864299 }, { 627380,1865999 } }, - { { 627380,1865999 }, { 626260,1867580 } }, - { { 626260,1867580 }, { 623660,1869520 } }, - { { 623660,1869520 }, { 618680,1872780 } }, - { { 618680,1872780 }, { 617699,1873140 } }, - { { 617699,1873140 }, { 612000,1874160 } }, - { { 612000,1874160 }, { 609840,1874220 } }, - { { 609840,1874220 }, { 606940,1873860 } }, - { { 136680,1926960 }, { 135500,1926360 } }, - { { 135500,1926360 }, { 137360,1923060 } }, - { { 137360,1923060 }, { 139500,1918559 } }, - { { 139500,1918559 }, { 140780,1913239 } }, - { { 140780,1913239 }, { 139600,1913020 } }, - { { 139600,1913020 }, { 127380,1923600 } }, - { { 127380,1923600 }, { 122800,1926059 } }, - { { 122800,1926059 }, { 118879,1927719 } }, - { { 118879,1927719 }, { 114420,1928300 } }, - { { 114420,1928300 }, { 111480,1927020 } }, - { { 111480,1927020 }, { 110619,1925399 } }, - { { 110619,1925399 }, { 109620,1924200 } }, - { { 109620,1924200 }, { 108860,1922780 } }, - { { 108860,1922780 }, { 108479,1920999 } }, - { { 108479,1920999 }, { 106600,1918080 } }, - { { 106600,1918080 }, { 106220,1917740 } }, - { { 106220,1917740 }, { 105199,1916960 } }, - { { 105199,1916960 }, { 101460,1914859 } }, - { { 101460,1914859 }, { 99480,1914379 } }, - { { 99480,1914379 }, { 97179,1913499 } }, - { { 97179,1913499 }, { 94900,1911100 } }, - { { 94900,1911100 }, { 94100,1909639 } }, - { { 94100,1909639 }, { 93379,1907740 } }, - { { 93379,1907740 }, { 93960,1898259 } }, - { { 93960,1898259 }, { 93739,1896460 } }, - { { 93739,1896460 }, { 94299,1893080 } }, - { { 94299,1893080 }, { 97240,1883440 } }, - { { 97240,1883440 }, { 99799,1879780 } }, - { { 99799,1879780 }, { 100400,1878120 } }, - { { 100400,1878120 }, { 100199,1877200 } }, - { { 100199,1877200 }, { 98940,1877460 } }, - { { 98940,1877460 }, { 96320,1878480 } }, - { { 96320,1878480 }, { 86020,1881039 } }, - { { 86020,1881039 }, { 84340,1881080 } }, - { { 84340,1881080 }, { 76780,1882600 } }, - { { 76780,1882600 }, { 74380,1883580 } }, - { { 74380,1883580 }, { 72679,1884019 } }, - { { 72679,1884019 }, { 70900,1885940 } }, - { { 70900,1885940 }, { 71240,1888340 } }, - { { 71240,1888340 }, { 72720,1889940 } }, - { { 72720,1889940 }, { 74640,1891360 } }, - { { 74640,1891360 }, { 75620,1893179 } }, - { { 75620,1893179 }, { 77140,1895340 } }, - { { 77140,1895340 }, { 81040,1899500 } }, - { { 81040,1899500 }, { 82760,1900380 } }, - { { 82760,1900380 }, { 83720,1902300 } }, - { { 83720,1902300 }, { 85459,1903700 } }, - { { 85459,1903700 }, { 86960,1905940 } }, - { { 86960,1905940 }, { 88280,1913020 } }, - { { 88280,1913020 }, { 88160,1913539 } }, - { { 88160,1913539 }, { 88020,1913860 } }, - { { 88020,1913860 }, { 86080,1915200 } }, - { { 86080,1915200 }, { 85660,1916740 } }, - { { 85660,1916740 }, { 83899,1918799 } }, - { { 83899,1918799 }, { 79360,1921160 } }, - { { 79360,1921160 }, { 76400,1923140 } }, - { { 76400,1923140 }, { 70800,1926180 } }, - { { 70800,1926180 }, { 64460,1927659 } }, - { { 64460,1927659 }, { 60880,1927820 } }, - { { 60880,1927820 }, { 55780,1925580 } }, - { { 55780,1925580 }, { 54940,1925040 } }, - { { 54940,1925040 }, { 52199,1921700 } }, - { { 52199,1921700 }, { 49680,1916579 } }, - { { 49680,1916579 }, { 48719,1914180 } }, - { { 48719,1914180 }, { 48620,1913080 } }, - { { 48620,1913080 }, { 47640,1909120 } }, - { { 47640,1909120 }, { 48280,1899319 } }, - { { 48280,1899319 }, { 49140,1895600 } }, - { { 49140,1895600 }, { 50320,1892899 } }, - { { 50320,1892899 }, { 51559,1890640 } }, - { { 51559,1890640 }, { 52140,1889960 } }, - { { 52140,1889960 }, { 54640,1887999 } }, - { { 54640,1887999 }, { 55639,1886500 } }, - { { 55639,1886500 }, { 55720,1885080 } }, - { { 55720,1885080 }, { 55439,1883220 } }, - { { 55439,1883220 }, { 54640,1882159 } }, - { { 54640,1882159 }, { 54100,1880300 } }, - { { 54100,1880300 }, { 52479,1874079 } }, - { { 52479,1874079 }, { 51700,1869000 } }, - { { 51700,1869000 }, { 51600,1865419 } }, - { { 51600,1865419 }, { 51720,1859820 } }, - { { 51720,1859820 }, { 52160,1857260 } }, - { { 52160,1857260 }, { 52539,1856120 } }, - { { 52539,1856120 }, { 57240,1845720 } }, - { { 57240,1845720 }, { 58280,1844400 } }, - { { 58280,1844400 }, { 60639,1840820 } }, - { { 60639,1840820 }, { 65580,1835540 } }, - { { 65580,1835540 }, { 68340,1833340 } }, - { { 68340,1833340 }, { 71660,1831480 } }, - { { 71660,1831480 }, { 73460,1829960 } }, - { { 73460,1829960 }, { 75200,1829319 } }, - { { 75200,1829319 }, { 77200,1828960 } }, - { { 77200,1828960 }, { 78640,1828920 } }, - { { 78640,1828920 }, { 111780,1842700 } }, - { { 111780,1842700 }, { 112800,1843480 } }, - { { 112800,1843480 }, { 113879,1844879 } }, - { { 113879,1844879 }, { 116379,1847379 } }, - { { 116379,1847379 }, { 116360,1847580 } }, - { { 116360,1847580 }, { 117100,1848799 } }, - { { 117100,1848799 }, { 120160,1851799 } }, - { { 120160,1851799 }, { 121860,1852320 } }, - { { 121860,1852320 }, { 124280,1852679 } }, - { { 124280,1852679 }, { 128920,1854659 } }, - { { 128920,1854659 }, { 130840,1856360 } }, - { { 130840,1856360 }, { 133520,1859460 } }, - { { 133520,1859460 }, { 135079,1860860 } }, - { { 135079,1860860 }, { 137280,1864440 } }, - { { 137280,1864440 }, { 142980,1872899 } }, - { { 142980,1872899 }, { 144600,1875840 } }, - { { 144600,1875840 }, { 147240,1883480 } }, - { { 147240,1883480 }, { 147460,1886539 } }, - { { 147460,1886539 }, { 147660,1886920 } }, - { { 147660,1886920 }, { 148399,1891720 } }, - { { 148399,1891720 }, { 148820,1896799 } }, - { { 148820,1896799 }, { 148399,1898880 } }, - { { 148399,1898880 }, { 148799,1899420 } }, - { { 148799,1899420 }, { 150520,1898539 } }, - { { 150520,1898539 }, { 154760,1892760 } }, - { { 154760,1892760 }, { 156580,1889240 } }, - { { 156580,1889240 }, { 156940,1888900 } }, - { { 156940,1888900 }, { 157540,1889540 } }, - { { 157540,1889540 }, { 156860,1896819 } }, - { { 156860,1896819 }, { 155639,1903940 } }, - { { 155639,1903940 }, { 153679,1908100 } }, - { { 153679,1908100 }, { 152859,1909039 } }, - { { 152859,1909039 }, { 149660,1915580 } }, - { { 149660,1915580 }, { 148000,1918600 } }, - { { 148000,1918600 }, { 141640,1926980 } }, - { { 141640,1926980 }, { 140060,1927899 } }, - { { 140060,1927899 }, { 136960,1929019 } }, - { { 136960,1929019 }, { 136680,1926960 } }, - { { 627100,1941519 }, { 625120,1940060 } }, - { { 625120,1940060 }, { 614580,1934680 } }, - { { 614580,1934680 }, { 608780,1929319 } }, - { { 608780,1929319 }, { 607400,1927679 } }, - { { 607400,1927679 }, { 606160,1925920 } }, - { { 606160,1925920 }, { 604480,1922240 } }, - { { 604480,1922240 }, { 602420,1916819 } }, - { { 602420,1916819 }, { 602279,1915260 } }, - { { 602279,1915260 }, { 602880,1907960 } }, - { { 602880,1907960 }, { 604140,1902719 } }, - { { 604140,1902719 }, { 605880,1898539 } }, - { { 605880,1898539 }, { 606640,1897399 } }, - { { 606640,1897399 }, { 609680,1894420 } }, - { { 609680,1894420 }, { 611099,1893640 } }, - { { 611099,1893640 }, { 616099,1890340 } }, - { { 616099,1890340 }, { 617520,1889160 } }, - { { 617520,1889160 }, { 620220,1885540 } }, - { { 620220,1885540 }, { 624480,1882260 } }, - { { 624480,1882260 }, { 628660,1880280 } }, - { { 628660,1880280 }, { 632520,1879659 } }, - { { 632520,1879659 }, { 637760,1879859 } }, - { { 637760,1879859 }, { 640899,1881500 } }, - { { 640899,1881500 }, { 644220,1883980 } }, - { { 644220,1883980 }, { 643900,1890860 } }, - { { 643900,1890860 }, { 643060,1894160 } }, - { { 643060,1894160 }, { 642459,1900320 } }, - { { 642459,1900320 }, { 642400,1903120 } }, - { { 642400,1903120 }, { 643819,1908519 } }, - { { 643819,1908519 }, { 644700,1912560 } }, - { { 644700,1912560 }, { 644640,1916380 } }, - { { 644640,1916380 }, { 644959,1918600 } }, - { { 644959,1918600 }, { 642540,1925620 } }, - { { 642540,1925620 }, { 642439,1926640 } }, - { { 642439,1926640 }, { 641860,1928300 } }, - { { 641860,1928300 }, { 638700,1932939 } }, - { { 638700,1932939 }, { 634820,1934200 } }, - { { 634820,1934200 }, { 631980,1936539 } }, - { { 631980,1936539 }, { 630160,1940600 } }, - { { 630160,1940600 }, { 627740,1941640 } }, - { { 627740,1941640 }, { 627400,1941660 } }, - { { 627400,1941660 }, { 627100,1941519 } } - }; - -#if 0 - // Verify whether two any two non-neighbor line segments intersect. They should not, otherwise the Voronoi builder - // is not guaranteed to succeed. - for (size_t i = 0; i < lines.size(); ++ i) - for (size_t j = i + 1; j < lines.size(); ++ j) { - Point &ip1 = lines[i].a; - Point &ip2 = lines[i].b; - Point &jp1 = lines[j].a; - Point &jp2 = lines[j].b; - if (&ip1 != &jp2 && &jp1 != &ip2) { - REQUIRE(! Slic3r::Geometry::segments_intersect(ip1, ip2, jp1, jp2)); - } - } -#endif - - BoostVD vd; - construct_voronoi(lines.begin(), lines.end(), &vd); - - for (const auto& edge : vd.edges()) - if (edge.is_finite()) { - auto v0 = edge.vertex0(); - auto v1 = edge.vertex1(); - REQUIRE((v0->x() == 0 || std::isnormal(v0->x()))); - REQUIRE((v0->y() == 0 || std::isnormal(v0->y()))); - REQUIRE((v1->x() == 0 || std::isnormal(v1->x()))); - REQUIRE((v1->y() == 0 || std::isnormal(v1->y()))); - } - -#ifdef VORONOI_DEBUG_OUT - dump_voronoi_to_svg(debug_out_path("voronoi-NaNs.svg").c_str(), - vd, Points(), lines, Polygons(), Lines(), 0.015); -#endif -} - struct OffsetTest { double distance; size_t num_outer; @@ -1383,15 +70,6 @@ TEST_CASE("Voronoi offset", "[VoronoiOffset]") OffsetTest { scale_(0.55), 1, 0 } }) { -#if 0 - Polygons offsetted_polygons_out = Slic3r::Voronoi::offset(vd, lines, ot.distance, scale_(0.005)); -#ifdef VORONOI_DEBUG_OUT - dump_voronoi_to_svg(debug_out_path("voronoi-offset-out-%lf.svg", ot.distance).c_str(), - vd, Points(), lines, offsetted_polygons_out); -#endif - REQUIRE(offsetted_polygons_out.size() == ot.num_outer); -#endif - Polygons offsetted_polygons_in = Slic3r::Voronoi::offset(vd, lines, - ot.distance, scale_(0.005)); #ifdef VORONOI_DEBUG_OUT dump_voronoi_to_svg(debug_out_path("voronoi-offset-in-%lf.svg", ot.distance).c_str(), diff --git a/tests/slic3rutils/slic3rutils_tests_main.cpp b/tests/slic3rutils/slic3rutils_tests_main.cpp index f8d2b4fac5..c70dc0afeb 100644 --- a/tests/slic3rutils/slic3rutils_tests_main.cpp +++ b/tests/slic3rutils/slic3rutils_tests_main.cpp @@ -1,61 +1 @@ #include - -#include -#include "slic3r/Utils/Http.hpp" - -TEST_CASE("Check SSL certificates paths", "[Http][NotWorking]") { - - Slic3r::Http g = Slic3r::Http::get("https://github.com/"); - - unsigned status = 0; - g.on_error([&status](std::string, std::string, unsigned http_status) { - status = http_status; - }); - - g.on_complete([&status](std::string /* body */, unsigned http_status){ - status = http_status; - }); - - g.perform_sync(); - - REQUIRE(status == 200); -} - -TEST_CASE("Http digest authentication", "[Http][NotWorking]") { - Slic3r::Http g = Slic3r::Http::get("https://httpbingo.org/digest-auth/auth/guest/guest"); - - g.auth_digest("guest", "guest"); - - unsigned status = 0; - g.on_error([&status](std::string, std::string, unsigned http_status) { - status = http_status; - }); - - g.on_complete([&status](std::string /* body */, unsigned http_status){ - status = http_status; - }); - - g.perform_sync(); - - REQUIRE(status == 200); -} - -TEST_CASE("Http basic authentication", "[Http][NotWorking]") { - Slic3r::Http g = Slic3r::Http::get("https://httpbingo.org/basic-auth/guest/guest"); - - g.auth_basic("guest", "guest"); - - unsigned status = 0; - g.on_error([&status](std::string, std::string, unsigned http_status) { - status = http_status; - }); - - g.on_complete([&status](std::string /* body */, unsigned http_status){ - status = http_status; - }); - - g.perform_sync(); - - REQUIRE(status == 200); -} - diff --git a/tests/slic3rutils/test_action_source.cpp b/tests/slic3rutils/test_action_source.cpp index b58898a698..d7ca2d0bf2 100644 --- a/tests/slic3rutils/test_action_source.cpp +++ b/tests/slic3rutils/test_action_source.cpp @@ -73,34 +73,6 @@ TEST_CASE("ActionRegistry takes exclusive ownership of published actions", "[Act STATIC_CHECK(std::is_same_v); } -// A dynamic "Go to Plate N" action is keyed by plate index (not the display title), so renaming -// a plate never re-keys it - the same contract as a setting action. -TEST_CASE("Go-to-plate actions are keyed by index, not title", "[ActionSource][SpeedDial]") -{ - CHECK(AppAction::compose_id("orca_plate_goto", "0", "orca") == "orca_plate_goto:0:orca"); - CHECK(AppAction::compose_id("orca_plate_goto", "2", "orca") == "orca_plate_goto:2:orca"); -} - -// A dynamic "Open recent project" action is keyed by file path (not the display name), so renaming -// a project or reordering the recents list never re-keys it - the same contract as a setting action. -TEST_CASE("Recent-project actions are keyed by path, not title", "[ActionSource][SpeedDial]") -{ - CHECK(AppAction::compose_id("orca_recent_project", "/a/b/project.3mf", "orca") == - "orca_recent_project:/a/b/project.3mf:orca"); - CHECK(AppAction::compose_id("orca_recent_project", "C:/Data/cube.3mf", "orca") == - "orca_recent_project:C:/Data/cube.3mf:orca"); -} - -// A built-in command is keyed by its stable catalog key (not the localized display title), so a -// rename or a UI-language switch never re-keys the action and its persisted favourite/stats survive. -TEST_CASE("Command actions are keyed by catalog key, not display title", "[ActionSource][SpeedDial]") -{ - CHECK(AppAction::compose_id("orca_command", "save_project", "orca") == "orca_command:save_project:orca"); - // The second field is the stable key, so distinct commands never collide. - CHECK(AppAction::compose_id("orca_command", "save_project", "orca") != - AppAction::compose_id("orca_command", "load_project", "orca")); -} - // The real catalog -> action mapping keys by the stable catalog key and copies presentation from the // catalog, so a rename or a UI-language switch never re-keys the action. The catalog's English title // and group become the action's English search aliases; no translation catalog is loaded in the tests, diff --git a/tests/slic3rutils/test_plugin_config.cpp b/tests/slic3rutils/test_plugin_config.cpp index 7db8ccaba4..1290ca5738 100644 --- a/tests/slic3rutils/test_plugin_config.cpp +++ b/tests/slic3rutils/test_plugin_config.cpp @@ -138,22 +138,6 @@ TEST_CASE("PluginConfig serializes the documented on-disk schema", "[PluginConfi CHECK(entry.size() == 5); } -TEST_CASE("PluginConfig keeps a capability's config after its plugin goes away", "[PluginConfig]") -{ - ScopedDataDir data_dir_guard("plugin-config-retention"); - - { - PluginConfig config; - REQUIRE(config.store_capability_config(capability_id(PluginCapabilityType::Script, "cap_a", "plugin_a"), json{{"token", "keep me"}})); - } - - // config.json is deliberately not keyed to installed plugins: a record outlives its plugin and is - // still there on reinstall. Asserts no cleanup path silently drops it. - PluginConfig after_removal; - after_removal.load(); - CHECK(after_removal.get_config(capability_id(PluginCapabilityType::Script, "cap_a", "plugin_a"))->config == json{{"token", "keep me"}}); -} - TEST_CASE("PluginConfig treats a missing config file as an empty store", "[PluginConfig]") { ScopedDataDir data_dir_guard("plugin-config-missing");