diff --git a/CDT/include/Triangulation.hpp b/CDT/include/Triangulation.hpp index 1e4286d..4b0a8a1 100644 --- a/CDT/include/Triangulation.hpp +++ b/CDT/include/Triangulation.hpp @@ -988,8 +988,12 @@ void Triangulation::addSuperTriangle(const Box2d& box) (box.min.x + box.max.x) / T(2), (box.min.y + box.max.y) / T(2)}; const T w = box.max.x - box.min.x; const T h = box.max.y - box.min.y; - T r = std::sqrt(w * w + h * h) / T(2); // incircle radius - r = r > 0 ? r * T(1.1) : T(1e-6); + T r = std::max(w, h); // incircle radius upper bound + + // Note: make sure radius is big enough. Constants chosen experimentally. + // - for tiny bounding boxes: use 1.0 as the smallest radius + // - multiply radius by 2.0 for extra safety margin + r = std::max(T(2) * r, T(1)); // Note: for very large floating point numbers rounding can lead to wrong // super-triangle coordinates. This is a very rare corner-case so the @@ -999,8 +1003,9 @@ void Triangulation::addSuperTriangle(const Box2d& box) r *= T(2); } - const T R = T(2) * r; // excircle radius - const T shiftX = R * std::sqrt(T(3)) / T(2); // R * cos(30 deg) + const T R = T(2) * r; // excircle radius + const T cos_30_deg = 0.8660254037844386; // note: (std::sqrt(3.0) / 2.0) + const T shiftX = R * cos_30_deg; const V2d posV1 = {center.x - shiftX, center.y - r}; const V2d posV2 = {center.x + shiftX, center.y - r}; const V2d posV3 = {center.x, center.y + R}; diff --git a/CDT/tests/cdt.test.cpp b/CDT/tests/cdt.test.cpp index e01eea2..d073124 100644 --- a/CDT/tests/cdt.test.cpp +++ b/CDT/tests/cdt.test.cpp @@ -945,3 +945,17 @@ TEST_CASE("Regression test: hanging edge in pseudo-poly", "") cdt.insertEdges(ee); REQUIRE(CDT::verifyTopology(cdt)); } + +TEST_CASE("Regression test #174: super-triangle of tiny bounding box", "") +{ + auto cdt = Triangulation{}; + const auto vv = Vertices{ + {{45802.2779561576462583616375923, 169208.540894783218391239643097}, + {45802.2779561576317064464092255, 169208.540894783218391239643097}, + {45802.2779561576462583616375923, 169208.540894783247495070099831}}, + }; + REQUIRE_NOTHROW(cdt.insertVertices(vv)); + REQUIRE(CDT::verifyTopology(cdt)); + cdt.eraseSuperTriangle(); + REQUIRE(cdt.triangles.size() == std::size_t(1)); +} \ No newline at end of file diff --git a/CDT/tests/expected/cdt__as-provided_ignore_all.txt b/CDT/tests/expected/cdt__as-provided_ignore_all.txt index ff9666e..40dc852 100644 --- a/CDT/tests/expected/cdt__as-provided_ignore_all.txt +++ b/CDT/tests/expected/cdt__as-provided_ignore_all.txt @@ -1,61 +1,61 @@ 203 -0 1 59 4294967295 13 11 -0 9 2 2 22 4294967295 -0 10 9 3 36 1 -0 11 10 4 38 2 -0 12 11 5 40 3 -0 13 12 6 42 4 -0 14 13 7 44 5 -0 15 14 8 46 6 -0 16 15 9 48 7 -0 17 16 10 50 8 -0 18 17 11 52 9 -0 59 18 0 56 10 -1 2 65 4294967295 23 15 -1 63 59 14 142 0 -1 64 63 15 146 13 -1 65 64 12 147 14 -2 3 51 17 26 23 -2 4 3 18 24 16 -2 5 4 19 27 17 -2 6 5 20 29 18 -2 7 6 21 31 19 -2 8 7 22 32 20 -2 9 8 1 34 21 -2 51 65 16 108 12 -3 4 41 17 28 25 +0 1 59 4294967295 12 10 +0 10 2 2 22 4294967295 +0 11 10 3 38 1 +0 12 11 4 40 2 +0 13 12 5 42 3 +0 14 13 6 44 4 +0 15 14 7 46 5 +0 16 15 8 48 6 +0 17 16 9 50 7 +0 18 17 10 52 8 +0 59 18 0 56 9 +1 2 65 4294967295 23 14 +1 63 59 13 142 0 +1 64 63 14 146 12 +1 65 64 11 147 13 +2 3 51 16 26 23 +2 4 3 17 24 15 +2 5 4 18 27 16 +2 6 5 19 29 17 +2 7 6 20 31 18 +2 8 7 21 32 19 +2 9 8 22 34 20 +2 10 9 1 36 21 +2 51 65 15 108 11 +3 4 41 16 28 25 3 41 42 24 92 26 -3 42 51 25 93 16 -4 5 40 18 30 28 +3 42 51 25 93 15 +4 5 40 17 30 28 4 40 41 27 92 24 -5 6 39 19 31 30 +5 6 39 18 31 30 5 39 40 29 90 27 -6 7 39 20 33 29 -7 8 38 21 35 33 +6 7 39 19 33 29 +7 8 38 20 35 33 7 38 39 32 90 31 -8 9 37 22 37 35 +8 9 37 21 37 35 8 37 38 34 89 32 -9 10 36 2 39 37 +9 10 36 22 39 37 9 36 37 36 87 34 -10 11 35 3 41 39 +10 11 35 2 41 39 10 35 36 38 86 36 -11 12 34 4 43 41 +11 12 34 3 43 41 11 34 35 40 82 38 -12 13 33 5 45 43 +12 13 33 4 45 43 12 33 34 42 77 40 -13 14 32 6 47 45 +13 14 32 5 47 45 13 32 33 44 76 42 -14 15 31 7 49 47 +14 15 31 6 49 47 14 31 32 46 81 44 -15 16 30 8 51 49 +15 16 30 7 51 49 15 30 31 48 80 46 -16 17 29 9 53 51 +16 17 29 8 53 51 16 29 30 50 80 48 -17 18 28 10 55 53 +17 18 28 9 55 53 17 28 29 52 79 50 18 19 27 56 57 55 18 27 28 54 75 52 -18 59 19 11 58 54 +18 59 19 10 58 54 19 20 27 59 62 54 19 59 70 56 141 60 19 69 20 60 63 57 @@ -141,12 +141,12 @@ 57 77 76 129 169 138 58 59 60 141 142 128 58 70 59 132 58 140 -59 63 60 13 144 140 +59 63 60 12 144 140 60 62 61 144 145 125 60 63 62 142 146 143 61 62 66 143 148 126 -62 63 64 144 14 147 -62 64 65 146 15 148 +62 63 64 144 13 147 +62 64 65 146 14 148 62 65 66 147 108 145 67 83 82 150 179 114 67 84 83 151 181 149 diff --git a/CDT/tests/expected/cdt__as-provided_resolve_all.txt b/CDT/tests/expected/cdt__as-provided_resolve_all.txt index ff9666e..40dc852 100644 --- a/CDT/tests/expected/cdt__as-provided_resolve_all.txt +++ b/CDT/tests/expected/cdt__as-provided_resolve_all.txt @@ -1,61 +1,61 @@ 203 -0 1 59 4294967295 13 11 -0 9 2 2 22 4294967295 -0 10 9 3 36 1 -0 11 10 4 38 2 -0 12 11 5 40 3 -0 13 12 6 42 4 -0 14 13 7 44 5 -0 15 14 8 46 6 -0 16 15 9 48 7 -0 17 16 10 50 8 -0 18 17 11 52 9 -0 59 18 0 56 10 -1 2 65 4294967295 23 15 -1 63 59 14 142 0 -1 64 63 15 146 13 -1 65 64 12 147 14 -2 3 51 17 26 23 -2 4 3 18 24 16 -2 5 4 19 27 17 -2 6 5 20 29 18 -2 7 6 21 31 19 -2 8 7 22 32 20 -2 9 8 1 34 21 -2 51 65 16 108 12 -3 4 41 17 28 25 +0 1 59 4294967295 12 10 +0 10 2 2 22 4294967295 +0 11 10 3 38 1 +0 12 11 4 40 2 +0 13 12 5 42 3 +0 14 13 6 44 4 +0 15 14 7 46 5 +0 16 15 8 48 6 +0 17 16 9 50 7 +0 18 17 10 52 8 +0 59 18 0 56 9 +1 2 65 4294967295 23 14 +1 63 59 13 142 0 +1 64 63 14 146 12 +1 65 64 11 147 13 +2 3 51 16 26 23 +2 4 3 17 24 15 +2 5 4 18 27 16 +2 6 5 19 29 17 +2 7 6 20 31 18 +2 8 7 21 32 19 +2 9 8 22 34 20 +2 10 9 1 36 21 +2 51 65 15 108 11 +3 4 41 16 28 25 3 41 42 24 92 26 -3 42 51 25 93 16 -4 5 40 18 30 28 +3 42 51 25 93 15 +4 5 40 17 30 28 4 40 41 27 92 24 -5 6 39 19 31 30 +5 6 39 18 31 30 5 39 40 29 90 27 -6 7 39 20 33 29 -7 8 38 21 35 33 +6 7 39 19 33 29 +7 8 38 20 35 33 7 38 39 32 90 31 -8 9 37 22 37 35 +8 9 37 21 37 35 8 37 38 34 89 32 -9 10 36 2 39 37 +9 10 36 22 39 37 9 36 37 36 87 34 -10 11 35 3 41 39 +10 11 35 2 41 39 10 35 36 38 86 36 -11 12 34 4 43 41 +11 12 34 3 43 41 11 34 35 40 82 38 -12 13 33 5 45 43 +12 13 33 4 45 43 12 33 34 42 77 40 -13 14 32 6 47 45 +13 14 32 5 47 45 13 32 33 44 76 42 -14 15 31 7 49 47 +14 15 31 6 49 47 14 31 32 46 81 44 -15 16 30 8 51 49 +15 16 30 7 51 49 15 30 31 48 80 46 -16 17 29 9 53 51 +16 17 29 8 53 51 16 29 30 50 80 48 -17 18 28 10 55 53 +17 18 28 9 55 53 17 28 29 52 79 50 18 19 27 56 57 55 18 27 28 54 75 52 -18 59 19 11 58 54 +18 59 19 10 58 54 19 20 27 59 62 54 19 59 70 56 141 60 19 69 20 60 63 57 @@ -141,12 +141,12 @@ 57 77 76 129 169 138 58 59 60 141 142 128 58 70 59 132 58 140 -59 63 60 13 144 140 +59 63 60 12 144 140 60 62 61 144 145 125 60 63 62 142 146 143 61 62 66 143 148 126 -62 63 64 144 14 147 -62 64 65 146 15 148 +62 63 64 144 13 147 +62 64 65 146 14 148 62 65 66 147 108 145 67 83 82 150 179 114 67 84 83 151 181 149 diff --git a/CDT/tests/expected/cdt__auto_ignore_all.txt b/CDT/tests/expected/cdt__auto_ignore_all.txt index 649c8a6..c13e9e0 100644 --- a/CDT/tests/expected/cdt__auto_ignore_all.txt +++ b/CDT/tests/expected/cdt__auto_ignore_all.txt @@ -1,61 +1,61 @@ 203 -0 1 59 4294967295 14 12 -0 8 2 2 22 4294967295 -0 9 8 3 34 1 -0 10 9 4 36 2 -0 11 10 5 38 3 -0 12 11 6 40 4 -0 13 12 7 42 5 -0 14 13 8 44 6 -0 15 14 9 46 7 -0 16 15 10 48 8 -0 17 16 11 50 9 -0 18 17 12 52 10 -0 59 18 0 56 11 -1 2 65 4294967295 23 16 -1 63 59 15 142 0 -1 64 63 16 146 14 -1 65 64 13 147 15 -2 3 51 18 26 23 -2 4 3 19 24 17 -2 5 4 20 27 18 -2 6 5 21 29 19 -2 7 6 22 31 20 -2 8 7 1 32 21 -2 51 65 17 108 13 -3 4 41 18 28 25 +0 1 59 4294967295 15 13 +0 7 2 2 22 4294967295 +0 8 7 3 32 1 +0 9 8 4 34 2 +0 10 9 5 36 3 +0 11 10 6 38 4 +0 12 11 7 40 5 +0 13 12 8 42 6 +0 14 13 9 44 7 +0 15 14 10 46 8 +0 16 15 11 48 9 +0 17 16 12 50 10 +0 18 17 13 52 11 +0 59 18 0 56 12 +1 2 65 4294967295 23 17 +1 63 59 16 142 0 +1 64 63 17 146 15 +1 65 64 14 147 16 +2 3 51 19 26 23 +2 4 3 20 24 18 +2 5 4 21 27 19 +2 6 5 22 29 20 +2 7 6 1 31 21 +2 51 65 18 108 14 +3 4 41 19 28 25 3 41 42 24 92 26 -3 42 51 25 93 17 -4 5 40 19 30 28 +3 42 51 25 93 18 +4 5 40 20 30 28 4 40 41 27 92 24 -5 6 39 20 31 30 +5 6 39 21 31 30 5 39 40 29 90 27 -6 7 39 21 33 29 -7 8 38 22 35 33 +6 7 39 22 33 29 +7 8 38 2 35 33 7 38 39 32 90 31 -8 9 37 2 37 35 +8 9 37 3 37 35 8 37 38 34 89 32 -9 10 36 3 39 37 +9 10 36 4 39 37 9 36 37 36 87 34 -10 11 35 4 41 39 +10 11 35 5 41 39 10 35 36 38 86 36 -11 12 34 5 43 41 +11 12 34 6 43 41 11 34 35 40 82 38 -12 13 33 6 45 43 +12 13 33 7 45 43 12 33 34 42 77 40 -13 14 32 7 47 45 +13 14 32 8 47 45 13 32 33 44 76 42 -14 15 31 8 49 47 +14 15 31 9 49 47 14 31 32 46 81 44 -15 16 30 9 51 49 +15 16 30 10 51 49 15 30 31 48 80 46 -16 17 29 10 53 51 +16 17 29 11 53 51 16 29 30 50 80 48 -17 18 28 11 55 53 +17 18 28 12 55 53 17 28 29 52 79 50 18 19 27 56 57 55 18 27 28 54 75 52 -18 59 19 12 58 54 +18 59 19 13 58 54 19 20 27 59 62 54 19 59 70 56 141 60 19 69 20 60 63 57 @@ -141,12 +141,12 @@ 57 77 76 129 169 138 58 59 60 141 142 128 58 70 59 132 58 140 -59 63 60 14 144 140 +59 63 60 15 144 140 60 62 61 144 145 125 60 63 62 142 146 143 61 62 66 143 148 126 -62 63 64 144 15 147 -62 64 65 146 16 148 +62 63 64 144 16 147 +62 64 65 146 17 148 62 65 66 147 108 145 67 83 82 150 179 114 67 84 83 151 181 149 diff --git a/CDT/tests/expected/cdt__auto_resolve_all.txt b/CDT/tests/expected/cdt__auto_resolve_all.txt index 649c8a6..c13e9e0 100644 --- a/CDT/tests/expected/cdt__auto_resolve_all.txt +++ b/CDT/tests/expected/cdt__auto_resolve_all.txt @@ -1,61 +1,61 @@ 203 -0 1 59 4294967295 14 12 -0 8 2 2 22 4294967295 -0 9 8 3 34 1 -0 10 9 4 36 2 -0 11 10 5 38 3 -0 12 11 6 40 4 -0 13 12 7 42 5 -0 14 13 8 44 6 -0 15 14 9 46 7 -0 16 15 10 48 8 -0 17 16 11 50 9 -0 18 17 12 52 10 -0 59 18 0 56 11 -1 2 65 4294967295 23 16 -1 63 59 15 142 0 -1 64 63 16 146 14 -1 65 64 13 147 15 -2 3 51 18 26 23 -2 4 3 19 24 17 -2 5 4 20 27 18 -2 6 5 21 29 19 -2 7 6 22 31 20 -2 8 7 1 32 21 -2 51 65 17 108 13 -3 4 41 18 28 25 +0 1 59 4294967295 15 13 +0 7 2 2 22 4294967295 +0 8 7 3 32 1 +0 9 8 4 34 2 +0 10 9 5 36 3 +0 11 10 6 38 4 +0 12 11 7 40 5 +0 13 12 8 42 6 +0 14 13 9 44 7 +0 15 14 10 46 8 +0 16 15 11 48 9 +0 17 16 12 50 10 +0 18 17 13 52 11 +0 59 18 0 56 12 +1 2 65 4294967295 23 17 +1 63 59 16 142 0 +1 64 63 17 146 15 +1 65 64 14 147 16 +2 3 51 19 26 23 +2 4 3 20 24 18 +2 5 4 21 27 19 +2 6 5 22 29 20 +2 7 6 1 31 21 +2 51 65 18 108 14 +3 4 41 19 28 25 3 41 42 24 92 26 -3 42 51 25 93 17 -4 5 40 19 30 28 +3 42 51 25 93 18 +4 5 40 20 30 28 4 40 41 27 92 24 -5 6 39 20 31 30 +5 6 39 21 31 30 5 39 40 29 90 27 -6 7 39 21 33 29 -7 8 38 22 35 33 +6 7 39 22 33 29 +7 8 38 2 35 33 7 38 39 32 90 31 -8 9 37 2 37 35 +8 9 37 3 37 35 8 37 38 34 89 32 -9 10 36 3 39 37 +9 10 36 4 39 37 9 36 37 36 87 34 -10 11 35 4 41 39 +10 11 35 5 41 39 10 35 36 38 86 36 -11 12 34 5 43 41 +11 12 34 6 43 41 11 34 35 40 82 38 -12 13 33 6 45 43 +12 13 33 7 45 43 12 33 34 42 77 40 -13 14 32 7 47 45 +13 14 32 8 47 45 13 32 33 44 76 42 -14 15 31 8 49 47 +14 15 31 9 49 47 14 31 32 46 81 44 -15 16 30 9 51 49 +15 16 30 10 51 49 15 30 31 48 80 46 -16 17 29 10 53 51 +16 17 29 11 53 51 16 29 30 50 80 48 -17 18 28 11 55 53 +17 18 28 12 55 53 17 28 29 52 79 50 18 19 27 56 57 55 18 27 28 54 75 52 -18 59 19 12 58 54 +18 59 19 13 58 54 19 20 27 59 62 54 19 59 70 56 141 60 19 69 20 60 63 57 @@ -141,12 +141,12 @@ 57 77 76 129 169 138 58 59 60 141 142 128 58 70 59 132 58 140 -59 63 60 14 144 140 +59 63 60 15 144 140 60 62 61 144 145 125 60 63 62 142 146 143 61 62 66 143 148 126 -62 63 64 144 15 147 -62 64 65 146 16 148 +62 63 64 144 16 147 +62 64 65 146 17 148 62 65 66 147 108 145 67 83 82 150 179 114 67 84 83 151 181 149 diff --git a/CDT/tests/expected/dont_flip_constraint_when_resolving_intersection__f64_as-provided_resolve_all.txt b/CDT/tests/expected/dont_flip_constraint_when_resolving_intersection__f64_as-provided_resolve_all.txt index 5faa35b..0c0a8cc 100644 --- a/CDT/tests/expected/dont_flip_constraint_when_resolving_intersection__f64_as-provided_resolve_all.txt +++ b/CDT/tests/expected/dont_flip_constraint_when_resolving_intersection__f64_as-provided_resolve_all.txt @@ -1,18 +1,18 @@ 15 -0 1 7 4294967295 6 3 -0 3 2 2 7 4294967295 +0 1 7 4294967295 7 3 +0 3 8 2 9 4 0 6 3 3 10 1 0 7 6 0 14 2 -1 2 4 4294967295 8 5 -1 4 5 4 12 6 -1 5 7 5 13 0 -2 3 8 1 9 8 -2 8 4 7 9 4 -3 4 8 11 8 7 +0 8 2 1 8 4294967295 +1 2 4 4294967295 8 6 +1 4 5 5 12 7 +1 5 7 6 13 0 +2 8 4 4 9 5 +3 4 8 11 8 1 3 6 9 2 14 11 3 9 4 10 12 9 -4 9 5 11 13 5 -5 9 7 12 14 6 +4 9 5 11 13 6 +5 9 7 12 14 7 6 7 9 3 13 10 5 diff --git a/CDT/tests/expected/gh_issue__as-provided_ignore_all.txt b/CDT/tests/expected/gh_issue__as-provided_ignore_all.txt index dfae6fa..e10109a 100644 --- a/CDT/tests/expected/gh_issue__as-provided_ignore_all.txt +++ b/CDT/tests/expected/gh_issue__as-provided_ignore_all.txt @@ -1,17 +1,17 @@ 157 -0 1 11 4294967295 7 1 +0 1 11 4294967295 8 1 0 11 15 0 38 2 -0 15 2 1 9 4294967295 -1 2 5 4294967295 8 4 -1 5 7 3 28 5 -1 7 9 4 30 6 -1 9 10 5 31 7 -1 10 11 6 33 0 -2 4 5 12 21 3 -2 15 16 2 43 10 -2 16 41 9 47 11 +0 15 16 1 43 3 +0 16 2 2 10 4294967295 +1 2 5 4294967295 9 5 +1 5 7 4 28 6 +1 7 9 5 30 7 +1 9 10 6 31 8 +1 10 11 7 33 0 +2 4 5 12 21 4 +2 16 41 3 47 11 2 41 42 10 99 12 -2 42 4 11 23 8 +2 42 4 11 23 9 3 4 72 14 27 17 3 8 4 15 22 13 3 9 8 16 30 14 @@ -20,19 +20,19 @@ 3 75 76 17 125 19 3 76 80 18 154 20 3 80 25 19 65 16 -4 6 5 22 28 8 +4 6 5 22 28 9 4 8 6 14 29 21 4 42 67 12 104 24 4 67 69 23 147 25 4 69 70 24 148 26 4 70 71 25 150 27 4 71 72 26 151 13 -5 6 7 21 29 4 +5 6 7 21 29 5 6 8 7 22 30 28 -7 8 9 29 15 5 -9 24 10 32 37 6 +7 8 9 29 15 6 +9 24 10 32 37 7 9 25 24 16 61 31 -10 13 11 34 39 7 +10 13 11 34 39 8 10 18 13 35 42 33 10 19 18 36 48 34 10 20 19 37 50 35 @@ -42,7 +42,7 @@ 12 13 14 39 42 41 12 14 15 40 43 38 13 18 14 34 45 40 -14 16 15 44 9 41 +14 16 15 44 2 41 14 17 16 45 46 43 14 18 17 42 48 44 16 17 40 44 49 47 diff --git a/CDT/tests/expected/gh_issue__as-provided_resolve_all.txt b/CDT/tests/expected/gh_issue__as-provided_resolve_all.txt index dfae6fa..e10109a 100644 --- a/CDT/tests/expected/gh_issue__as-provided_resolve_all.txt +++ b/CDT/tests/expected/gh_issue__as-provided_resolve_all.txt @@ -1,17 +1,17 @@ 157 -0 1 11 4294967295 7 1 +0 1 11 4294967295 8 1 0 11 15 0 38 2 -0 15 2 1 9 4294967295 -1 2 5 4294967295 8 4 -1 5 7 3 28 5 -1 7 9 4 30 6 -1 9 10 5 31 7 -1 10 11 6 33 0 -2 4 5 12 21 3 -2 15 16 2 43 10 -2 16 41 9 47 11 +0 15 16 1 43 3 +0 16 2 2 10 4294967295 +1 2 5 4294967295 9 5 +1 5 7 4 28 6 +1 7 9 5 30 7 +1 9 10 6 31 8 +1 10 11 7 33 0 +2 4 5 12 21 4 +2 16 41 3 47 11 2 41 42 10 99 12 -2 42 4 11 23 8 +2 42 4 11 23 9 3 4 72 14 27 17 3 8 4 15 22 13 3 9 8 16 30 14 @@ -20,19 +20,19 @@ 3 75 76 17 125 19 3 76 80 18 154 20 3 80 25 19 65 16 -4 6 5 22 28 8 +4 6 5 22 28 9 4 8 6 14 29 21 4 42 67 12 104 24 4 67 69 23 147 25 4 69 70 24 148 26 4 70 71 25 150 27 4 71 72 26 151 13 -5 6 7 21 29 4 +5 6 7 21 29 5 6 8 7 22 30 28 -7 8 9 29 15 5 -9 24 10 32 37 6 +7 8 9 29 15 6 +9 24 10 32 37 7 9 25 24 16 61 31 -10 13 11 34 39 7 +10 13 11 34 39 8 10 18 13 35 42 33 10 19 18 36 48 34 10 20 19 37 50 35 @@ -42,7 +42,7 @@ 12 13 14 39 42 41 12 14 15 40 43 38 13 18 14 34 45 40 -14 16 15 44 9 41 +14 16 15 44 2 41 14 17 16 45 46 43 14 18 17 42 48 44 16 17 40 44 49 47 diff --git a/CDT/tests/expected/guitar no box__f32_as-provided_ignore_all.txt b/CDT/tests/expected/guitar no box__f32_as-provided_ignore_all.txt index 937711a..35bf9ae 100644 --- a/CDT/tests/expected/guitar no box__f32_as-provided_ignore_all.txt +++ b/CDT/tests/expected/guitar no box__f32_as-provided_ignore_all.txt @@ -1,45 +1,45 @@ 289 -0 1 56 4294967295 14 12 -0 22 2 2 25 4294967295 -0 23 22 3 77 1 -0 24 23 4 79 2 -0 25 24 5 81 3 -0 26 25 6 83 4 -0 27 26 7 85 5 -0 28 27 8 86 6 -0 29 28 9 87 7 -0 30 29 10 88 8 -0 31 30 11 89 9 -0 40 31 12 92 10 -0 56 40 0 120 11 -1 2 60 4294967295 26 17 -1 57 56 15 163 0 -1 58 57 16 164 14 -1 59 58 17 166 15 -1 60 59 13 166 16 -2 4 105 19 31 29 -2 5 4 20 37 18 -2 17 5 21 40 19 -2 18 17 22 68 20 -2 19 18 23 72 21 -2 20 19 24 73 22 -2 21 20 25 74 23 -2 22 21 1 76 24 -2 64 60 27 168 13 -2 73 64 28 176 26 +0 1 57 4294967295 13 11 +0 24 2 2 26 4294967295 +0 25 24 3 81 1 +0 26 25 4 83 2 +0 27 26 5 85 3 +0 28 27 6 86 4 +0 29 28 7 87 5 +0 30 29 8 88 6 +0 31 30 9 89 7 +0 40 31 10 92 8 +0 56 40 11 120 9 +0 57 56 0 163 10 +1 2 64 4294967295 27 16 +1 58 57 14 164 0 +1 59 58 15 166 13 +1 60 59 16 166 14 +1 64 60 12 168 15 +2 4 105 18 31 29 +2 5 4 19 37 17 +2 17 5 20 40 18 +2 18 17 21 68 19 +2 19 18 22 72 20 +2 20 19 23 73 21 +2 21 20 24 74 22 +2 22 21 25 76 23 +2 23 22 26 77 24 +2 24 23 1 79 25 +2 73 64 28 176 12 2 96 73 29 192 27 -2 105 96 18 230 28 +2 105 96 17 230 28 3 4 119 31 38 36 -3 105 4 32 18 30 +3 105 4 32 17 30 3 109 105 33 245 31 3 110 109 34 249 32 3 111 110 35 249 33 3 112 111 36 143 34 3 119 112 30 252 35 -4 5 118 19 39 38 +4 5 118 18 39 38 4 118 119 37 252 30 5 6 118 40 44 37 -5 17 6 20 43 39 +5 17 6 19 43 39 6 7 117 42 45 44 6 16 7 43 46 41 6 17 16 40 68 42 @@ -67,31 +67,31 @@ 14 135 140 64 282 62 15 16 136 49 70 67 15 136 135 66 277 64 -16 17 18 43 21 69 +16 17 18 43 20 69 16 18 139 68 72 71 16 138 136 71 283 66 16 139 138 69 273 70 -18 19 139 22 73 69 -19 20 139 23 75 72 -20 21 122 24 76 75 +18 19 139 21 73 69 +19 20 139 22 75 72 +20 21 122 23 76 75 20 122 139 74 259 73 -21 22 122 25 78 74 -22 23 121 2 80 78 +21 22 122 24 78 74 +22 23 121 25 80 78 22 121 122 77 258 76 -23 24 120 3 82 80 +23 24 120 26 82 80 23 120 121 79 256 77 -24 25 127 4 84 82 +24 25 127 2 84 82 24 127 120 81 257 79 -25 26 126 5 85 84 +25 26 126 3 85 84 25 126 127 83 265 81 -26 27 126 6 86 83 -27 28 126 7 87 85 -28 29 126 8 88 86 -29 30 126 9 90 87 -30 31 128 10 91 90 +26 27 126 4 86 83 +27 28 126 5 87 85 +28 29 126 6 88 86 +29 30 126 7 90 87 +30 31 128 8 91 90 30 128 126 89 266 88 31 32 128 92 96 89 -31 40 32 11 95 91 +31 40 32 9 95 91 32 33 129 94 100 96 32 39 33 95 99 93 32 40 39 92 116 94 @@ -119,7 +119,7 @@ 39 42 43 116 125 115 40 41 42 119 121 116 40 55 41 120 124 118 -40 56 55 12 162 119 +40 56 55 10 162 119 41 48 42 122 125 118 41 49 48 123 137 121 41 52 49 124 142 122 @@ -162,12 +162,12 @@ 54 68 69 159 183 161 54 69 76 160 185 152 55 56 61 120 163 158 -56 57 61 14 165 162 -57 58 60 15 166 165 +56 57 61 11 165 162 +57 58 60 13 166 165 57 60 61 164 167 163 -58 59 60 16 17 164 +58 59 60 14 15 164 60 63 61 168 170 165 -60 64 63 26 174 167 +60 64 63 16 174 167 61 62 68 170 173 159 61 63 62 167 171 169 62 63 66 170 175 172 diff --git a/CDT/tests/expected/guitar no box__f32_as-provided_resolve_all.txt b/CDT/tests/expected/guitar no box__f32_as-provided_resolve_all.txt index 937711a..35bf9ae 100644 --- a/CDT/tests/expected/guitar no box__f32_as-provided_resolve_all.txt +++ b/CDT/tests/expected/guitar no box__f32_as-provided_resolve_all.txt @@ -1,45 +1,45 @@ 289 -0 1 56 4294967295 14 12 -0 22 2 2 25 4294967295 -0 23 22 3 77 1 -0 24 23 4 79 2 -0 25 24 5 81 3 -0 26 25 6 83 4 -0 27 26 7 85 5 -0 28 27 8 86 6 -0 29 28 9 87 7 -0 30 29 10 88 8 -0 31 30 11 89 9 -0 40 31 12 92 10 -0 56 40 0 120 11 -1 2 60 4294967295 26 17 -1 57 56 15 163 0 -1 58 57 16 164 14 -1 59 58 17 166 15 -1 60 59 13 166 16 -2 4 105 19 31 29 -2 5 4 20 37 18 -2 17 5 21 40 19 -2 18 17 22 68 20 -2 19 18 23 72 21 -2 20 19 24 73 22 -2 21 20 25 74 23 -2 22 21 1 76 24 -2 64 60 27 168 13 -2 73 64 28 176 26 +0 1 57 4294967295 13 11 +0 24 2 2 26 4294967295 +0 25 24 3 81 1 +0 26 25 4 83 2 +0 27 26 5 85 3 +0 28 27 6 86 4 +0 29 28 7 87 5 +0 30 29 8 88 6 +0 31 30 9 89 7 +0 40 31 10 92 8 +0 56 40 11 120 9 +0 57 56 0 163 10 +1 2 64 4294967295 27 16 +1 58 57 14 164 0 +1 59 58 15 166 13 +1 60 59 16 166 14 +1 64 60 12 168 15 +2 4 105 18 31 29 +2 5 4 19 37 17 +2 17 5 20 40 18 +2 18 17 21 68 19 +2 19 18 22 72 20 +2 20 19 23 73 21 +2 21 20 24 74 22 +2 22 21 25 76 23 +2 23 22 26 77 24 +2 24 23 1 79 25 +2 73 64 28 176 12 2 96 73 29 192 27 -2 105 96 18 230 28 +2 105 96 17 230 28 3 4 119 31 38 36 -3 105 4 32 18 30 +3 105 4 32 17 30 3 109 105 33 245 31 3 110 109 34 249 32 3 111 110 35 249 33 3 112 111 36 143 34 3 119 112 30 252 35 -4 5 118 19 39 38 +4 5 118 18 39 38 4 118 119 37 252 30 5 6 118 40 44 37 -5 17 6 20 43 39 +5 17 6 19 43 39 6 7 117 42 45 44 6 16 7 43 46 41 6 17 16 40 68 42 @@ -67,31 +67,31 @@ 14 135 140 64 282 62 15 16 136 49 70 67 15 136 135 66 277 64 -16 17 18 43 21 69 +16 17 18 43 20 69 16 18 139 68 72 71 16 138 136 71 283 66 16 139 138 69 273 70 -18 19 139 22 73 69 -19 20 139 23 75 72 -20 21 122 24 76 75 +18 19 139 21 73 69 +19 20 139 22 75 72 +20 21 122 23 76 75 20 122 139 74 259 73 -21 22 122 25 78 74 -22 23 121 2 80 78 +21 22 122 24 78 74 +22 23 121 25 80 78 22 121 122 77 258 76 -23 24 120 3 82 80 +23 24 120 26 82 80 23 120 121 79 256 77 -24 25 127 4 84 82 +24 25 127 2 84 82 24 127 120 81 257 79 -25 26 126 5 85 84 +25 26 126 3 85 84 25 126 127 83 265 81 -26 27 126 6 86 83 -27 28 126 7 87 85 -28 29 126 8 88 86 -29 30 126 9 90 87 -30 31 128 10 91 90 +26 27 126 4 86 83 +27 28 126 5 87 85 +28 29 126 6 88 86 +29 30 126 7 90 87 +30 31 128 8 91 90 30 128 126 89 266 88 31 32 128 92 96 89 -31 40 32 11 95 91 +31 40 32 9 95 91 32 33 129 94 100 96 32 39 33 95 99 93 32 40 39 92 116 94 @@ -119,7 +119,7 @@ 39 42 43 116 125 115 40 41 42 119 121 116 40 55 41 120 124 118 -40 56 55 12 162 119 +40 56 55 10 162 119 41 48 42 122 125 118 41 49 48 123 137 121 41 52 49 124 142 122 @@ -162,12 +162,12 @@ 54 68 69 159 183 161 54 69 76 160 185 152 55 56 61 120 163 158 -56 57 61 14 165 162 -57 58 60 15 166 165 +56 57 61 11 165 162 +57 58 60 13 166 165 57 60 61 164 167 163 -58 59 60 16 17 164 +58 59 60 14 15 164 60 63 61 168 170 165 -60 64 63 26 174 167 +60 64 63 16 174 167 61 62 68 170 173 159 61 63 62 167 171 169 62 63 66 170 175 172 diff --git a/CDT/tests/expected/guitar no box__f32_auto_ignore_all.txt b/CDT/tests/expected/guitar no box__f32_auto_ignore_all.txt index 130f215..0bc849f 100644 --- a/CDT/tests/expected/guitar no box__f32_auto_ignore_all.txt +++ b/CDT/tests/expected/guitar no box__f32_auto_ignore_all.txt @@ -1,6 +1,6 @@ 289 -0 1 56 4294967295 15 13 -0 21 2 2 24 4294967295 +0 1 57 4294967295 16 14 +0 21 2 2 26 4294967295 0 22 21 3 76 1 0 23 22 4 77 2 0 24 23 5 79 3 @@ -12,34 +12,34 @@ 0 30 29 11 88 9 0 31 30 12 89 10 0 40 31 13 92 11 -0 56 40 0 120 12 -1 2 59 4294967295 25 17 -1 57 56 16 163 0 -1 58 57 17 164 15 -1 59 58 14 166 16 -2 4 105 19 31 29 -2 5 4 20 37 18 -2 17 5 21 40 19 -2 18 17 22 68 20 -2 19 18 23 72 21 -2 20 19 24 73 22 -2 21 20 1 74 23 -2 60 59 26 166 14 -2 64 60 27 168 25 -2 73 64 28 176 26 +0 56 40 14 120 12 +0 57 56 0 163 13 +1 2 64 4294967295 27 19 +1 58 57 17 164 0 +1 59 58 18 166 16 +1 60 59 19 166 17 +1 64 60 15 168 18 +2 4 105 21 31 29 +2 5 4 22 37 20 +2 17 5 23 40 21 +2 18 17 24 68 22 +2 19 18 25 72 23 +2 20 19 26 73 24 +2 21 20 1 74 25 +2 73 64 28 176 15 2 96 73 29 192 27 -2 105 96 18 230 28 +2 105 96 20 230 28 3 4 119 31 38 36 -3 105 4 32 18 30 +3 105 4 32 20 30 3 109 105 33 245 31 3 110 109 34 249 32 3 111 110 35 249 33 3 112 111 36 143 34 3 119 112 30 252 35 -4 5 118 19 39 38 +4 5 118 21 39 38 4 118 119 37 252 30 5 6 118 40 44 37 -5 17 6 20 43 39 +5 17 6 22 43 39 6 7 117 42 45 44 6 16 7 43 46 41 6 17 16 40 68 42 @@ -67,13 +67,13 @@ 14 135 140 64 282 62 15 16 136 49 70 67 15 136 135 66 277 64 -16 17 18 43 21 69 +16 17 18 43 23 69 16 18 139 68 72 71 16 138 136 71 283 66 16 139 138 69 273 70 -18 19 139 22 73 69 -19 20 139 23 75 72 -20 21 122 24 76 75 +18 19 139 24 73 69 +19 20 139 25 75 72 +20 21 122 26 76 75 20 122 139 74 259 73 21 22 122 2 78 74 22 23 121 3 80 78 @@ -162,12 +162,12 @@ 54 68 69 159 183 161 54 69 76 160 185 152 55 56 61 120 163 158 -56 57 61 15 165 162 +56 57 61 14 165 162 57 58 60 16 166 165 57 60 61 164 167 163 -58 59 60 17 25 164 +58 59 60 17 18 164 60 63 61 168 170 165 -60 64 63 26 174 167 +60 64 63 19 174 167 61 62 68 170 173 159 61 63 62 167 171 169 62 63 66 170 175 172 diff --git a/CDT/tests/expected/guitar no box__f32_auto_resolve_all.txt b/CDT/tests/expected/guitar no box__f32_auto_resolve_all.txt index 130f215..0bc849f 100644 --- a/CDT/tests/expected/guitar no box__f32_auto_resolve_all.txt +++ b/CDT/tests/expected/guitar no box__f32_auto_resolve_all.txt @@ -1,6 +1,6 @@ 289 -0 1 56 4294967295 15 13 -0 21 2 2 24 4294967295 +0 1 57 4294967295 16 14 +0 21 2 2 26 4294967295 0 22 21 3 76 1 0 23 22 4 77 2 0 24 23 5 79 3 @@ -12,34 +12,34 @@ 0 30 29 11 88 9 0 31 30 12 89 10 0 40 31 13 92 11 -0 56 40 0 120 12 -1 2 59 4294967295 25 17 -1 57 56 16 163 0 -1 58 57 17 164 15 -1 59 58 14 166 16 -2 4 105 19 31 29 -2 5 4 20 37 18 -2 17 5 21 40 19 -2 18 17 22 68 20 -2 19 18 23 72 21 -2 20 19 24 73 22 -2 21 20 1 74 23 -2 60 59 26 166 14 -2 64 60 27 168 25 -2 73 64 28 176 26 +0 56 40 14 120 12 +0 57 56 0 163 13 +1 2 64 4294967295 27 19 +1 58 57 17 164 0 +1 59 58 18 166 16 +1 60 59 19 166 17 +1 64 60 15 168 18 +2 4 105 21 31 29 +2 5 4 22 37 20 +2 17 5 23 40 21 +2 18 17 24 68 22 +2 19 18 25 72 23 +2 20 19 26 73 24 +2 21 20 1 74 25 +2 73 64 28 176 15 2 96 73 29 192 27 -2 105 96 18 230 28 +2 105 96 20 230 28 3 4 119 31 38 36 -3 105 4 32 18 30 +3 105 4 32 20 30 3 109 105 33 245 31 3 110 109 34 249 32 3 111 110 35 249 33 3 112 111 36 143 34 3 119 112 30 252 35 -4 5 118 19 39 38 +4 5 118 21 39 38 4 118 119 37 252 30 5 6 118 40 44 37 -5 17 6 20 43 39 +5 17 6 22 43 39 6 7 117 42 45 44 6 16 7 43 46 41 6 17 16 40 68 42 @@ -67,13 +67,13 @@ 14 135 140 64 282 62 15 16 136 49 70 67 15 136 135 66 277 64 -16 17 18 43 21 69 +16 17 18 43 23 69 16 18 139 68 72 71 16 138 136 71 283 66 16 139 138 69 273 70 -18 19 139 22 73 69 -19 20 139 23 75 72 -20 21 122 24 76 75 +18 19 139 24 73 69 +19 20 139 25 75 72 +20 21 122 26 76 75 20 122 139 74 259 73 21 22 122 2 78 74 22 23 121 3 80 78 @@ -162,12 +162,12 @@ 54 68 69 159 183 161 54 69 76 160 185 152 55 56 61 120 163 158 -56 57 61 15 165 162 +56 57 61 14 165 162 57 58 60 16 166 165 57 60 61 164 167 163 -58 59 60 17 25 164 +58 59 60 17 18 164 60 63 61 168 170 165 -60 64 63 26 174 167 +60 64 63 19 174 167 61 62 68 170 173 159 61 63 62 167 171 169 62 63 66 170 175 172 diff --git a/CDT/tests/expected/guitar no box__f64_as-provided_ignore_all.txt b/CDT/tests/expected/guitar no box__f64_as-provided_ignore_all.txt index 2b042d9..ffb846b 100644 --- a/CDT/tests/expected/guitar no box__f64_as-provided_ignore_all.txt +++ b/CDT/tests/expected/guitar no box__f64_as-provided_ignore_all.txt @@ -1,47 +1,47 @@ 289 -0 1 56 4294967295 14 12 -0 22 2 2 25 4294967295 -0 23 22 3 79 1 -0 24 23 4 81 2 -0 25 24 5 83 3 -0 26 25 6 85 4 -0 27 26 7 87 5 -0 28 27 8 88 6 -0 29 28 9 89 7 -0 30 29 10 90 8 -0 31 30 11 91 9 -0 40 31 12 94 10 -0 56 40 0 122 11 -1 2 60 4294967295 26 17 -1 57 56 15 165 0 -1 58 57 16 166 14 -1 59 58 17 168 15 -1 60 59 13 168 16 -2 4 105 19 33 31 -2 5 4 20 39 18 -2 17 5 21 42 19 -2 18 17 22 70 20 -2 19 18 23 74 21 -2 20 19 24 75 22 -2 21 20 25 76 23 -2 22 21 1 78 24 -2 64 60 27 170 13 -2 65 64 28 177 26 +0 1 57 4294967295 13 11 +0 24 2 2 26 4294967295 +0 25 24 3 83 1 +0 26 25 4 85 2 +0 27 26 5 87 3 +0 28 27 6 88 4 +0 29 28 7 89 5 +0 30 29 8 90 6 +0 31 30 9 91 7 +0 40 31 10 94 8 +0 56 40 11 122 9 +0 57 56 0 165 10 +1 2 64 4294967295 27 16 +1 58 57 14 166 0 +1 59 58 15 168 13 +1 60 59 16 168 14 +1 64 60 12 170 15 +2 4 105 18 33 31 +2 5 4 19 39 17 +2 17 5 20 42 18 +2 18 17 21 70 19 +2 19 18 22 74 20 +2 20 19 23 75 21 +2 21 20 24 76 22 +2 22 21 25 78 23 +2 23 22 26 79 24 +2 24 23 1 81 25 +2 65 64 28 177 12 2 81 65 29 179 27 2 89 81 30 206 28 2 97 89 31 220 29 -2 105 97 18 232 30 +2 105 97 17 232 30 3 4 119 33 40 38 -3 105 4 34 18 32 +3 105 4 34 17 32 3 109 105 35 245 33 3 110 109 36 249 34 3 111 110 37 249 35 3 112 111 38 145 36 3 119 112 32 252 37 -4 5 118 19 41 40 +4 5 118 18 41 40 4 118 119 39 252 32 5 6 118 42 46 39 -5 17 6 20 45 41 +5 17 6 19 45 41 6 7 117 44 47 46 6 16 7 45 48 43 6 17 16 42 70 44 @@ -69,31 +69,31 @@ 14 135 140 66 282 64 15 16 136 51 72 69 15 136 135 68 277 66 -16 17 18 45 21 71 +16 17 18 45 20 71 16 18 139 70 74 73 16 138 136 73 283 68 16 139 138 71 273 72 -18 19 139 22 75 71 -19 20 139 23 77 74 -20 21 122 24 78 77 +18 19 139 21 75 71 +19 20 139 22 77 74 +20 21 122 23 78 77 20 122 139 76 259 75 -21 22 122 25 80 76 -22 23 121 2 82 80 +21 22 122 24 80 76 +22 23 121 25 82 80 22 121 122 79 258 78 -23 24 120 3 84 82 +23 24 120 26 84 82 23 120 121 81 256 79 -24 25 127 4 86 84 +24 25 127 2 86 84 24 127 120 83 257 81 -25 26 126 5 87 86 +25 26 126 3 87 86 25 126 127 85 264 83 -26 27 126 6 88 85 -27 28 126 7 89 87 -28 29 126 8 90 88 -29 30 126 9 92 89 -30 31 128 10 93 92 +26 27 126 4 88 85 +27 28 126 5 89 87 +28 29 126 6 90 88 +29 30 126 7 92 89 +30 31 128 8 93 92 30 128 126 91 265 90 31 32 128 94 98 91 -31 40 32 11 97 93 +31 40 32 9 97 93 32 33 129 96 102 98 32 39 33 97 101 95 32 40 39 94 118 96 @@ -121,7 +121,7 @@ 39 42 43 118 127 117 40 41 42 121 123 118 40 55 41 122 126 120 -40 56 55 12 164 121 +40 56 55 10 164 121 41 48 42 124 127 120 41 49 48 125 139 123 41 52 49 126 144 124 @@ -164,12 +164,12 @@ 54 68 69 161 184 163 54 69 76 162 185 154 55 56 61 122 165 160 -56 57 61 14 167 164 -57 58 60 15 168 167 +56 57 61 11 167 164 +57 58 60 13 168 167 57 60 61 166 169 165 -58 59 60 16 17 166 +58 59 60 14 15 166 60 63 61 170 172 167 -60 64 63 26 175 169 +60 64 63 16 175 169 61 62 67 172 174 173 61 63 62 169 174 171 61 67 68 171 182 161 diff --git a/CDT/tests/expected/guitar no box__f64_as-provided_resolve_all.txt b/CDT/tests/expected/guitar no box__f64_as-provided_resolve_all.txt index 2b042d9..ffb846b 100644 --- a/CDT/tests/expected/guitar no box__f64_as-provided_resolve_all.txt +++ b/CDT/tests/expected/guitar no box__f64_as-provided_resolve_all.txt @@ -1,47 +1,47 @@ 289 -0 1 56 4294967295 14 12 -0 22 2 2 25 4294967295 -0 23 22 3 79 1 -0 24 23 4 81 2 -0 25 24 5 83 3 -0 26 25 6 85 4 -0 27 26 7 87 5 -0 28 27 8 88 6 -0 29 28 9 89 7 -0 30 29 10 90 8 -0 31 30 11 91 9 -0 40 31 12 94 10 -0 56 40 0 122 11 -1 2 60 4294967295 26 17 -1 57 56 15 165 0 -1 58 57 16 166 14 -1 59 58 17 168 15 -1 60 59 13 168 16 -2 4 105 19 33 31 -2 5 4 20 39 18 -2 17 5 21 42 19 -2 18 17 22 70 20 -2 19 18 23 74 21 -2 20 19 24 75 22 -2 21 20 25 76 23 -2 22 21 1 78 24 -2 64 60 27 170 13 -2 65 64 28 177 26 +0 1 57 4294967295 13 11 +0 24 2 2 26 4294967295 +0 25 24 3 83 1 +0 26 25 4 85 2 +0 27 26 5 87 3 +0 28 27 6 88 4 +0 29 28 7 89 5 +0 30 29 8 90 6 +0 31 30 9 91 7 +0 40 31 10 94 8 +0 56 40 11 122 9 +0 57 56 0 165 10 +1 2 64 4294967295 27 16 +1 58 57 14 166 0 +1 59 58 15 168 13 +1 60 59 16 168 14 +1 64 60 12 170 15 +2 4 105 18 33 31 +2 5 4 19 39 17 +2 17 5 20 42 18 +2 18 17 21 70 19 +2 19 18 22 74 20 +2 20 19 23 75 21 +2 21 20 24 76 22 +2 22 21 25 78 23 +2 23 22 26 79 24 +2 24 23 1 81 25 +2 65 64 28 177 12 2 81 65 29 179 27 2 89 81 30 206 28 2 97 89 31 220 29 -2 105 97 18 232 30 +2 105 97 17 232 30 3 4 119 33 40 38 -3 105 4 34 18 32 +3 105 4 34 17 32 3 109 105 35 245 33 3 110 109 36 249 34 3 111 110 37 249 35 3 112 111 38 145 36 3 119 112 32 252 37 -4 5 118 19 41 40 +4 5 118 18 41 40 4 118 119 39 252 32 5 6 118 42 46 39 -5 17 6 20 45 41 +5 17 6 19 45 41 6 7 117 44 47 46 6 16 7 45 48 43 6 17 16 42 70 44 @@ -69,31 +69,31 @@ 14 135 140 66 282 64 15 16 136 51 72 69 15 136 135 68 277 66 -16 17 18 45 21 71 +16 17 18 45 20 71 16 18 139 70 74 73 16 138 136 73 283 68 16 139 138 71 273 72 -18 19 139 22 75 71 -19 20 139 23 77 74 -20 21 122 24 78 77 +18 19 139 21 75 71 +19 20 139 22 77 74 +20 21 122 23 78 77 20 122 139 76 259 75 -21 22 122 25 80 76 -22 23 121 2 82 80 +21 22 122 24 80 76 +22 23 121 25 82 80 22 121 122 79 258 78 -23 24 120 3 84 82 +23 24 120 26 84 82 23 120 121 81 256 79 -24 25 127 4 86 84 +24 25 127 2 86 84 24 127 120 83 257 81 -25 26 126 5 87 86 +25 26 126 3 87 86 25 126 127 85 264 83 -26 27 126 6 88 85 -27 28 126 7 89 87 -28 29 126 8 90 88 -29 30 126 9 92 89 -30 31 128 10 93 92 +26 27 126 4 88 85 +27 28 126 5 89 87 +28 29 126 6 90 88 +29 30 126 7 92 89 +30 31 128 8 93 92 30 128 126 91 265 90 31 32 128 94 98 91 -31 40 32 11 97 93 +31 40 32 9 97 93 32 33 129 96 102 98 32 39 33 97 101 95 32 40 39 94 118 96 @@ -121,7 +121,7 @@ 39 42 43 118 127 117 40 41 42 121 123 118 40 55 41 122 126 120 -40 56 55 12 164 121 +40 56 55 10 164 121 41 48 42 124 127 120 41 49 48 125 139 123 41 52 49 126 144 124 @@ -164,12 +164,12 @@ 54 68 69 161 184 163 54 69 76 162 185 154 55 56 61 122 165 160 -56 57 61 14 167 164 -57 58 60 15 168 167 +56 57 61 11 167 164 +57 58 60 13 168 167 57 60 61 166 169 165 -58 59 60 16 17 166 +58 59 60 14 15 166 60 63 61 170 172 167 -60 64 63 26 175 169 +60 64 63 16 175 169 61 62 67 172 174 173 61 63 62 169 174 171 61 67 68 171 182 161 diff --git a/CDT/tests/expected/guitar no box__f64_auto_ignore_all.txt b/CDT/tests/expected/guitar no box__f64_auto_ignore_all.txt index 5e6e25f..6faebbd 100644 --- a/CDT/tests/expected/guitar no box__f64_auto_ignore_all.txt +++ b/CDT/tests/expected/guitar no box__f64_auto_ignore_all.txt @@ -1,6 +1,6 @@ 289 -0 1 56 4294967295 15 13 -0 21 2 2 24 4294967295 +0 1 57 4294967295 16 14 +0 21 2 2 26 4294967295 0 22 21 3 78 1 0 23 22 4 79 2 0 24 23 5 81 3 @@ -12,36 +12,36 @@ 0 30 29 11 90 9 0 31 30 12 91 10 0 40 31 13 94 11 -0 56 40 0 122 12 -1 2 59 4294967295 25 17 -1 57 56 16 165 0 -1 58 57 17 166 15 -1 59 58 14 168 16 -2 4 105 19 33 31 -2 5 4 20 39 18 -2 17 5 21 42 19 -2 18 17 22 70 20 -2 19 18 23 74 21 -2 20 19 24 75 22 -2 21 20 1 76 23 -2 60 59 26 168 14 -2 64 60 27 170 25 -2 65 64 28 177 26 +0 56 40 14 122 12 +0 57 56 0 165 13 +1 2 64 4294967295 27 19 +1 58 57 17 166 0 +1 59 58 18 168 16 +1 60 59 19 168 17 +1 64 60 15 170 18 +2 4 105 21 33 31 +2 5 4 22 39 20 +2 17 5 23 42 21 +2 18 17 24 70 22 +2 19 18 25 74 23 +2 20 19 26 75 24 +2 21 20 1 76 25 +2 65 64 28 177 15 2 81 65 29 179 27 2 89 81 30 206 28 2 97 89 31 220 29 -2 105 97 18 232 30 +2 105 97 20 232 30 3 4 119 33 40 38 -3 105 4 34 18 32 +3 105 4 34 20 32 3 109 105 35 245 33 3 110 109 36 249 34 3 111 110 37 249 35 3 112 111 38 145 36 3 119 112 32 252 37 -4 5 118 19 41 40 +4 5 118 21 41 40 4 118 119 39 252 32 5 6 118 42 46 39 -5 17 6 20 45 41 +5 17 6 22 45 41 6 7 117 44 47 46 6 16 7 45 48 43 6 17 16 42 70 44 @@ -69,13 +69,13 @@ 14 135 140 66 282 64 15 16 136 51 72 69 15 136 135 68 277 66 -16 17 18 45 21 71 +16 17 18 45 23 71 16 18 139 70 74 73 16 138 136 73 283 68 16 139 138 71 273 72 -18 19 139 22 75 71 -19 20 139 23 77 74 -20 21 122 24 78 77 +18 19 139 24 75 71 +19 20 139 25 77 74 +20 21 122 26 78 77 20 122 139 76 259 75 21 22 122 2 80 76 22 23 121 3 82 80 @@ -164,12 +164,12 @@ 54 68 69 161 184 163 54 69 76 162 185 154 55 56 61 122 165 160 -56 57 61 15 167 164 +56 57 61 14 167 164 57 58 60 16 168 167 57 60 61 166 169 165 -58 59 60 17 25 166 +58 59 60 17 18 166 60 63 61 170 172 167 -60 64 63 26 175 169 +60 64 63 19 175 169 61 62 67 172 174 173 61 63 62 169 174 171 61 67 68 171 182 161 diff --git a/CDT/tests/expected/guitar no box__f64_auto_resolve_all.txt b/CDT/tests/expected/guitar no box__f64_auto_resolve_all.txt index 5e6e25f..6faebbd 100644 --- a/CDT/tests/expected/guitar no box__f64_auto_resolve_all.txt +++ b/CDT/tests/expected/guitar no box__f64_auto_resolve_all.txt @@ -1,6 +1,6 @@ 289 -0 1 56 4294967295 15 13 -0 21 2 2 24 4294967295 +0 1 57 4294967295 16 14 +0 21 2 2 26 4294967295 0 22 21 3 78 1 0 23 22 4 79 2 0 24 23 5 81 3 @@ -12,36 +12,36 @@ 0 30 29 11 90 9 0 31 30 12 91 10 0 40 31 13 94 11 -0 56 40 0 122 12 -1 2 59 4294967295 25 17 -1 57 56 16 165 0 -1 58 57 17 166 15 -1 59 58 14 168 16 -2 4 105 19 33 31 -2 5 4 20 39 18 -2 17 5 21 42 19 -2 18 17 22 70 20 -2 19 18 23 74 21 -2 20 19 24 75 22 -2 21 20 1 76 23 -2 60 59 26 168 14 -2 64 60 27 170 25 -2 65 64 28 177 26 +0 56 40 14 122 12 +0 57 56 0 165 13 +1 2 64 4294967295 27 19 +1 58 57 17 166 0 +1 59 58 18 168 16 +1 60 59 19 168 17 +1 64 60 15 170 18 +2 4 105 21 33 31 +2 5 4 22 39 20 +2 17 5 23 42 21 +2 18 17 24 70 22 +2 19 18 25 74 23 +2 20 19 26 75 24 +2 21 20 1 76 25 +2 65 64 28 177 15 2 81 65 29 179 27 2 89 81 30 206 28 2 97 89 31 220 29 -2 105 97 18 232 30 +2 105 97 20 232 30 3 4 119 33 40 38 -3 105 4 34 18 32 +3 105 4 34 20 32 3 109 105 35 245 33 3 110 109 36 249 34 3 111 110 37 249 35 3 112 111 38 145 36 3 119 112 32 252 37 -4 5 118 19 41 40 +4 5 118 21 41 40 4 118 119 39 252 32 5 6 118 42 46 39 -5 17 6 20 45 41 +5 17 6 22 45 41 6 7 117 44 47 46 6 16 7 45 48 43 6 17 16 42 70 44 @@ -69,13 +69,13 @@ 14 135 140 66 282 64 15 16 136 51 72 69 15 136 135 68 277 66 -16 17 18 45 21 71 +16 17 18 45 23 71 16 18 139 70 74 73 16 138 136 73 283 68 16 139 138 71 273 72 -18 19 139 22 75 71 -19 20 139 23 77 74 -20 21 122 24 78 77 +18 19 139 24 75 71 +19 20 139 25 77 74 +20 21 122 26 78 77 20 122 139 76 259 75 21 22 122 2 80 76 22 23 121 3 82 80 @@ -164,12 +164,12 @@ 54 68 69 161 184 163 54 69 76 162 185 154 55 56 61 122 165 160 -56 57 61 15 167 164 +56 57 61 14 167 164 57 58 60 16 168 167 57 60 61 166 169 165 -58 59 60 17 25 166 +58 59 60 17 18 166 60 63 61 170 172 167 -60 64 63 26 175 169 +60 64 63 19 175 169 61 62 67 172 174 173 61 63 62 169 174 171 61 67 68 171 182 161 diff --git a/CDT/tests/expected/kidney__as-provided_ignore_all.txt b/CDT/tests/expected/kidney__as-provided_ignore_all.txt index c8bfdfa..c02b93f 100644 --- a/CDT/tests/expected/kidney__as-provided_ignore_all.txt +++ b/CDT/tests/expected/kidney__as-provided_ignore_all.txt @@ -1,6 +1,6 @@ 101 -0 1 19 4294967295 21 17 -0 3 52 2 36 19 +0 1 21 4294967295 22 19 +0 3 52 2 36 20 0 4 3 3 35 1 0 5 4 4 37 2 0 6 5 5 39 3 @@ -16,24 +16,24 @@ 0 16 15 15 55 13 0 17 16 16 56 14 0 18 17 17 58 15 -0 19 18 0 59 16 -0 51 2 19 34 4294967295 -0 52 51 1 100 18 -1 2 30 4294967295 32 31 -1 20 19 22 61 0 -1 21 20 23 62 21 -1 22 21 24 64 22 -1 23 22 25 66 23 -1 24 23 26 67 24 -1 25 24 27 69 25 -1 26 25 28 71 26 -1 27 26 29 73 27 -1 28 27 30 74 28 -1 29 28 31 76 29 -1 30 29 20 78 30 -2 31 30 33 79 20 -2 50 31 34 81 32 -2 51 50 18 99 33 +0 19 18 18 59 16 +0 20 19 19 61 17 +0 21 20 0 62 18 +0 52 2 1 34 4294967295 +1 2 31 4294967295 32 31 +1 22 21 23 64 0 +1 23 22 24 66 22 +1 24 23 25 67 23 +1 25 24 26 69 24 +1 26 25 27 71 25 +1 27 26 28 73 26 +1 28 27 29 74 27 +1 29 28 30 76 28 +1 30 29 31 78 29 +1 31 30 21 79 30 +2 50 31 33 81 21 +2 51 50 34 99 32 +2 52 51 20 100 33 3 4 48 2 38 36 3 48 52 35 98 1 4 5 47 3 39 38 @@ -60,27 +60,27 @@ 17 18 40 16 60 56 18 19 39 17 61 60 18 39 40 59 91 58 -19 20 39 21 63 59 -20 21 38 22 65 63 +19 20 39 18 63 59 +20 21 38 19 65 63 20 38 39 62 91 61 -21 22 37 23 66 65 +21 22 37 22 66 65 21 37 38 64 87 62 -22 23 37 24 68 64 -23 24 36 25 70 68 +22 23 37 23 68 64 +23 24 36 24 70 68 23 36 37 67 86 66 -24 25 35 26 72 70 +24 25 35 25 72 70 24 35 36 69 86 67 -25 26 34 27 73 72 +25 26 34 26 73 72 25 34 35 71 83 69 -26 27 34 28 75 71 -27 28 33 29 77 75 +26 27 34 27 75 71 +27 28 33 28 77 75 27 33 34 74 83 73 -28 29 32 30 78 77 +28 29 32 29 78 77 28 32 33 76 82 74 -29 30 32 31 79 76 -30 31 32 32 80 78 +29 30 32 30 79 76 +30 31 32 31 80 78 31 49 32 81 82 79 -31 50 49 33 99 80 +31 50 49 32 99 80 32 49 33 80 85 77 33 35 34 84 72 75 33 48 35 85 90 83 @@ -98,8 +98,8 @@ 41 44 43 93 49 95 44 46 45 94 43 46 48 49 52 85 100 36 -49 50 51 81 34 100 -49 51 52 99 19 98 +49 50 51 81 33 100 +49 51 52 99 34 98 50 3 4 diff --git a/CDT/tests/expected/kidney__as-provided_resolve_all.txt b/CDT/tests/expected/kidney__as-provided_resolve_all.txt index c8bfdfa..c02b93f 100644 --- a/CDT/tests/expected/kidney__as-provided_resolve_all.txt +++ b/CDT/tests/expected/kidney__as-provided_resolve_all.txt @@ -1,6 +1,6 @@ 101 -0 1 19 4294967295 21 17 -0 3 52 2 36 19 +0 1 21 4294967295 22 19 +0 3 52 2 36 20 0 4 3 3 35 1 0 5 4 4 37 2 0 6 5 5 39 3 @@ -16,24 +16,24 @@ 0 16 15 15 55 13 0 17 16 16 56 14 0 18 17 17 58 15 -0 19 18 0 59 16 -0 51 2 19 34 4294967295 -0 52 51 1 100 18 -1 2 30 4294967295 32 31 -1 20 19 22 61 0 -1 21 20 23 62 21 -1 22 21 24 64 22 -1 23 22 25 66 23 -1 24 23 26 67 24 -1 25 24 27 69 25 -1 26 25 28 71 26 -1 27 26 29 73 27 -1 28 27 30 74 28 -1 29 28 31 76 29 -1 30 29 20 78 30 -2 31 30 33 79 20 -2 50 31 34 81 32 -2 51 50 18 99 33 +0 19 18 18 59 16 +0 20 19 19 61 17 +0 21 20 0 62 18 +0 52 2 1 34 4294967295 +1 2 31 4294967295 32 31 +1 22 21 23 64 0 +1 23 22 24 66 22 +1 24 23 25 67 23 +1 25 24 26 69 24 +1 26 25 27 71 25 +1 27 26 28 73 26 +1 28 27 29 74 27 +1 29 28 30 76 28 +1 30 29 31 78 29 +1 31 30 21 79 30 +2 50 31 33 81 21 +2 51 50 34 99 32 +2 52 51 20 100 33 3 4 48 2 38 36 3 48 52 35 98 1 4 5 47 3 39 38 @@ -60,27 +60,27 @@ 17 18 40 16 60 56 18 19 39 17 61 60 18 39 40 59 91 58 -19 20 39 21 63 59 -20 21 38 22 65 63 +19 20 39 18 63 59 +20 21 38 19 65 63 20 38 39 62 91 61 -21 22 37 23 66 65 +21 22 37 22 66 65 21 37 38 64 87 62 -22 23 37 24 68 64 -23 24 36 25 70 68 +22 23 37 23 68 64 +23 24 36 24 70 68 23 36 37 67 86 66 -24 25 35 26 72 70 +24 25 35 25 72 70 24 35 36 69 86 67 -25 26 34 27 73 72 +25 26 34 26 73 72 25 34 35 71 83 69 -26 27 34 28 75 71 -27 28 33 29 77 75 +26 27 34 27 75 71 +27 28 33 28 77 75 27 33 34 74 83 73 -28 29 32 30 78 77 +28 29 32 29 78 77 28 32 33 76 82 74 -29 30 32 31 79 76 -30 31 32 32 80 78 +29 30 32 30 79 76 +30 31 32 31 80 78 31 49 32 81 82 79 -31 50 49 33 99 80 +31 50 49 32 99 80 32 49 33 80 85 77 33 35 34 84 72 75 33 48 35 85 90 83 @@ -98,8 +98,8 @@ 41 44 43 93 49 95 44 46 45 94 43 46 48 49 52 85 100 36 -49 50 51 81 34 100 -49 51 52 99 19 98 +49 50 51 81 33 100 +49 51 52 99 34 98 50 3 4 diff --git a/CDT/tests/expected/kidney__auto_ignore_all.txt b/CDT/tests/expected/kidney__auto_ignore_all.txt index 333a346..f096c67 100644 --- a/CDT/tests/expected/kidney__auto_ignore_all.txt +++ b/CDT/tests/expected/kidney__auto_ignore_all.txt @@ -13,7 +13,7 @@ 0 13 12 0 50 10 0 51 2 13 34 4294967295 0 52 51 1 100 12 -1 2 30 4294967295 32 31 +1 2 29 4294967295 31 30 1 14 13 16 52 0 1 15 14 17 53 15 1 16 15 18 55 16 @@ -29,9 +29,9 @@ 1 26 25 28 71 26 1 27 26 29 73 27 1 28 27 30 74 28 -1 29 28 31 76 29 -1 30 29 14 78 30 -2 31 30 33 79 14 +1 29 28 14 76 29 +2 30 29 32 78 14 +2 31 30 33 79 31 2 50 31 34 81 32 2 51 50 12 99 33 3 4 48 2 38 36 diff --git a/CDT/tests/expected/kidney__auto_resolve_all.txt b/CDT/tests/expected/kidney__auto_resolve_all.txt index 333a346..f096c67 100644 --- a/CDT/tests/expected/kidney__auto_resolve_all.txt +++ b/CDT/tests/expected/kidney__auto_resolve_all.txt @@ -13,7 +13,7 @@ 0 13 12 0 50 10 0 51 2 13 34 4294967295 0 52 51 1 100 12 -1 2 30 4294967295 32 31 +1 2 29 4294967295 31 30 1 14 13 16 52 0 1 15 14 17 53 15 1 16 15 18 55 16 @@ -29,9 +29,9 @@ 1 26 25 28 71 26 1 27 26 29 73 27 1 28 27 30 74 28 -1 29 28 31 76 29 -1 30 29 14 78 30 -2 31 30 33 79 14 +1 29 28 14 76 29 +2 30 29 32 78 14 +2 31 30 33 79 31 2 50 31 34 81 32 2 51 50 12 99 33 3 4 48 2 38 36 diff --git a/CDT/tests/expected/overlapping constraints__f32_as-provided_ignore_all.txt b/CDT/tests/expected/overlapping constraints__f32_as-provided_ignore_all.txt index d335a7c..70d8ed9 100644 --- a/CDT/tests/expected/overlapping constraints__f32_as-provided_ignore_all.txt +++ b/CDT/tests/expected/overlapping constraints__f32_as-provided_ignore_all.txt @@ -1,21 +1,21 @@ 17 -0 1 3 4294967295 7 1 +0 1 3 4294967295 8 1 0 3 4 0 11 2 0 4 5 1 11 3 0 5 8 2 14 4 0 8 9 3 15 5 -0 9 2 4 10 4294967295 -1 2 10 4294967295 10 9 -1 6 3 8 12 0 -1 7 6 9 13 7 -1 10 7 6 16 8 -2 9 10 5 16 6 +0 9 10 4 16 6 +0 10 2 5 7 4294967295 +1 2 10 4294967295 6 10 +1 6 3 9 12 0 +1 7 6 10 13 8 +1 10 7 7 16 9 3 5 4 12 2 1 -3 6 5 7 13 11 -5 6 7 12 8 14 +3 6 5 8 13 11 +5 6 7 12 9 14 5 7 8 13 15 3 7 9 8 16 4 14 -7 10 9 9 10 15 +7 10 9 10 5 15 9 3 4 diff --git a/CDT/tests/expected/overlapping constraints__f32_as-provided_resolve_all.txt b/CDT/tests/expected/overlapping constraints__f32_as-provided_resolve_all.txt index d335a7c..70d8ed9 100644 --- a/CDT/tests/expected/overlapping constraints__f32_as-provided_resolve_all.txt +++ b/CDT/tests/expected/overlapping constraints__f32_as-provided_resolve_all.txt @@ -1,21 +1,21 @@ 17 -0 1 3 4294967295 7 1 +0 1 3 4294967295 8 1 0 3 4 0 11 2 0 4 5 1 11 3 0 5 8 2 14 4 0 8 9 3 15 5 -0 9 2 4 10 4294967295 -1 2 10 4294967295 10 9 -1 6 3 8 12 0 -1 7 6 9 13 7 -1 10 7 6 16 8 -2 9 10 5 16 6 +0 9 10 4 16 6 +0 10 2 5 7 4294967295 +1 2 10 4294967295 6 10 +1 6 3 9 12 0 +1 7 6 10 13 8 +1 10 7 7 16 9 3 5 4 12 2 1 -3 6 5 7 13 11 -5 6 7 12 8 14 +3 6 5 8 13 11 +5 6 7 12 9 14 5 7 8 13 15 3 7 9 8 16 4 14 -7 10 9 9 10 15 +7 10 9 10 5 15 9 3 4 diff --git a/CDT/tests/expected/overlapping constraints__f32_auto_ignore_all.txt b/CDT/tests/expected/overlapping constraints__f32_auto_ignore_all.txt index d335a7c..70d8ed9 100644 --- a/CDT/tests/expected/overlapping constraints__f32_auto_ignore_all.txt +++ b/CDT/tests/expected/overlapping constraints__f32_auto_ignore_all.txt @@ -1,21 +1,21 @@ 17 -0 1 3 4294967295 7 1 +0 1 3 4294967295 8 1 0 3 4 0 11 2 0 4 5 1 11 3 0 5 8 2 14 4 0 8 9 3 15 5 -0 9 2 4 10 4294967295 -1 2 10 4294967295 10 9 -1 6 3 8 12 0 -1 7 6 9 13 7 -1 10 7 6 16 8 -2 9 10 5 16 6 +0 9 10 4 16 6 +0 10 2 5 7 4294967295 +1 2 10 4294967295 6 10 +1 6 3 9 12 0 +1 7 6 10 13 8 +1 10 7 7 16 9 3 5 4 12 2 1 -3 6 5 7 13 11 -5 6 7 12 8 14 +3 6 5 8 13 11 +5 6 7 12 9 14 5 7 8 13 15 3 7 9 8 16 4 14 -7 10 9 9 10 15 +7 10 9 10 5 15 9 3 4 diff --git a/CDT/tests/expected/overlapping constraints__f32_auto_resolve_all.txt b/CDT/tests/expected/overlapping constraints__f32_auto_resolve_all.txt index d335a7c..70d8ed9 100644 --- a/CDT/tests/expected/overlapping constraints__f32_auto_resolve_all.txt +++ b/CDT/tests/expected/overlapping constraints__f32_auto_resolve_all.txt @@ -1,21 +1,21 @@ 17 -0 1 3 4294967295 7 1 +0 1 3 4294967295 8 1 0 3 4 0 11 2 0 4 5 1 11 3 0 5 8 2 14 4 0 8 9 3 15 5 -0 9 2 4 10 4294967295 -1 2 10 4294967295 10 9 -1 6 3 8 12 0 -1 7 6 9 13 7 -1 10 7 6 16 8 -2 9 10 5 16 6 +0 9 10 4 16 6 +0 10 2 5 7 4294967295 +1 2 10 4294967295 6 10 +1 6 3 9 12 0 +1 7 6 10 13 8 +1 10 7 7 16 9 3 5 4 12 2 1 -3 6 5 7 13 11 -5 6 7 12 8 14 +3 6 5 8 13 11 +5 6 7 12 9 14 5 7 8 13 15 3 7 9 8 16 4 14 -7 10 9 9 10 15 +7 10 9 10 5 15 9 3 4 diff --git a/CDT/tests/expected/overlapping constraints__f64_as-provided_ignore_all.txt b/CDT/tests/expected/overlapping constraints__f64_as-provided_ignore_all.txt index d335a7c..70d8ed9 100644 --- a/CDT/tests/expected/overlapping constraints__f64_as-provided_ignore_all.txt +++ b/CDT/tests/expected/overlapping constraints__f64_as-provided_ignore_all.txt @@ -1,21 +1,21 @@ 17 -0 1 3 4294967295 7 1 +0 1 3 4294967295 8 1 0 3 4 0 11 2 0 4 5 1 11 3 0 5 8 2 14 4 0 8 9 3 15 5 -0 9 2 4 10 4294967295 -1 2 10 4294967295 10 9 -1 6 3 8 12 0 -1 7 6 9 13 7 -1 10 7 6 16 8 -2 9 10 5 16 6 +0 9 10 4 16 6 +0 10 2 5 7 4294967295 +1 2 10 4294967295 6 10 +1 6 3 9 12 0 +1 7 6 10 13 8 +1 10 7 7 16 9 3 5 4 12 2 1 -3 6 5 7 13 11 -5 6 7 12 8 14 +3 6 5 8 13 11 +5 6 7 12 9 14 5 7 8 13 15 3 7 9 8 16 4 14 -7 10 9 9 10 15 +7 10 9 10 5 15 9 3 4 diff --git a/CDT/tests/expected/overlapping constraints__f64_as-provided_resolve_all.txt b/CDT/tests/expected/overlapping constraints__f64_as-provided_resolve_all.txt index d335a7c..70d8ed9 100644 --- a/CDT/tests/expected/overlapping constraints__f64_as-provided_resolve_all.txt +++ b/CDT/tests/expected/overlapping constraints__f64_as-provided_resolve_all.txt @@ -1,21 +1,21 @@ 17 -0 1 3 4294967295 7 1 +0 1 3 4294967295 8 1 0 3 4 0 11 2 0 4 5 1 11 3 0 5 8 2 14 4 0 8 9 3 15 5 -0 9 2 4 10 4294967295 -1 2 10 4294967295 10 9 -1 6 3 8 12 0 -1 7 6 9 13 7 -1 10 7 6 16 8 -2 9 10 5 16 6 +0 9 10 4 16 6 +0 10 2 5 7 4294967295 +1 2 10 4294967295 6 10 +1 6 3 9 12 0 +1 7 6 10 13 8 +1 10 7 7 16 9 3 5 4 12 2 1 -3 6 5 7 13 11 -5 6 7 12 8 14 +3 6 5 8 13 11 +5 6 7 12 9 14 5 7 8 13 15 3 7 9 8 16 4 14 -7 10 9 9 10 15 +7 10 9 10 5 15 9 3 4 diff --git a/CDT/tests/expected/overlapping constraints__f64_auto_ignore_all.txt b/CDT/tests/expected/overlapping constraints__f64_auto_ignore_all.txt index 5962d9e..55104fa 100644 --- a/CDT/tests/expected/overlapping constraints__f64_auto_ignore_all.txt +++ b/CDT/tests/expected/overlapping constraints__f64_auto_ignore_all.txt @@ -1,21 +1,21 @@ 17 -0 1 3 4294967295 7 1 +0 1 3 4294967295 8 1 0 3 4 0 11 2 0 4 5 1 12 3 0 5 8 2 14 4 0 8 9 3 15 5 -0 9 2 4 10 4294967295 -1 2 10 4294967295 10 9 -1 6 3 8 11 0 -1 7 6 9 13 7 -1 10 7 6 16 8 -2 9 10 5 16 6 -3 6 4 7 12 1 +0 9 10 4 16 6 +0 10 2 5 7 4294967295 +1 2 10 4294967295 6 10 +1 6 3 9 11 0 +1 7 6 10 13 8 +1 10 7 7 16 9 +3 6 4 8 12 1 4 6 5 11 13 2 -5 6 7 12 8 14 +5 6 7 12 9 14 5 7 8 13 15 3 7 9 8 16 4 14 -7 10 9 9 10 15 +7 10 9 10 5 15 9 3 4 diff --git a/CDT/tests/expected/overlapping constraints__f64_auto_resolve_all.txt b/CDT/tests/expected/overlapping constraints__f64_auto_resolve_all.txt index 5962d9e..55104fa 100644 --- a/CDT/tests/expected/overlapping constraints__f64_auto_resolve_all.txt +++ b/CDT/tests/expected/overlapping constraints__f64_auto_resolve_all.txt @@ -1,21 +1,21 @@ 17 -0 1 3 4294967295 7 1 +0 1 3 4294967295 8 1 0 3 4 0 11 2 0 4 5 1 12 3 0 5 8 2 14 4 0 8 9 3 15 5 -0 9 2 4 10 4294967295 -1 2 10 4294967295 10 9 -1 6 3 8 11 0 -1 7 6 9 13 7 -1 10 7 6 16 8 -2 9 10 5 16 6 -3 6 4 7 12 1 +0 9 10 4 16 6 +0 10 2 5 7 4294967295 +1 2 10 4294967295 6 10 +1 6 3 9 11 0 +1 7 6 10 13 8 +1 10 7 7 16 9 +3 6 4 8 12 1 4 6 5 11 13 2 -5 6 7 12 8 14 +5 6 7 12 9 14 5 7 8 13 15 3 7 9 8 16 4 14 -7 10 9 9 10 15 +7 10 9 10 5 15 9 3 4 diff --git a/CDT/tests/expected/points_on_constraint_edge__as-provided_ignore_all.txt b/CDT/tests/expected/points_on_constraint_edge__as-provided_ignore_all.txt index 5f0a3cf..9fa86a3 100644 --- a/CDT/tests/expected/points_on_constraint_edge__as-provided_ignore_all.txt +++ b/CDT/tests/expected/points_on_constraint_edge__as-provided_ignore_all.txt @@ -1,17 +1,17 @@ 25 -0 1 13 4294967295 7 5 +0 1 14 4294967295 7 6 0 3 2 2 8 4294967295 0 6 3 3 13 1 0 7 6 4 13 2 0 12 7 5 20 3 -0 13 12 0 21 4 -1 2 14 4294967295 12 7 -1 14 13 6 22 0 +0 13 12 6 21 4 +0 14 13 0 22 5 +1 2 14 4294967295 12 0 2 3 4 1 15 9 2 4 5 8 16 10 2 5 10 9 18 11 2 10 11 10 24 12 -2 11 14 11 24 6 +2 11 14 11 24 7 3 6 7 2 3 14 3 7 8 13 19 15 3 8 4 14 16 8 @@ -21,7 +21,7 @@ 7 9 8 20 17 14 7 12 9 4 21 19 9 12 13 20 5 22 -9 13 14 21 7 23 +9 13 14 21 6 23 9 14 10 22 24 18 10 14 11 23 12 11 diff --git a/CDT/tests/expected/points_on_constraint_edge__as-provided_resolve_all.txt b/CDT/tests/expected/points_on_constraint_edge__as-provided_resolve_all.txt index 5f0a3cf..9fa86a3 100644 --- a/CDT/tests/expected/points_on_constraint_edge__as-provided_resolve_all.txt +++ b/CDT/tests/expected/points_on_constraint_edge__as-provided_resolve_all.txt @@ -1,17 +1,17 @@ 25 -0 1 13 4294967295 7 5 +0 1 14 4294967295 7 6 0 3 2 2 8 4294967295 0 6 3 3 13 1 0 7 6 4 13 2 0 12 7 5 20 3 -0 13 12 0 21 4 -1 2 14 4294967295 12 7 -1 14 13 6 22 0 +0 13 12 6 21 4 +0 14 13 0 22 5 +1 2 14 4294967295 12 0 2 3 4 1 15 9 2 4 5 8 16 10 2 5 10 9 18 11 2 10 11 10 24 12 -2 11 14 11 24 6 +2 11 14 11 24 7 3 6 7 2 3 14 3 7 8 13 19 15 3 8 4 14 16 8 @@ -21,7 +21,7 @@ 7 9 8 20 17 14 7 12 9 4 21 19 9 12 13 20 5 22 -9 13 14 21 7 23 +9 13 14 21 6 23 9 14 10 22 24 18 10 14 11 23 12 11 diff --git a/CDT/tests/expected/triple-hanging-flipped__auto_ignore_all.txt b/CDT/tests/expected/triple-hanging-flipped__auto_ignore_all.txt index 0c663cf..5378ead 100644 --- a/CDT/tests/expected/triple-hanging-flipped__auto_ignore_all.txt +++ b/CDT/tests/expected/triple-hanging-flipped__auto_ignore_all.txt @@ -1,21 +1,21 @@ 17 -0 1 10 4294967295 4 2 -0 3 2 2 5 4294967295 -0 10 3 0 12 1 -1 2 7 4294967295 7 4 -1 7 10 3 16 0 +0 1 7 4294967295 4 2 +0 3 2 3 5 4294967295 +0 7 10 0 16 3 +0 10 3 2 12 1 +1 2 7 4294967295 7 0 2 3 4 1 9 6 2 4 6 5 13 7 -2 6 7 6 13 3 +2 6 7 6 13 4 3 5 7 10 14 9 3 7 4 8 13 5 3 8 5 11 14 8 3 9 8 12 15 10 -3 10 9 2 16 11 +3 10 9 3 16 11 4 7 6 9 7 6 5 8 7 10 15 8 7 8 9 14 11 16 -7 9 10 15 12 4 +7 9 10 15 12 2 1 3 7 diff --git a/CDT/tests/expected/triple-hanging-flipped__auto_resolve_all.txt b/CDT/tests/expected/triple-hanging-flipped__auto_resolve_all.txt index 0c663cf..5378ead 100644 --- a/CDT/tests/expected/triple-hanging-flipped__auto_resolve_all.txt +++ b/CDT/tests/expected/triple-hanging-flipped__auto_resolve_all.txt @@ -1,21 +1,21 @@ 17 -0 1 10 4294967295 4 2 -0 3 2 2 5 4294967295 -0 10 3 0 12 1 -1 2 7 4294967295 7 4 -1 7 10 3 16 0 +0 1 7 4294967295 4 2 +0 3 2 3 5 4294967295 +0 7 10 0 16 3 +0 10 3 2 12 1 +1 2 7 4294967295 7 0 2 3 4 1 9 6 2 4 6 5 13 7 -2 6 7 6 13 3 +2 6 7 6 13 4 3 5 7 10 14 9 3 7 4 8 13 5 3 8 5 11 14 8 3 9 8 12 15 10 -3 10 9 2 16 11 +3 10 9 3 16 11 4 7 6 9 7 6 5 8 7 10 15 8 7 8 9 14 11 16 -7 9 10 15 12 4 +7 9 10 15 12 2 1 3 7