ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-25 05:20:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Don't swap very bad elements in SwapImprove

Browse Source 
Changes meshing -> new test results
This commit is contained in:
Matthias Hochsteger 2021-03-01 09:57:31 +01:00
parent f8aa3d3159
commit d7d12ac53d
2 changed files with 159 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libsrc/meshing/improve3.cpp
View File

@ -14,6 +14,8 @@
namespace netgen namespace netgen
{ {
static constexpr int IMPROVEMENT_CONFORMING_EDGE = -1e6;
static inline bool NotTooBad(double bad1, double bad2) static inline bool NotTooBad(double bad1, double bad2)
{ {
return (bad2 <= bad1) || return (bad2 <= bad1) ||
@ -2443,21 +2445,22 @@ double MeshOptimize3d :: SwapImproveEdge (Mesh & mesh, OPTIMIZEGOAL goal,
bool swap2, swap3; bool swap2, swap3;
if (goal != OPT_CONFORM) if (goal == OPT_CONFORM)
{
swap2 = mesh.BoundaryEdge (pi3, pi5) && NotTooBad(bad1, bad2);
swap3 = mesh.BoundaryEdge (pi4, pi6) && NotTooBad(bad1, bad3);
if(swap2 || swap3)
d_badness = IMPROVEMENT_CONFORMING_EDGE;
}
if (goal != OPT_CONFORM || (!swap2 && !swap3))
{ {
swap2 = (bad2 < bad1) && (bad2 < bad3); swap2 = (bad2 < bad1) && (bad2 < bad3);
swap3 = !swap2 && (bad3 < bad1); swap3 = !swap2 && (bad3 < bad1);
}
else
{
if (mesh.BoundaryEdge (pi3, pi5)) bad2 /= 1e6;
if (mesh.BoundaryEdge (pi4, pi6)) bad3 /= 1e6;
swap2 = (bad2 < bad1) && (bad2 < bad3);
swap3 = !swap2 && (bad3 < bad1);
}
d_badness = swap2 ? bad2-bad1 : bad3-bad1; d_badness = swap2 ? bad2-bad1 : bad3-bad1;
}
if(check_only) if(check_only)
return d_badness; return d_badness;

292
tests/pytest/results.json
View File

@ -488,12 +488,12 @@
"ne2d": 164, "ne2d": 164,
"ne3d": 252, "ne3d": 252,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 4, 2, 3, 11, 30, 31, 34, 40, 38, 33, 17, 7, 1]", "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 4, 2, 3, 11, 30, 31, 34, 40, 38, 33, 17, 7, 1]",
"total_badness": 369.95189199 "total_badness": 369.95189237
}, },
{ {
"angles_tet": [ "angles_tet": [
20.8, 14.206,
137.89 159.84
], ],
"angles_trig": [ "angles_trig": [
21.077, 21.077,
@ -501,9 +501,9 @@
], ],
"ne1d": 190, "ne1d": 190,
"ne2d": 300, "ne2d": 300,
"ne3d": 631, "ne3d": 632,
"quality_histogram": "[0, 0, 0, 0, 1, 0, 0, 3, 8, 27, 48, 61, 68, 107, 85, 89, 63, 49, 20, 2]", "quality_histogram": "[0, 0, 0, 0, 2, 0, 0, 4, 8, 26, 45, 62, 80, 96, 90, 84, 65, 46, 22, 2]",
"total_badness": 943.22430902 "total_badness": 947.91494351
}, },
{ {
"angles_tet": [ "angles_tet": [
@ -1258,18 +1258,18 @@
}, },
{ {
"angles_tet": [ "angles_tet": [
21.427, 21.266,
143.66 143.66
], ],
"angles_trig": [ "angles_trig": [
23.929, 23.958,
119.81 119.8
], ],
"ne1d": 388, "ne1d": 388,
"ne2d": 6142, "ne2d": 6142,
"ne3d": 54709, "ne3d": 54704,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 2, 17, 61, 251, 727, 2119, 4819, 8218, 11623, 13209, 10213, 3450]", "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 2, 17, 66, 248, 717, 2138, 4854, 8219, 11632, 13173, 10210, 3428]",
"total_badness": 65887.909834 "total_badness": 65897.969985
} }
], ],
"fichera.geo": [ "fichera.geo": [
@ -1284,9 +1284,9 @@
], ],
"ne1d": 50, "ne1d": 50,
"ne2d": 38, "ne2d": 38,
"ne3d": 35, "ne3d": 36,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 3, 8, 4, 10, 2, 0, 0, 2]", "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 4, 7, 6, 8, 1, 1, 0, 1]",
"total_badness": 50.263302236 "total_badness": 53.038414986
}, },
{ {
"angles_tet": [ "angles_tet": [
@ -1329,9 +1329,9 @@
], ],
"ne1d": 50, "ne1d": 50,
"ne2d": 38, "ne2d": 38,
"ne3d": 35, "ne3d": 36,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 3, 8, 4, 10, 2, 0, 0, 2]", "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 4, 7, 6, 8, 1, 1, 0, 1]",
"total_badness": 50.263302236 "total_badness": 53.038414986
}, },
{ {
"angles_tet": [ "angles_tet": [
@ -1367,7 +1367,7 @@
"frame.step": [ "frame.step": [
{ {
"angles_tet": [ "angles_tet": [
2.9095, 2.9158,
171.1 171.1
], ],
"angles_trig": [ "angles_trig": [
@ -1376,9 +1376,9 @@
], ],
"ne1d": 10108, "ne1d": 10108,
"ne2d": 30160, "ne2d": 30160,
"ne3d": 153012, "ne3d": 152932,
"quality_histogram": "[0, 3, 1, 3, 6, 20, 57, 149, 536, 1257, 2919, 5836, 10439, 16388, 21788, 26067, 26565, 22916, 14350, 3712]", "quality_histogram": "[0, 3, 1, 3, 6, 20, 60, 151, 543, 1312, 2940, 5874, 10445, 16338, 21809, 26075, 26405, 22854, 14351, 3742]",
"total_badness": 202656.25887 "total_badness": 202658.67088
}, },
{ {
"angles_tet": [ "angles_tet": [
@ -1391,13 +1391,13 @@
], ],
"ne1d": 5988, "ne1d": 5988,
"ne2d": 11102, "ne2d": 11102,
"ne3d": 29344, "ne3d": 29140,
"quality_histogram": "[3, 4, 5, 8, 14, 45, 122, 251, 692, 1044, 1527, 2497, 3115, 3927, 4328, 4293, 3367, 2421, 1363, 318]", "quality_histogram": "[3, 4, 3, 10, 18, 43, 114, 248, 669, 1026, 1563, 2467, 3073, 3886, 4389, 4179, 3406, 2403, 1317, 319]",
"total_badness": 43503.906462 "total_badness": 43201.580215
}, },
{ {
"angles_tet": [ "angles_tet": [
2.5792, 2.1788,
174.11 174.11
], ],
"angles_trig": [ "angles_trig": [
@ -1406,16 +1406,16 @@
], ],
"ne1d": 9622, "ne1d": 9622,
"ne2d": 23964, "ne2d": 23964,
"ne3d": 80995, "ne3d": 80884,
"quality_histogram": "[2, 14, 4, 20, 18, 40, 94, 225, 485, 1115, 2415, 4537, 7493, 10248, 12753, 13190, 12020, 9207, 5660, 1455]", "quality_histogram": "[2, 15, 4, 18, 16, 39, 98, 222, 478, 1114, 2389, 4532, 7510, 10291, 12685, 13114, 12137, 9102, 5641, 1477]",
"total_badness": 111934.5334 "total_badness": 111769.66842
} }
], ],
"hinge.stl": [ "hinge.stl": [
{ {
"angles_tet": [ "angles_tet": [
21.248, 16.835,
144.42 148.75
], ],
"angles_trig": [ "angles_trig": [
18.101, 18.101,
@ -1423,9 +1423,9 @@
], ],
"ne1d": 456, "ne1d": 456,
"ne2d": 1220, "ne2d": 1220,
"ne3d": 1986, "ne3d": 1985,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 8, 20, 39, 66, 127, 177, 243, 307, 299, 259, 259, 141, 41]", "quality_histogram": "[0, 0, 0, 0, 0, 1, 0, 9, 20, 38, 65, 129, 172, 240, 303, 297, 268, 263, 138, 42]",
"total_badness": 2751.3290713 "total_badness": 2749.9093553
}, },
{ {
"angles_tet": [ "angles_tet": [
@ -1438,9 +1438,9 @@
], ],
"ne1d": 298, "ne1d": 298,
"ne2d": 610, "ne2d": 610,
"ne3d": 788, "ne3d": 789,
"quality_histogram": "[0, 0, 1, 10, 9, 4, 22, 15, 39, 41, 68, 84, 103, 97, 84, 85, 48, 49, 25, 4]", "quality_histogram": "[0, 0, 1, 10, 9, 4, 22, 15, 40, 43, 68, 84, 103, 96, 83, 85, 48, 49, 25, 4]",
"total_badness": 1361.2509309 "total_badness": 1364.9012739
}, },
{ {
"angles_tet": [ "angles_tet": [
@ -1453,9 +1453,9 @@
], ],
"ne1d": 370, "ne1d": 370,
"ne2d": 856, "ne2d": 856,
"ne3d": 1135, "ne3d": 1134,
"quality_histogram": "[0, 0, 0, 2, 4, 5, 14, 26, 39, 57, 79, 117, 135, 136, 153, 151, 97, 67, 45, 8]", "quality_histogram": "[0, 0, 0, 2, 4, 5, 14, 25, 38, 56, 78, 119, 136, 137, 152, 151, 98, 66, 45, 8]",
"total_badness": 1799.6066426 "total_badness": 1795.6519937
}, },
{ {
"angles_tet": [ "angles_tet": [
@ -1468,9 +1468,9 @@
], ],
"ne1d": 516, "ne1d": 516,
"ne2d": 1574, "ne2d": 1574,
"ne3d": 2598, "ne3d": 2592,
"quality_histogram": "[0, 0, 0, 0, 0, 4, 3, 4, 26, 48, 95, 172, 225, 326, 383, 383, 339, 325, 216, 49]", "quality_histogram": "[0, 0, 0, 0, 0, 4, 3, 4, 24, 49, 98, 174, 224, 322, 378, 396, 333, 317, 216, 50]",
"total_badness": 3605.8538311 "total_badness": 3599.8559259
}, },
{ {
"angles_tet": [ "angles_tet": [
@ -1483,9 +1483,9 @@
], ],
"ne1d": 722, "ne1d": 722,
"ne2d": 2866, "ne2d": 2866,
"ne3d": 6700, "ne3d": 6672,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 2, 22, 29, 52, 170, 325, 637, 877, 1046, 1169, 1237, 870, 263]", "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 1, 24, 30, 67, 169, 331, 632, 870, 1040, 1173, 1200, 874, 260]",
"total_badness": 8579.1803793 "total_badness": 8558.9452401
}, },
{ {
"angles_tet": [ "angles_tet": [
@ -1498,9 +1498,9 @@
], ],
"ne1d": 1862, "ne1d": 1862,
"ne2d": 19474, "ne2d": 19474,
"ne3d": 136541, "ne3d": 136547,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 8, 59, 274, 862, 2533, 6435, 12998, 21248, 29157, 31131, 24003, 7832]", "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 8, 60, 274, 868, 2525, 6456, 12982, 21266, 29083, 31162, 24018, 7844]",
"total_badness": 165944.59425 "total_badness": 165951.25229
} }
], ],
"lense.in2d": [ "lense.in2d": [
@ -1729,9 +1729,9 @@
], ],
"ne1d": 4106, "ne1d": 4106,
"ne2d": 27994, "ne2d": 27994,
"ne3d": 70797, "ne3d": 70789,
"quality_histogram": "[0, 0, 0, 1, 30, 72, 170, 340, 665, 1450, 2605, 4080, 6678, 9294, 10482, 10758, 9889, 7627, 4870, 1786]", "quality_histogram": "[0, 0, 0, 1, 31, 72, 171, 344, 668, 1440, 2602, 4089, 6675, 9290, 10472, 10751, 9903, 7620, 4876, 1784]",
"total_badness": 99064.519397 "total_badness": 99059.754776
} }
], ],
"manyholes2.geo": [ "manyholes2.geo": [
@ -1747,8 +1747,8 @@
"ne1d": 10202, "ne1d": 10202,
"ne2d": 55380, "ne2d": 55380,
"ne3d": 128239, "ne3d": 128239,
"quality_histogram": "[0, 0, 0, 0, 4, 29, 79, 237, 724, 1933, 4439, 7719, 11694, 17428, 18585, 18328, 17275, 15160, 10938, 3667]", "quality_histogram": "[0, 0, 0, 0, 4, 28, 79, 241, 721, 1932, 4433, 7722, 11698, 17421, 18591, 18340, 17271, 15154, 10934, 3670]",
"total_badness": 176224.09669 "total_badness": 176223.54068
} }
], ],
"matrix.geo": [ "matrix.geo": [
@ -1938,18 +1938,18 @@
"part1.stl": [ "part1.stl": [
{ {
"angles_tet": [ "angles_tet": [
13.213, 14.209,
147.22 147.23
], ],
"angles_trig": [ "angles_trig": [
19.94, 19.94,
128.03 127.49
], ],
"ne1d": 170, "ne1d": 170,
"ne2d": 448, "ne2d": 448,
"ne3d": 1260, "ne3d": 1261,
"quality_histogram": "[0, 0, 0, 0, 0, 2, 2, 9, 17, 21, 37, 69, 106, 152, 209, 198, 165, 149, 98, 26]", "quality_histogram": "[0, 0, 0, 0, 0, 1, 3, 8, 15, 25, 35, 78, 97, 157, 211, 199, 161, 144, 100, 27]",
"total_badness": 1750.899754 "total_badness": 1752.4668505
}, },
{ {
"angles_tet": [ "angles_tet": [
@ -1962,43 +1962,43 @@
], ],
"ne1d": 134, "ne1d": 134,
"ne2d": 288, "ne2d": 288,
"ne3d": 528, "ne3d": 524,
"quality_histogram": "[0, 0, 0, 2, 4, 2, 4, 3, 16, 24, 36, 42, 54, 69, 66, 74, 61, 46, 24, 1]", "quality_histogram": "[0, 0, 0, 2, 4, 2, 4, 7, 16, 28, 38, 46, 52, 62, 72, 70, 55, 40, 24, 2]",
"total_badness": 813.76674756 "total_badness": 820.9371699
}, },
{ {
"angles_tet": [ "angles_tet": [
20.704, 21.121,
143.31 143.15
], ],
"angles_trig": [ "angles_trig": [
24.375, 24.417,
116.27 116.27
], ],
"ne1d": 194, "ne1d": 194,
"ne2d": 594, "ne2d": 594,
"ne3d": 1693, "ne3d": 1693,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 5, 14, 28, 54, 137, 197, 250, 262, 308, 248, 149, 40]", "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 5, 3, 28, 53, 113, 172, 250, 278, 293, 284, 173, 40]",
"total_badness": 2242.4690855 "total_badness": 2213.1235108
}, },
{ {
"angles_tet": [ "angles_tet": [
22.052, 22.044,
141.32 141.38
], ],
"angles_trig": [ "angles_trig": [
25.868, 25.297,
119.75 120.13
], ],
"ne1d": 266, "ne1d": 266,
"ne2d": 986, "ne2d": 986,
"ne3d": 4101, "ne3d": 4106,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 5, 12, 29, 53, 158, 292, 530, 683, 826, 812, 568, 133]", "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 5, 11, 28, 57, 139, 316, 492, 706, 817, 813, 570, 151]",
"total_badness": 5160.0364225 "total_badness": 5157.0222907
}, },
{ {
"angles_tet": [ "angles_tet": [
23.306, 23.336,
138.08 138.08
], ],
"angles_trig": [ "angles_trig": [
@ -2007,9 +2007,9 @@
], ],
"ne1d": 674, "ne1d": 674,
"ne2d": 6854, "ne2d": 6854,
"ne3d": 82748, "ne3d": 82721,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 3, 17, 121, 417, 1362, 3669, 7623, 12797, 17700, 19603, 14878, 4557]", "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 3, 16, 118, 414, 1347, 3658, 7624, 12768, 17708, 19580, 14908, 4576]",
"total_badness": 100231.59467 "total_badness": 100175.28811
} }
], ],
"period.geo": [ "period.geo": [
@ -2116,9 +2116,9 @@
], ],
"ne1d": 886, "ne1d": 886,
"ne2d": 2592, "ne2d": 2592,
"ne3d": 8269, "ne3d": 8292,
"quality_histogram": "[4, 9, 33, 44, 40, 53, 44, 46, 101, 142, 258, 402, 641, 938, 1253, 1304, 1193, 1022, 589, 153]", "quality_histogram": "[5, 9, 29, 46, 37, 51, 44, 46, 94, 160, 257, 412, 647, 899, 1265, 1378, 1157, 1002, 611, 143]",
"total_badness": 12315.265721 "total_badness": 12343.24347
}, },
{ {
"angles_tet": [ "angles_tet": [
@ -2131,24 +2131,24 @@
], ],
"ne1d": 570, "ne1d": 570,
"ne2d": 1202, "ne2d": 1202,
"ne3d": 1839, "ne3d": 1795,
"quality_histogram": "[2, 21, 37, 57, 66, 75, 111, 134, 161, 173, 193, 158, 151, 145, 117, 81, 73, 54, 25, 5]", "quality_histogram": "[2, 20, 39, 51, 70, 80, 102, 131, 157, 158, 176, 170, 145, 140, 122, 84, 67, 50, 26, 5]",
"total_badness": 4538.6020288 "total_badness": 4436.3977005
}, },
{ {
"angles_tet": [ "angles_tet": [
1.1033, 1.1033,
172.29 171.77
], ],
"angles_trig": [ "angles_trig": [
3.728, 3.728,
163.66 165.5
], ],
"ne1d": 724, "ne1d": 724,
"ne2d": 1730, "ne2d": 1730,
"ne3d": 3267, "ne3d": 3290,
"quality_histogram": "[3, 15, 32, 52, 50, 38, 44, 76, 118, 161, 234, 258, 360, 375, 419, 411, 310, 195, 94, 22]", "quality_histogram": "[3, 18, 29, 53, 45, 38, 53, 72, 116, 168, 230, 257, 328, 415, 424, 399, 334, 189, 92, 27]",
"total_badness": 6011.5192864 "total_badness": 6051.57684
}, },
{ {
"angles_tet": [ "angles_tet": [
@ -2157,18 +2157,18 @@
], ],
"angles_trig": [ "angles_trig": [
2.0839, 2.0839,
165.56 163.08
], ],
"ne1d": 956, "ne1d": 956,
"ne2d": 2828, "ne2d": 2828,
"ne3d": 8577, "ne3d": 8481,
"quality_histogram": "[3, 9, 37, 48, 48, 52, 57, 61, 87, 129, 205, 326, 507, 804, 1200, 1394, 1476, 1215, 736, 183]", "quality_histogram": "[3, 8, 38, 49, 47, 50, 55, 57, 96, 137, 195, 343, 515, 792, 1200, 1366, 1417, 1181, 742, 190]",
"total_badness": 12580.561684 "total_badness": 12456.662988
}, },
{ {
"angles_tet": [ "angles_tet": [
1.3345, 1.1518,
171.17 168.3
], ],
"angles_trig": [ "angles_trig": [
1.7811, 1.7811,
@ -2176,9 +2176,9 @@
], ],
"ne1d": 1554, "ne1d": 1554,
"ne2d": 6372, "ne2d": 6372,
"ne3d": 31607, "ne3d": 31605,
"quality_histogram": "[2, 7, 14, 7, 26, 53, 50, 67, 90, 188, 312, 638, 1249, 2301, 3886, 5314, 6167, 5965, 4114, 1157]", "quality_histogram": "[2, 8, 13, 9, 26, 53, 51, 69, 87, 191, 315, 647, 1221, 2378, 3853, 5328, 6181, 5935, 4068, 1170]",
"total_badness": 40813.948339 "total_badness": 40844.172563
}, },
{ {
"angles_tet": [ "angles_tet": [
@ -2191,9 +2191,9 @@
], ],
"ne1d": 2992, "ne1d": 2992,
"ne2d": 23322, "ne2d": 23322,
"ne3d": 281896, "ne3d": 281946,
"quality_histogram": "[4, 10, 12, 10, 9, 21, 29, 61, 95, 246, 747, 2146, 5540, 13546, 27675, 44558, 59947, 64037, 48291, 14912]", "quality_histogram": "[4, 10, 12, 10, 9, 21, 29, 60, 99, 245, 724, 2133, 5538, 13549, 27663, 44504, 60069, 63936, 48457, 14874]",
"total_badness": 344508.9779 "total_badness": 344547.37835
} }
], ],
"revolution.geo": [ "revolution.geo": [
@ -2209,8 +2209,8 @@
"ne1d": 320, "ne1d": 320,
"ne2d": 3110, "ne2d": 3110,
"ne3d": 8379, "ne3d": 8379,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 3, 27, 91, 210, 453, 679, 983, 1088, 1150, 1165, 1083, 812, 518, 117]", "quality_histogram": "[0, 0, 0, 0, 0, 0, 3, 27, 90, 212, 461, 680, 967, 1096, 1153, 1170, 1080, 802, 520, 118]",
"total_badness": 11964.310211 "total_badness": 11967.150699
}, },
{ {
"angles_tet": [ "angles_tet": [
@ -2253,9 +2253,9 @@
], ],
"ne1d": 320, "ne1d": 320,
"ne2d": 3110, "ne2d": 3110,
"ne3d": 8253, "ne3d": 8258,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 2, 13, 47, 138, 333, 624, 839, 1047, 1151, 1187, 1166, 945, 608, 153]", "quality_histogram": "[0, 0, 0, 0, 0, 0, 2, 13, 48, 141, 339, 627, 829, 1041, 1149, 1209, 1156, 945, 605, 154]",
"total_badness": 11468.848993 "total_badness": 11481.414846
}, },
{ {
"angles_tet": [ "angles_tet": [
@ -2274,18 +2274,18 @@
}, },
{ {
"angles_tet": [ "angles_tet": [
21.857, 21.902,
143.83 143.83
], ],
"angles_trig": [ "angles_trig": [
19.774, 19.492,
121.07 121.07
], ],
"ne1d": 800, "ne1d": 800,
"ne2d": 17934, "ne2d": 17934,
"ne3d": 201342, "ne3d": 201307,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 4, 13, 87, 366, 1250, 3570, 9060, 18977, 31022, 42571, 46627, 36250, 11545]", "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 4, 11, 83, 359, 1237, 3580, 9039, 19000, 30994, 42542, 46628, 36256, 11574]",
"total_badness": 244286.77424 "total_badness": 244220.94708
} }
], ],
"screw.step": [ "screw.step": [
@ -2306,7 +2306,7 @@
}, },
{ {
"angles_tet": [ "angles_tet": [
21.55, 19.077,
146.38 146.38
], ],
"angles_trig": [ "angles_trig": [
@ -2315,9 +2315,9 @@
], ],
"ne1d": 528, "ne1d": 528,
"ne2d": 2792, "ne2d": 2792,
"ne3d": 8129, "ne3d": 8126,
"quality_histogram": "[0, 0, 0, 0, 0, 1, 4, 8, 35, 96, 188, 298, 537, 817, 1057, 1323, 1446, 1284, 798, 237]", "quality_histogram": "[0, 0, 0, 0, 0, 1, 4, 11, 33, 98, 190, 299, 553, 796, 1040, 1329, 1446, 1294, 795, 237]",
"total_badness": 10753.086327 "total_badness": 10753.750681
}, },
{ {
"angles_tet": [ "angles_tet": [
@ -2330,9 +2330,9 @@
], ],
"ne1d": 666, "ne1d": 666,
"ne2d": 4922, "ne2d": 4922,
"ne3d": 31540, "ne3d": 31546,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 5, 31, 92, 290, 707, 1762, 3221, 4997, 6712, 6966, 5146, 1610]", "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 5, 29, 94, 294, 701, 1778, 3224, 4988, 6720, 6967, 5142, 1603]",
"total_badness": 38689.280913 "total_badness": 38702.936245
} }
], ],
"sculpture.geo": [ "sculpture.geo": [
@ -2430,18 +2430,18 @@
"shaft.geo": [ "shaft.geo": [
{ {
"angles_tet": [ "angles_tet": [
8.3002, 8.3078,
162.65 162.65
], ],
"angles_trig": [ "angles_trig": [
9.3888, 9.3916,
147.77 147.77
], ],
"ne1d": 708, "ne1d": 708,
"ne2d": 1722, "ne2d": 1722,
"ne3d": 2740, "ne3d": 2734,
"quality_histogram": "[0, 0, 1, 5, 8, 15, 31, 39, 87, 146, 294, 392, 329, 286, 245, 291, 247, 185, 108, 31]", "quality_histogram": "[0, 0, 2, 4, 8, 15, 30, 41, 85, 143, 291, 393, 333, 284, 246, 293, 248, 190, 101, 27]",
"total_badness": 4403.8888129 "total_badness": 4392.4206713
}, },
{ {
"angles_tet": [ "angles_tet": [
@ -2456,7 +2456,7 @@
"ne2d": 606, "ne2d": 606,
"ne3d": 791, "ne3d": 791,
"quality_histogram": "[0, 0, 0, 0, 2, 3, 4, 7, 33, 42, 54, 61, 88, 86, 118, 92, 89, 72, 29, 11]", "quality_histogram": "[0, 0, 0, 0, 2, 3, 4, 7, 33, 42, 54, 61, 88, 86, 118, 92, 89, 72, 29, 11]",
"total_badness": 1208.0636246 "total_badness": 1208.0644901
}, },
{ {
"angles_tet": [ "angles_tet": [
@ -2479,14 +2479,14 @@
162.65 162.65
], ],
"angles_trig": [ "angles_trig": [
15.525, 15.512,
147.01 147.17
], ],
"ne1d": 708, "ne1d": 708,
"ne2d": 1722, "ne2d": 1722,
"ne3d": 2713, "ne3d": 2708,
"quality_histogram": "[0, 0, 0, 1, 3, 1, 11, 22, 49, 109, 260, 408, 344, 300, 273, 303, 272, 215, 106, 36]", "quality_histogram": "[0, 0, 0, 1, 3, 1, 11, 22, 50, 108, 258, 412, 344, 299, 275, 311, 271, 203, 108, 31]",
"total_badness": 4151.3073463 "total_badness": 4149.681437
}, },
{ {
"angles_tet": [ "angles_tet": [
@ -3083,9 +3083,9 @@
], ],
"ne1d": 690, "ne1d": 690,
"ne2d": 1684, "ne2d": 1684,
"ne3d": 5177, "ne3d": 5178,
"quality_histogram": "[0, 0, 1, 0, 1, 8, 27, 37, 108, 191, 285, 369, 461, 565, 670, 690, 621, 536, 462, 145]", "quality_histogram": "[0, 0, 1, 0, 1, 8, 29, 37, 107, 193, 284, 368, 461, 566, 670, 689, 621, 536, 462, 145]",
"total_badness": 7461.1502455 "total_badness": 7465.8398023
}, },
{ {
"angles_tet": [ "angles_tet": [
@ -3098,9 +3098,9 @@
], ],
"ne1d": 390, "ne1d": 390,
"ne2d": 522, "ne2d": 522,
"ne3d": 1349, "ne3d": 1347,
"quality_histogram": "[0, 0, 4, 13, 12, 41, 78, 115, 124, 147, 169, 127, 141, 104, 86, 86, 55, 34, 11, 2]", "quality_histogram": "[0, 0, 4, 14, 14, 41, 75, 117, 125, 145, 169, 126, 140, 107, 82, 87, 54, 34, 11, 2]",
"total_badness": 2729.6156372 "total_badness": 2735.6699238
}, },
{ {
"angles_tet": [ "angles_tet": [
@ -3113,9 +3113,9 @@
], ],
"ne1d": 512, "ne1d": 512,
"ne2d": 874, "ne2d": 874,
"ne3d": 2381, "ne3d": 2395,
"quality_histogram": "[0, 0, 0, 3, 9, 13, 41, 68, 124, 140, 196, 214, 302, 390, 345, 237, 128, 98, 47, 26]", "quality_histogram": "[0, 0, 0, 3, 9, 13, 42, 68, 129, 146, 191, 209, 315, 390, 343, 236, 134, 94, 49, 24]",
"total_badness": 3927.0434195 "total_badness": 3955.4970644
}, },
{ {
"angles_tet": [ "angles_tet": [
@ -3130,7 +3130,7 @@
"ne2d": 1684, "ne2d": 1684,
"ne3d": 5095, "ne3d": 5095,
"quality_histogram": "[0, 0, 1, 0, 0, 4, 19, 34, 101, 181, 263, 354, 439, 548, 689, 696, 611, 547, 467, 141]", "quality_histogram": "[0, 0, 1, 0, 0, 4, 19, 34, 101, 181, 263, 354, 439, 548, 689, 696, 611, 547, 467, 141]",
"total_badness": 7282.7477612 "total_badness": 7282.7477811
}, },
{ {
"angles_tet": [ "angles_tet": [
@ -3143,9 +3143,9 @@
], ],
"ne1d": 1050, "ne1d": 1050,
"ne2d": 3812, "ne2d": 3812,
"ne3d": 18003, "ne3d": 18028,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 3, 15, 34, 61, 181, 573, 1428, 2189, 2298, 2700, 2707, 2735, 2389, 690]", "quality_histogram": "[0, 0, 0, 0, 0, 0, 3, 15, 34, 62, 183, 573, 1437, 2190, 2345, 2680, 2713, 2701, 2419, 673]",
"total_badness": 23471.146878 "total_badness": 23515.317943
}, },
{ {
"angles_tet": [ "angles_tet": [
@ -3158,9 +3158,9 @@
], ],
"ne1d": 1722, "ne1d": 1722,
"ne2d": 10042, "ne2d": 10042,
"ne3d": 84812, "ne3d": 84906,
"quality_histogram": "[0, 0, 0, 0, 0, 2, 49, 1423, 720, 374, 704, 1174, 2454, 5477, 8890, 13211, 16429, 16935, 12870, 4100]", "quality_histogram": "[0, 0, 0, 0, 0, 2, 49, 1422, 720, 370, 704, 1186, 2437, 5535, 8984, 13266, 16409, 16882, 12872, 4068]",
"total_badness": 108503.84867 "total_badness": 108652.77514
} }
], ],
"twobricks.geo": [ "twobricks.geo": [