diff --git a/libsrc/csg/csgeom.cpp b/libsrc/csg/csgeom.cpp index 9a12443e..f8145009 100644 --- a/libsrc/csg/csgeom.cpp +++ b/libsrc/csg/csgeom.cpp @@ -79,6 +79,12 @@ namespace netgen p = hp; } + bool CSGeometry :: ProjectPointGI(int surfind, Point<3> & p, PointGeomInfo & gi) const + { + GetSurface(surfind)->Project (p); + return true; + } + void CSGeometry :: ProjectPointEdge(int surfind, INDEX surfind2, Point<3> & p) const { diff --git a/libsrc/csg/csgeom.hpp b/libsrc/csg/csgeom.hpp index 398c21bc..07844c91 100644 --- a/libsrc/csg/csgeom.hpp +++ b/libsrc/csg/csgeom.hpp @@ -189,6 +189,7 @@ namespace netgen virtual void SaveToMeshFile (ostream & ost) const override; void ProjectPoint(INDEX surfind, Point<3> & p) const override; + bool ProjectPointGI (int surfind, Point<3> & p, PointGeomInfo & gi) const override; void ProjectPointEdge(INDEX surfind, INDEX surfind2, Point<3> & p) const override; Vec<3> GetNormal(int surfind, const Point<3> & p) const override; void PointBetween(const Point<3> & p1, const Point<3> & p2, diff --git a/libsrc/geom2d/geometry2d.hpp b/libsrc/geom2d/geometry2d.hpp index 13c1887b..7dfcbe9f 100644 --- a/libsrc/geom2d/geometry2d.hpp +++ b/libsrc/geom2d/geometry2d.hpp @@ -156,6 +156,12 @@ namespace netgen ar & materials & maxh & quadmeshing & tensormeshing & layer & bcnames & elto0; } + bool ProjectPointGI (int surfind, Point<3> & p, PointGeomInfo & gi) const override + { + p(2) = 0.0; + return true; + } + void PointBetween(const Point<3> & p1, const Point<3> & p2, double secpoint, int surfi, const PointGeomInfo & gi1, diff --git a/libsrc/meshing/basegeom.hpp b/libsrc/meshing/basegeom.hpp index 221e875b..f001f9fa 100644 --- a/libsrc/meshing/basegeom.hpp +++ b/libsrc/meshing/basegeom.hpp @@ -51,9 +51,9 @@ namespace netgen virtual bool CalcPointGeomInfo(int surfind, PointGeomInfo& gi, const Point<3> & p3) const {return false;} virtual bool ProjectPointGI (int surfind, Point<3> & p, PointGeomInfo & gi) const { - ProjectPoint(surfind, p); - return CalcPointGeomInfo(surfind, gi, p); + throw Exception("ProjectPointGI not overloaded in class" + Demangle(typeid(*this).name())); } + virtual Vec<3> GetNormal(int surfind, const Point<3> & p) const { return {0.,0.,1.}; } virtual Vec<3> GetNormal(int surfind, const Point<3> & p, const PointGeomInfo & gi) const diff --git a/libsrc/meshing/smoothing2.cpp b/libsrc/meshing/smoothing2.cpp index a3ebd88c..b4d5ab9a 100644 --- a/libsrc/meshing/smoothing2.cpp +++ b/libsrc/meshing/smoothing2.cpp @@ -969,7 +969,7 @@ namespace netgen // NgProfiler::StopTimer (timer2); - Point3d origp = mesh[pi]; + auto origp = mesh[pi]; int loci = 1; double fact = 1; int moveisok = 0; @@ -1021,7 +1021,7 @@ namespace netgen } else { - mesh[pi] = Point<3> (origp); + mesh[pi] = origp; } } diff --git a/libsrc/occ/python_occ.cpp b/libsrc/occ/python_occ.cpp index d3a38c15..e5f458cb 100644 --- a/libsrc/occ/python_occ.cpp +++ b/libsrc/occ/python_occ.cpp @@ -185,8 +185,8 @@ DLL_HEADER void ExportNgOCC(py::module &m) } geo->SetOCCParameters(occparam); auto mesh = make_shared(); - geo->GenerateMesh(mesh, mp); mesh->SetGeometry(geo); + geo->GenerateMesh(mesh, mp); SetGlobalMesh(mesh); ng_geometry = geo; return mesh; diff --git a/tests/pytest/results.json b/tests/pytest/results.json index 10f15113..4e8fb437 100644 --- a/tests/pytest/results.json +++ b/tests/pytest/results.json @@ -3,9 +3,9 @@ { "ne1d": 74, "ne2d": 54, - "ne3d": 39, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 6, 14, 0, 8, 1, 0, 0, 1]", - "total_badness": 58.504327315 + "ne3d": 40, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 7, 16, 1, 5, 2, 0, 0, 0]", + "total_badness": 61.085020204 }, { "ne1d": 59, @@ -24,155 +24,155 @@ { "ne1d": 74, "ne2d": 54, - "ne3d": 39, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 6, 14, 0, 8, 1, 0, 0, 1]", - "total_badness": 58.504327315 + "ne3d": 40, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 7, 16, 1, 5, 2, 0, 0, 0]", + "total_badness": 61.085020204 }, { "ne1d": 118, - "ne2d": 128, - "ne3d": 146, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 4, 6, 11, 15, 19, 23, 29, 14, 9, 3, 10, 2]", - "total_badness": 221.53127331 + "ne2d": 140, + "ne3d": 165, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 9, 13, 23, 20, 31, 25, 21, 14, 6, 1]", + "total_badness": 233.73328932 }, { "ne1d": 181, - "ne2d": 295, - "ne3d": 478, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 1, 4, 6, 20, 38, 41, 79, 96, 81, 59, 46, 7]", - "total_badness": 634.07879728 + "ne2d": 325, + "ne3d": 528, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 6, 19, 38, 53, 74, 80, 99, 85, 63, 9]", + "total_badness": 687.31675405 } ], "boxcyl.geo": [ { "ne1d": 190, - "ne2d": 452, - "ne3d": 838, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 3, 4, 24, 113, 90, 93, 118, 93, 82, 89, 68, 47, 13]", - "total_badness": 1250.6676912 + "ne2d": 468, + "ne3d": 846, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 3, 31, 93, 78, 103, 80, 92, 103, 102, 84, 56, 21]", + "total_badness": 1229.0231928 }, { "ne1d": 94, "ne2d": 114, - "ne3d": 156, - "quality_histogram": "[0, 0, 0, 0, 0, 2, 6, 9, 10, 8, 12, 9, 13, 7, 20, 15, 15, 22, 5, 3]", - "total_badness": 257.95680767 + "ne3d": 157, + "quality_histogram": "[0, 0, 0, 0, 0, 1, 3, 8, 13, 13, 15, 7, 12, 11, 19, 14, 12, 21, 5, 3]", + "total_badness": 260.17372209 }, { "ne1d": 136, - "ne2d": 218, - "ne3d": 378, - "quality_histogram": "[0, 0, 0, 1, 1, 1, 1, 3, 14, 20, 20, 34, 45, 51, 41, 52, 56, 18, 19, 1]", - "total_badness": 576.7536717 + "ne2d": 222, + "ne3d": 386, + "quality_histogram": "[0, 0, 0, 1, 2, 3, 2, 7, 8, 15, 16, 36, 36, 59, 53, 55, 58, 19, 15, 1]", + "total_badness": 590.51625062 }, { "ne1d": 190, - "ne2d": 452, - "ne3d": 826, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 2, 1, 21, 112, 89, 94, 110, 88, 87, 79, 79, 50, 13]", - "total_badness": 1223.565534 + "ne2d": 468, + "ne3d": 833, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 1, 32, 89, 78, 83, 86, 83, 106, 103, 89, 62, 21]", + "total_badness": 1200.9010008 }, { "ne1d": 284, - "ne2d": 912, - "ne3d": 3696, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 6, 10, 20, 64, 152, 268, 438, 622, 744, 728, 497, 147]", - "total_badness": 4653.1667633 + "ne2d": 938, + "ne3d": 3742, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 25, 55, 131, 247, 484, 640, 754, 710, 529, 161]", + "total_badness": 4685.7832014 }, { "ne1d": 456, - "ne2d": 2450, - "ne3d": 18381, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 6, 19, 64, 164, 415, 920, 1808, 2907, 3777, 4130, 3152, 1018]", - "total_badness": 22479.104821 + "ne2d": 2496, + "ne3d": 18713, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 1, 10, 39, 127, 338, 795, 1684, 2888, 4053, 4409, 3223, 1146]", + "total_badness": 22695.778021 } ], "circle_on_cube.geo": [ { "ne1d": 94, - "ne2d": 152, - "ne3d": 608, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 2, 2, 8, 27, 31, 47, 60, 88, 114, 93, 70, 55, 11]", - "total_badness": 828.41267216 + "ne2d": 170, + "ne3d": 637, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 0, 4, 5, 18, 38, 54, 74, 84, 109, 110, 73, 55, 12]", + "total_badness": 863.74076861 }, { "ne1d": 40, "ne2d": 38, - "ne3d": 53, - "quality_histogram": "[0, 0, 0, 0, 1, 3, 1, 4, 6, 12, 4, 9, 2, 2, 4, 3, 0, 2, 0, 0]", - "total_badness": 109.70868385 + "ne3d": 46, + "quality_histogram": "[0, 0, 0, 0, 0, 2, 2, 4, 8, 8, 6, 7, 5, 1, 2, 1, 0, 0, 0, 0]", + "total_badness": 97.323158335 }, { "ne1d": 62, - "ne2d": 86, - "ne3d": 182, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 3, 8, 9, 17, 19, 28, 35, 22, 22, 11, 5, 3]", - "total_badness": 266.64934593 + "ne2d": 96, + "ne3d": 196, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 2, 6, 8, 8, 27, 34, 42, 33, 20, 9, 6, 1]", + "total_badness": 282.75693303 }, { "ne1d": 94, - "ne2d": 152, - "ne3d": 593, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 15, 27, 33, 50, 84, 110, 102, 84, 64, 14]", - "total_badness": 786.32868296 + "ne2d": 170, + "ne3d": 622, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 12, 26, 39, 80, 70, 113, 112, 93, 62, 10]", + "total_badness": 821.68699443 }, { "ne1d": 138, - "ne2d": 370, - "ne3d": 1891, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 9, 27, 75, 163, 236, 317, 385, 323, 276, 78]", - "total_badness": 2378.4348462 + "ne2d": 384, + "ne3d": 2028, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 9, 28, 67, 157, 250, 347, 419, 398, 261, 88]", + "total_badness": 2540.7133216 }, { "ne1d": 224, - "ne2d": 900, - "ne3d": 11870, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 7, 17, 44, 128, 272, 627, 1206, 1832, 2541, 2570, 2011, 615]", - "total_badness": 14569.250591 + "ne2d": 944, + "ne3d": 11860, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 4, 8, 29, 85, 211, 518, 1135, 1851, 2527, 2686, 2118, 688]", + "total_badness": 14411.259826 } ], "cone.geo": [ { "ne1d": 64, - "ne2d": 716, - "ne3d": 1192, - "quality_histogram": "[0, 0, 0, 0, 1, 2, 13, 27, 54, 76, 88, 145, 123, 139, 140, 131, 123, 80, 40, 10]", - "total_badness": 1887.2343616 + "ne2d": 722, + "ne3d": 1263, + "quality_histogram": "[0, 0, 0, 0, 0, 3, 4, 14, 48, 62, 95, 129, 141, 162, 163, 145, 107, 112, 61, 17]", + "total_badness": 1927.4650748 }, { "ne1d": 32, "ne2d": 220, - "ne3d": 737, - "quality_histogram": "[0, 0, 16, 46, 43, 51, 72, 61, 53, 51, 52, 46, 68, 44, 31, 27, 41, 18, 13, 4]", - "total_badness": 1894.7838255 + "ne3d": 700, + "quality_histogram": "[0, 0, 13, 49, 51, 51, 51, 46, 63, 42, 38, 49, 53, 50, 42, 33, 27, 21, 18, 3]", + "total_badness": 1807.5903418 }, { "ne1d": 48, - "ne2d": 418, - "ne3d": 673, - "quality_histogram": "[0, 3, 23, 17, 19, 16, 38, 41, 64, 86, 77, 66, 50, 49, 40, 29, 23, 25, 6, 1]", - "total_badness": 1591.8445773 + "ne2d": 428, + "ne3d": 930, + "quality_histogram": "[6, 33, 75, 70, 53, 52, 44, 63, 73, 77, 65, 88, 62, 37, 46, 30, 20, 21, 15, 0]", + "total_badness": 3263.5820874 }, { "ne1d": 64, - "ne2d": 716, - "ne3d": 1169, - "quality_histogram": "[0, 0, 0, 0, 1, 0, 10, 22, 34, 57, 80, 108, 139, 147, 154, 144, 115, 88, 57, 13]", - "total_badness": 1787.8610181 + "ne2d": 722, + "ne3d": 1244, + "quality_histogram": "[0, 0, 0, 0, 0, 1, 2, 10, 25, 61, 77, 117, 140, 158, 172, 138, 144, 118, 66, 15]", + "total_badness": 1843.7405821 }, { "ne1d": 96, - "ne2d": 1654, - "ne3d": 4374, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 2, 9, 44, 77, 192, 302, 495, 598, 729, 718, 662, 425, 121]", - "total_badness": 5789.8784966 + "ne2d": 1660, + "ne3d": 4395, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 2, 14, 39, 86, 147, 270, 427, 584, 724, 725, 723, 492, 162]", + "total_badness": 5745.9242938 }, { "ne1d": 160, - "ne2d": 4722, - "ne3d": 27153, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 10, 50, 134, 382, 841, 1698, 2942, 4533, 5543, 5629, 4130, 1260]", - "total_badness": 33712.712047 + "ne2d": 4748, + "ne3d": 27365, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 8, 35, 121, 352, 715, 1535, 2882, 4456, 5703, 5878, 4303, 1377]", + "total_badness": 33766.111622 } ], "cube.geo": [ @@ -213,54 +213,54 @@ }, { "ne1d": 72, - "ne2d": 108, - "ne3d": 171, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 6, 11, 14, 16, 27, 28, 27, 24, 11, 3]", - "total_badness": 233.61347097 + "ne2d": 116, + "ne3d": 167, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 4, 2, 5, 5, 16, 8, 18, 30, 31, 29, 11, 7]", + "total_badness": 224.7322738 } ], "cubeandring.geo": [ { "ne1d": 262, - "ne2d": 690, - "ne3d": 2140, - "quality_histogram": "[3, 12, 19, 38, 56, 105, 96, 77, 120, 76, 100, 117, 154, 202, 231, 248, 218, 143, 97, 28]", - "total_badness": 4299.394376 + "ne2d": 726, + "ne3d": 2225, + "quality_histogram": "[0, 10, 19, 36, 98, 105, 126, 110, 98, 59, 71, 87, 153, 186, 272, 275, 223, 160, 109, 28]", + "total_badness": 4466.5881396 }, { "ne1d": 134, - "ne2d": 156, - "ne3d": 249, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 2, 4, 5, 14, 24, 38, 39, 36, 35, 25, 19, 6, 1]", - "total_badness": 369.67745906 + "ne2d": 164, + "ne3d": 250, + "quality_histogram": "[0, 0, 0, 0, 0, 1, 0, 4, 4, 6, 13, 24, 28, 43, 40, 34, 25, 19, 7, 2]", + "total_badness": 372.39445714 }, { "ne1d": 190, - "ne2d": 278, - "ne3d": 574, - "quality_histogram": "[0, 0, 0, 1, 1, 0, 0, 6, 6, 32, 46, 56, 64, 94, 90, 65, 56, 34, 20, 3]", - "total_badness": 874.96542794 + "ne2d": 300, + "ne3d": 646, + "quality_histogram": "[0, 0, 0, 1, 2, 0, 0, 2, 10, 27, 58, 69, 66, 107, 87, 91, 60, 44, 20, 2]", + "total_badness": 978.54289744 }, { "ne1d": 262, - "ne2d": 690, - "ne3d": 1978, - "quality_histogram": "[0, 0, 8, 21, 34, 88, 102, 58, 96, 50, 73, 83, 123, 183, 205, 261, 260, 178, 122, 33]", - "total_badness": 3497.4685292 + "ne2d": 726, + "ne3d": 2087, + "quality_histogram": "[0, 2, 12, 18, 54, 90, 113, 95, 88, 55, 41, 59, 111, 196, 254, 299, 260, 193, 114, 33]", + "total_badness": 3774.9667473 }, { "ne1d": 378, - "ne2d": 1346, - "ne3d": 7382, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 9, 22, 42, 97, 190, 367, 566, 900, 1275, 1377, 1321, 979, 237]", - "total_badness": 9468.2810231 + "ne2d": 1412, + "ne3d": 7741, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 11, 17, 64, 139, 294, 516, 862, 1328, 1545, 1486, 1147, 331]", + "total_badness": 9711.521562 }, { "ne1d": 624, - "ne2d": 3810, - "ne3d": 37770, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 6, 20, 70, 145, 415, 941, 1986, 3872, 6127, 7881, 8209, 6217, 1880]", - "total_badness": 46477.07805 + "ne2d": 3944, + "ne3d": 38347, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 2, 18, 40, 131, 351, 853, 2070, 3906, 6037, 7925, 8484, 6438, 2092]", + "total_badness": 47000.212862 } ], "cubeandspheres.geo": [ @@ -268,353 +268,353 @@ "ne1d": 144, "ne2d": 148, "ne3d": 98, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 3, 6, 3, 14, 14, 14, 18, 14, 6, 6, 0, 0]", - "total_badness": 149.18816997 + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 3, 6, 3, 4, 18, 19, 13, 20, 2, 9, 1, 0]", + "total_badness": 145.83375079 + }, + { + "ne1d": 144, + "ne2d": 150, + "ne3d": 100, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 7, 10, 16, 18, 15, 17, 6, 5, 4, 0]", + "total_badness": 146.6468601 }, { "ne1d": 144, "ne2d": 148, "ne3d": 98, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 11, 11, 17, 13, 16, 18, 3, 6, 0, 0]", - "total_badness": 148.56830588 + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 6, 6, 19, 21, 12, 18, 5, 4, 4, 0]", + "total_badness": 145.14580879 }, { "ne1d": 144, "ne2d": 148, "ne3d": 98, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 8, 12, 14, 22, 10, 18, 4, 6, 0, 0]", - "total_badness": 148.71179128 - }, - { - "ne1d": 144, - "ne2d": 148, - "ne3d": 98, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 3, 6, 3, 14, 14, 14, 18, 14, 6, 6, 0, 0]", - "total_badness": 149.18816997 + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 3, 6, 3, 4, 18, 19, 13, 20, 2, 9, 1, 0]", + "total_badness": 145.83375079 }, { "ne1d": 264, - "ne2d": 352, - "ne3d": 322, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 3, 15, 33, 40, 34, 47, 42, 23, 32, 29, 18, 5, 1]", - "total_badness": 519.67445044 + "ne2d": 390, + "ne3d": 369, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 4, 5, 19, 26, 42, 46, 49, 41, 53, 45, 27, 10, 2]", + "total_badness": 554.2809713 }, { "ne1d": 428, - "ne2d": 902, - "ne3d": 1050, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 21, 55, 53, 60, 106, 140, 125, 89, 115, 114, 79, 49, 37, 7]", - "total_badness": 1742.9580036 + "ne2d": 926, + "ne3d": 1074, + "quality_histogram": "[0, 0, 0, 0, 0, 1, 2, 23, 50, 36, 109, 137, 96, 117, 160, 162, 67, 60, 32, 22]", + "total_badness": 1675.8711911 } ], "cubemcyl.geo": [ { "ne1d": 142, - "ne2d": 2446, - "ne3d": 20376, - "quality_histogram": "[0, 0, 0, 0, 0, 4, 30, 124, 254, 467, 838, 1358, 1902, 2621, 2988, 3092, 2912, 2176, 1289, 321]", - "total_badness": 28732.001319 + "ne2d": 2488, + "ne3d": 20783, + "quality_histogram": "[0, 0, 0, 0, 0, 2, 26, 94, 208, 408, 708, 1158, 1848, 2485, 3200, 3251, 3127, 2474, 1418, 376]", + "total_badness": 28813.276387 }, { "ne1d": 64, - "ne2d": 610, - "ne3d": 3095, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 9, 21, 39, 75, 144, 238, 340, 436, 489, 491, 378, 261, 140, 34]", - "total_badness": 4458.1067866 + "ne2d": 642, + "ne3d": 3214, + "quality_histogram": "[0, 0, 0, 0, 0, 2, 7, 13, 34, 74, 140, 230, 351, 455, 533, 531, 378, 284, 151, 31]", + "total_badness": 4592.7629352 }, { "ne1d": 102, - "ne2d": 1370, - "ne3d": 7955, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 2, 11, 63, 157, 297, 497, 895, 1095, 1296, 1215, 1069, 758, 452, 148]", - "total_badness": 11150.474701 + "ne2d": 1402, + "ne3d": 8234, + "quality_histogram": "[0, 0, 0, 0, 0, 2, 12, 30, 67, 143, 309, 586, 856, 1050, 1271, 1291, 1179, 825, 462, 151]", + "total_badness": 11552.618825 }, { "ne1d": 142, - "ne2d": 2446, - "ne3d": 18903, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 9, 52, 134, 343, 650, 1168, 2032, 2738, 3338, 3304, 2846, 1788, 501]", - "total_badness": 24879.568157 + "ne2d": 2488, + "ne3d": 19499, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 5, 27, 106, 226, 529, 1209, 2008, 2862, 3440, 3576, 3083, 1921, 507]", + "total_badness": 25390.546576 }, { "ne1d": 210, - "ne2d": 5438, - "ne3d": 88766, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 6, 29, 124, 395, 1107, 2534, 5743, 9904, 14438, 18388, 18815, 13214, 4069]", - "total_badness": 110093.18284 + "ne2d": 5508, + "ne3d": 88767, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 2, 26, 120, 352, 982, 2386, 5436, 9851, 14528, 18286, 19003, 13703, 4092]", + "total_badness": 109764.47526 }, { "ne1d": 362, - "ne2d": 14996, - "ne3d": 526308, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 2, 18, 83, 344, 1098, 3118, 9070, 23211, 48496, 81254, 110846, 122403, 95673, 30692]", - "total_badness": 638104.66873 + "ne2d": 15122, + "ne3d": 524413, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 3, 23, 86, 347, 1131, 3167, 9094, 23844, 49271, 81498, 111440, 122044, 93488, 28977]", + "total_badness": 636787.56071 } ], "cubemsphere.geo": [ { "ne1d": 90, - "ne2d": 658, - "ne3d": 4711, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 10, 27, 50, 94, 180, 303, 459, 591, 709, 689, 658, 536, 328, 77]", - "total_badness": 6607.5525427 + "ne2d": 702, + "ne3d": 4867, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 5, 17, 43, 80, 172, 274, 422, 600, 765, 725, 748, 588, 317, 111]", + "total_badness": 6717.4363413 }, { "ne1d": 44, - "ne2d": 230, - "ne3d": 615, - "quality_histogram": "[0, 0, 0, 0, 2, 3, 14, 27, 47, 71, 83, 96, 66, 62, 49, 38, 29, 11, 14, 3]", - "total_badness": 1101.3768112 + "ne2d": 274, + "ne3d": 768, + "quality_histogram": "[0, 0, 0, 0, 1, 5, 9, 11, 26, 62, 72, 78, 114, 95, 91, 78, 74, 24, 22, 6]", + "total_badness": 1237.8358347 }, { "ne1d": 68, - "ne2d": 382, - "ne3d": 1582, - "quality_histogram": "[0, 0, 0, 1, 0, 0, 1, 8, 21, 35, 80, 112, 189, 245, 243, 240, 193, 125, 74, 15]", - "total_badness": 2282.2332329 + "ne2d": 402, + "ne3d": 1600, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 1, 4, 26, 61, 119, 170, 232, 277, 269, 214, 148, 71, 7]", + "total_badness": 2248.6479915 }, { "ne1d": 90, - "ne2d": 658, - "ne3d": 4427, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 2, 3, 12, 34, 88, 172, 319, 479, 662, 739, 759, 614, 420, 124]", - "total_badness": 5868.6109754 + "ne2d": 702, + "ne3d": 4618, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 2, 4, 24, 53, 140, 293, 465, 706, 805, 841, 747, 418, 120]", + "total_badness": 6022.3952178 }, { "ne1d": 146, - "ne2d": 1400, - "ne3d": 17593, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 11, 29, 113, 227, 554, 1165, 1970, 2907, 3573, 3694, 2609, 740]", - "total_badness": 21904.812218 + "ne2d": 1492, + "ne3d": 17800, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 1, 7, 23, 89, 208, 524, 1085, 1942, 2969, 3729, 3811, 2675, 736]", + "total_badness": 22074.204803 }, { "ne1d": 248, - "ne2d": 4228, - "ne3d": 113220, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 13, 44, 146, 376, 952, 2444, 5872, 11431, 17868, 23828, 25460, 19207, 5578]", - "total_badness": 138667.4834 + "ne2d": 4354, + "ne3d": 113716, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 5, 12, 43, 136, 381, 909, 2353, 5720, 11280, 18112, 23886, 25957, 19090, 5832]", + "total_badness": 139103.15382 } ], "cylinder.geo": [ { "ne1d": 52, "ne2d": 288, - "ne3d": 373, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 6, 17, 48, 41, 57, 46, 46, 40, 40, 21, 10, 1]", - "total_badness": 570.55070099 + "ne3d": 410, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 0, 2, 8, 14, 31, 47, 57, 67, 64, 53, 44, 13, 9]", + "total_badness": 577.74781759 }, { "ne1d": 24, "ne2d": 66, - "ne3d": 113, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 5, 11, 14, 21, 20, 26, 5, 7]", - "total_badness": 144.11768709 + "ne3d": 124, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 7, 9, 12, 16, 23, 39, 12, 5]", + "total_badness": 153.9684245 }, { "ne1d": 36, "ne2d": 152, - "ne3d": 350, - "quality_histogram": "[7, 11, 19, 25, 33, 33, 23, 20, 37, 19, 9, 14, 28, 12, 12, 4, 32, 4, 6, 2]", - "total_badness": 1478.5840853 + "ne3d": 376, + "quality_histogram": "[0, 0, 0, 8, 18, 19, 17, 43, 35, 17, 29, 16, 18, 42, 20, 21, 38, 16, 12, 7]", + "total_badness": 793.09247202 }, { "ne1d": 52, "ne2d": 288, - "ne3d": 373, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 6, 17, 48, 40, 56, 45, 48, 40, 40, 22, 10, 1]", - "total_badness": 570.48747936 + "ne3d": 404, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 0, 2, 4, 15, 25, 38, 68, 66, 55, 55, 52, 15, 8]", + "total_badness": 562.71987918 }, { "ne1d": 76, "ne2d": 636, - "ne3d": 1137, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 1, 7, 27, 48, 71, 98, 132, 182, 156, 180, 136, 79, 19]", - "total_badness": 1578.5996937 + "ne3d": 1146, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 3, 12, 34, 57, 101, 121, 179, 190, 199, 137, 96, 17]", + "total_badness": 1547.7672308 }, { "ne1d": 124, - "ne2d": 1668, - "ne3d": 8144, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 1, 6, 20, 64, 189, 420, 858, 1386, 1685, 1693, 1360, 461]", - "total_badness": 9978.9003582 + "ne2d": 1672, + "ne3d": 8039, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 16, 52, 160, 405, 772, 1246, 1710, 1808, 1421, 444]", + "total_badness": 9788.5339464 } ], "cylsphere.geo": [ { "ne1d": 104, "ne2d": 496, - "ne3d": 769, - "quality_histogram": "[0, 0, 0, 0, 1, 1, 8, 10, 20, 31, 64, 104, 111, 105, 113, 63, 69, 47, 18, 4]", - "total_badness": 1205.3563502 + "ne3d": 711, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 4, 9, 15, 36, 63, 90, 107, 103, 99, 56, 60, 50, 17, 2]", + "total_badness": 1105.8880942 }, { "ne1d": 48, - "ne2d": 136, - "ne3d": 211, - "quality_histogram": "[0, 0, 1, 11, 19, 15, 23, 13, 14, 8, 12, 6, 9, 17, 11, 8, 12, 26, 6, 0]", - "total_badness": 508.6341945 + "ne2d": 142, + "ne3d": 242, + "quality_histogram": "[0, 0, 0, 16, 20, 29, 22, 22, 6, 8, 6, 14, 5, 13, 14, 25, 18, 13, 11, 0]", + "total_badness": 604.89450225 }, { "ne1d": 104, "ne2d": 496, - "ne3d": 763, - "quality_histogram": "[0, 0, 0, 0, 1, 1, 6, 8, 15, 24, 53, 92, 109, 105, 114, 87, 71, 48, 28, 1]", - "total_badness": 1166.824818 + "ne3d": 709, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 4, 5, 15, 29, 63, 86, 110, 109, 89, 69, 66, 45, 15, 4]", + "total_badness": 1092.3394563 }, { "ne1d": 152, - "ne2d": 1082, - "ne3d": 2764, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 3, 6, 17, 47, 113, 184, 268, 318, 434, 511, 462, 305, 96]", - "total_badness": 3608.4305823 + "ne2d": 1084, + "ne3d": 2798, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 5, 19, 44, 91, 162, 267, 345, 422, 507, 505, 322, 108]", + "total_badness": 3620.8176099 }, { "ne1d": 248, - "ne2d": 2798, - "ne3d": 17399, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 51, 181, 398, 941, 1798, 2813, 3642, 3802, 2815, 930]", - "total_badness": 21362.004145 + "ne2d": 2820, + "ne3d": 17745, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 2, 2, 20, 57, 142, 331, 880, 1771, 2788, 3668, 3998, 3037, 1049]", + "total_badness": 21647.214644 } ], "ellipsoid.geo": [ { "ne1d": 0, - "ne2d": 686, - "ne3d": 1267, - "quality_histogram": "[0, 0, 0, 0, 1, 3, 9, 22, 59, 98, 116, 117, 161, 168, 150, 127, 117, 65, 41, 13]", - "total_badness": 2020.1005544 + "ne2d": 704, + "ne3d": 1297, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 7, 14, 42, 76, 119, 157, 154, 160, 158, 142, 111, 89, 54, 14]", + "total_badness": 2009.8527353 }, { "ne1d": 0, - "ne2d": 182, - "ne3d": 847, - "quality_histogram": "[16, 151, 142, 110, 54, 76, 47, 43, 37, 39, 25, 31, 26, 15, 11, 10, 4, 6, 1, 3]", - "total_badness": 5395.4074386 + "ne2d": 192, + "ne3d": 915, + "quality_histogram": "[24, 146, 135, 112, 105, 65, 62, 41, 46, 43, 32, 26, 19, 24, 15, 10, 6, 1, 3, 0]", + "total_badness": 5760.7267346 }, { "ne1d": 0, - "ne2d": 384, - "ne3d": 581, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 8, 17, 29, 58, 73, 91, 80, 78, 65, 33, 27, 19, 2]", - "total_badness": 912.08491356 + "ne2d": 394, + "ne3d": 592, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 5, 9, 21, 38, 80, 86, 90, 99, 53, 48, 29, 22, 12]", + "total_badness": 893.18441542 }, { "ne1d": 0, - "ne2d": 686, - "ne3d": 1249, - "quality_histogram": "[0, 0, 0, 0, 0, 1, 7, 14, 45, 79, 96, 114, 162, 158, 141, 155, 123, 88, 52, 14]", - "total_badness": 1922.5886374 + "ne2d": 704, + "ne3d": 1282, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 2, 10, 33, 59, 108, 136, 158, 156, 163, 153, 115, 97, 69, 23]", + "total_badness": 1929.3894181 }, { "ne1d": 0, - "ne2d": 1598, - "ne3d": 5214, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 2, 16, 32, 97, 186, 312, 520, 658, 859, 914, 857, 604, 157]", - "total_badness": 6803.6112693 + "ne2d": 1618, + "ne3d": 5569, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 4, 23, 73, 130, 303, 511, 700, 922, 1025, 989, 693, 195]", + "total_badness": 7142.2540344 }, { "ne1d": 0, - "ne2d": 4194, - "ne3d": 37370, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 3, 8, 19, 44, 111, 311, 846, 1867, 3637, 5870, 7895, 8585, 6262, 1912]", - "total_badness": 45726.525344 + "ne2d": 4236, + "ne3d": 37387, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 3, 17, 75, 239, 644, 1587, 3545, 5826, 7874, 8638, 6846, 2092]", + "total_badness": 45341.992565 } ], "ellipticcone.geo": [ { "ne1d": 174, - "ne2d": 1528, - "ne3d": 5118, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 3, 16, 33, 75, 139, 240, 434, 619, 759, 884, 814, 643, 366, 93]", - "total_badness": 6977.8809322 + "ne2d": 1562, + "ne3d": 5180, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 3, 18, 65, 115, 211, 361, 589, 766, 881, 904, 732, 405, 130]", + "total_badness": 6920.4601657 }, { "ne1d": 86, - "ne2d": 374, + "ne2d": 380, "ne3d": 585, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 2, 9, 13, 24, 46, 63, 60, 85, 82, 78, 61, 38, 19, 5]", - "total_badness": 887.43996754 + "quality_histogram": "[0, 0, 0, 0, 0, 1, 1, 5, 13, 17, 32, 57, 64, 73, 84, 89, 68, 47, 22, 12]", + "total_badness": 860.61770269 }, { "ne1d": 130, - "ne2d": 846, - "ne3d": 1680, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 3, 18, 28, 47, 86, 139, 185, 232, 222, 255, 201, 164, 77, 23]", - "total_badness": 2436.7946247 + "ne2d": 864, + "ne3d": 1734, + "quality_histogram": "[0, 0, 0, 0, 0, 7, 9, 28, 37, 57, 85, 135, 132, 216, 225, 256, 238, 177, 100, 32]", + "total_badness": 2535.8367438 }, { "ne1d": 174, - "ne2d": 1528, - "ne3d": 4853, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 9, 32, 61, 129, 296, 505, 739, 906, 892, 704, 453, 126]", - "total_badness": 6344.0542598 + "ne2d": 1562, + "ne3d": 4943, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 4, 15, 49, 116, 255, 456, 635, 917, 1005, 806, 517, 167]", + "total_badness": 6347.4280983 }, { "ne1d": 258, - "ne2d": 3378, - "ne3d": 13096, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 12, 37, 100, 226, 405, 741, 1138, 1694, 2154, 2382, 2242, 1503, 461]", - "total_badness": 16999.928783 + "ne2d": 3468, + "ne3d": 13314, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 4, 33, 103, 197, 351, 652, 1077, 1619, 2280, 2518, 2361, 1583, 535]", + "total_badness": 17113.967555 }, { "ne1d": 432, - "ne2d": 9384, - "ne3d": 69399, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 2, 10, 40, 159, 347, 879, 2068, 4096, 7587, 11297, 14016, 14721, 10764, 3413]", - "total_badness": 86005.445455 + "ne2d": 9544, + "ne3d": 69891, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 9, 37, 119, 313, 839, 1927, 4086, 7715, 11454, 14338, 14977, 10816, 3260]", + "total_badness": 86472.194086 } ], "ellipticcyl.geo": [ { "ne1d": 156, - "ne2d": 978, - "ne3d": 2173, - "quality_histogram": "[0, 0, 0, 0, 1, 2, 6, 21, 39, 80, 120, 163, 228, 297, 314, 272, 277, 200, 116, 37]", - "total_badness": 3176.0734083 + "ne2d": 996, + "ne3d": 2299, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 12, 15, 55, 86, 117, 235, 272, 372, 360, 358, 240, 144, 33]", + "total_badness": 3202.1380209 }, { "ne1d": 76, - "ne2d": 234, - "ne3d": 318, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 1, 4, 16, 23, 26, 47, 60, 57, 36, 31, 15, 2]", - "total_badness": 445.78992995 + "ne2d": 238, + "ne3d": 325, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 1, 5, 18, 28, 26, 38, 68, 55, 45, 28, 11, 2]", + "total_badness": 459.61476239 }, { "ne1d": 116, - "ne2d": 590, - "ne3d": 1110, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 2, 9, 20, 40, 76, 108, 163, 174, 169, 154, 96, 82, 17]", - "total_badness": 1550.1402117 + "ne2d": 596, + "ne3d": 1129, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 0, 2, 10, 28, 38, 75, 130, 159, 208, 199, 162, 100, 17]", + "total_badness": 1500.1384781 }, { "ne1d": 156, - "ne2d": 978, - "ne3d": 2116, - "quality_histogram": "[0, 0, 0, 0, 0, 2, 2, 12, 24, 53, 88, 148, 204, 264, 307, 311, 310, 212, 134, 45]", - "total_badness": 2990.2292327 + "ne2d": 996, + "ne3d": 2214, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 1, 4, 40, 47, 89, 182, 262, 324, 362, 381, 279, 196, 46]", + "total_badness": 2974.3073079 }, { "ne1d": 232, - "ne2d": 2152, - "ne3d": 8180, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 1, 4, 13, 75, 162, 340, 621, 998, 1438, 1633, 1538, 1036, 320]", - "total_badness": 10345.93668 + "ne2d": 2212, + "ne3d": 8313, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 4, 15, 37, 113, 263, 626, 1005, 1387, 1743, 1660, 1133, 327]", + "total_badness": 10392.004794 }, { "ne1d": 388, - "ne2d": 6032, - "ne3d": 55282, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 0, 17, 55, 134, 358, 1019, 2431, 5189, 8900, 11545, 12575, 9809, 3249]", - "total_badness": 67200.497687 + "ne2d": 6142, + "ne3d": 54975, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 2, 12, 45, 127, 329, 844, 2554, 5100, 8469, 11479, 12855, 9876, 3283]", + "total_badness": 66669.096677 } ], "fichera.geo": [ { "ne1d": 50, "ne2d": 38, - "ne3d": 35, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 3, 3, 0, 14, 6, 4, 3, 0, 0, 0]", - "total_badness": 52.723984269 + "ne3d": 40, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 2, 1, 3, 2, 4, 3, 5, 7, 8, 2, 1, 0, 2]", + "total_badness": 62.361996939 }, { "ne1d": 42, @@ -633,46 +633,46 @@ { "ne1d": 50, "ne2d": 38, - "ne3d": 35, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 3, 3, 0, 14, 6, 4, 3, 0, 0, 0]", - "total_badness": 52.723984269 + "ne3d": 40, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 2, 1, 3, 2, 4, 3, 5, 7, 8, 2, 1, 0, 2]", + "total_badness": 62.361996939 }, { "ne1d": 96, - "ne2d": 106, - "ne3d": 179, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 10, 22, 29, 29, 24, 32, 16, 10, 4]", - "total_badness": 244.43517202 + "ne2d": 120, + "ne3d": 211, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 6, 14, 22, 26, 38, 37, 41, 14, 9]", + "total_badness": 273.06134659 }, { "ne1d": 144, - "ne2d": 256, - "ne3d": 488, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 6, 16, 33, 67, 69, 87, 83, 64, 51, 8]", - "total_badness": 644.18548378 + "ne2d": 274, + "ne3d": 510, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 8, 16, 34, 67, 79, 99, 78, 66, 48, 12]", + "total_badness": 673.19970182 } ], "frame.step": [ { "ne1d": 12694, - "ne2d": 40032, - "ne3d": 217255, - "quality_histogram": "[5, 13, 31, 61, 130, 279, 648, 1439, 2748, 4927, 8104, 12603, 18825, 26189, 30309, 33468, 31719, 25459, 15756, 4542]", - "total_badness": 305515.07817 + "ne2d": 40504, + "ne3d": 218733, + "quality_histogram": "[4, 7, 19, 26, 34, 80, 334, 892, 2071, 3877, 6685, 11284, 17985, 25708, 31526, 35128, 33835, 27776, 17087, 4375]", + "total_badness": 300987.32592 }, { "ne1d": 6026, - "ne2d": 11524, - "ne3d": 30642, - "quality_histogram": "[5, 17, 33, 55, 112, 215, 294, 601, 966, 1480, 2132, 3064, 3480, 3813, 3959, 3899, 2963, 2077, 1083, 394]", - "total_badness": 48718.851933 + "ne2d": 11450, + "ne3d": 30266, + "quality_histogram": "[3, 4, 4, 15, 27, 52, 144, 325, 794, 1146, 1804, 2656, 3402, 4054, 4470, 4132, 3244, 2343, 1324, 323]", + "total_badness": 45523.987082 }, { "ne1d": 9704, - "ne2d": 24306, - "ne3d": 84372, - "quality_histogram": "[5, 24, 44, 72, 114, 182, 376, 582, 1183, 2141, 3538, 5817, 8397, 11162, 12283, 12562, 11075, 8571, 4984, 1260]", - "total_badness": 122228.21207 + "ne2d": 24550, + "ne3d": 95261, + "quality_histogram": "[7, 41, 55, 151, 370, 1084, 2131, 3122, 4208, 5545, 7047, 8851, 10433, 11502, 11477, 10373, 8376, 6104, 3497, 887]", + "total_badness": 157567.1736 } ], "hinge.stl": [ @@ -719,6 +719,50 @@ "total_badness": 166221.42387 } ], + "lense.in2d": [ + { + "ne1d": 84, + "ne2d": 436, + "ne3d": 0, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", + "total_badness": 0.0 + }, + { + "ne1d": 86, + "ne2d": 476, + "ne3d": 0, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", + "total_badness": 0.0 + }, + { + "ne1d": 86, + "ne2d": 490, + "ne3d": 0, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", + "total_badness": 0.0 + }, + { + "ne1d": 84, + "ne2d": 436, + "ne3d": 0, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", + "total_badness": 0.0 + }, + { + "ne1d": 84, + "ne2d": 460, + "ne3d": 0, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", + "total_badness": 0.0 + }, + { + "ne1d": 88, + "ne2d": 496, + "ne3d": 0, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", + "total_badness": 0.0 + } + ], "lshape3d.geo": [ { "ne1d": 44, @@ -750,93 +794,93 @@ }, { "ne1d": 80, - "ne2d": 68, - "ne3d": 76, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 10, 5, 11, 21, 12, 4, 3, 6]", - "total_badness": 100.74904328 + "ne2d": 76, + "ne3d": 88, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 10, 9, 21, 23, 7, 6, 1, 4]", + "total_badness": 121.1271847 }, { "ne1d": 122, - "ne2d": 194, - "ne3d": 314, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 16, 30, 35, 37, 52, 48, 43, 28, 11]", - "total_badness": 424.01540745 + "ne2d": 204, + "ne3d": 326, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 11, 17, 43, 51, 53, 55, 51, 33, 6]", + "total_badness": 427.73309234 } ], "manyholes.geo": [ { "ne1d": 5886, - "ne2d": 47108, - "ne3d": 178892, - "quality_histogram": "[0, 0, 0, 0, 9, 49, 344, 271, 1077, 1746, 4315, 9252, 12828, 22104, 26682, 30142, 28475, 22329, 13211, 6058]", - "total_badness": 242036.00946 + "ne2d": 48052, + "ne3d": 179262, + "quality_histogram": "[0, 0, 0, 0, 7, 34, 52, 190, 559, 1394, 3332, 7622, 12534, 20021, 27619, 30066, 29961, 25045, 16810, 4016]", + "total_badness": 238415.32571 }, { "ne1d": 2746, - "ne2d": 13444, - "ne3d": 29535, - "quality_histogram": "[0, 0, 0, 0, 17, 37, 130, 275, 644, 995, 1649, 2438, 3005, 3915, 4857, 4110, 2759, 2067, 1198, 1439]", - "total_badness": 43431.404115 + "ne2d": 13866, + "ne3d": 29255, + "quality_histogram": "[0, 0, 0, 0, 12, 22, 36, 163, 382, 903, 1510, 2377, 3268, 4375, 4191, 3761, 3120, 2567, 1846, 722]", + "total_badness": 42256.964101 }, { "ne1d": 4106, - "ne2d": 27422, - "ne3d": 69306, - "quality_histogram": "[0, 0, 0, 6, 39, 119, 211, 574, 1050, 1823, 3574, 5064, 7229, 10576, 9132, 9351, 8299, 6328, 3426, 2505]", - "total_badness": 100153.49841 + "ne2d": 27994, + "ne3d": 70558, + "quality_histogram": "[0, 0, 0, 2, 32, 84, 194, 406, 841, 1669, 2783, 4416, 6997, 9372, 10151, 10346, 9564, 7474, 4487, 1740]", + "total_badness": 99764.452235 } ], "manyholes2.geo": [ { "ne1d": 10202, - "ne2d": 53806, - "ne3d": 128979, - "quality_histogram": "[0, 0, 1, 15, 52, 115, 343, 600, 1518, 2768, 4832, 8179, 11632, 16124, 22272, 20407, 15327, 11446, 6833, 6515]", - "total_badness": 181571.22116 + "ne2d": 55380, + "ne3d": 127866, + "quality_histogram": "[0, 0, 0, 0, 5, 32, 101, 306, 842, 2081, 4519, 7983, 11838, 17786, 18634, 18254, 16922, 14537, 10444, 3582]", + "total_badness": 176665.61274 } ], "matrix.geo": [ { "ne1d": 174, - "ne2d": 1112, - "ne3d": 4664, - "quality_histogram": "[0, 0, 20, 71, 60, 66, 112, 199, 239, 366, 369, 455, 446, 506, 495, 423, 362, 273, 145, 57]", - "total_badness": 8426.3306839 + "ne2d": 1198, + "ne3d": 5246, + "quality_histogram": "[0, 0, 39, 136, 119, 93, 134, 174, 148, 224, 329, 399, 532, 581, 603, 563, 474, 398, 241, 59]", + "total_badness": 9567.4544817 }, { "ne1d": 106, - "ne2d": 586, - "ne3d": 1974, - "quality_histogram": "[0, 13, 51, 99, 155, 168, 180, 193, 176, 168, 201, 132, 122, 102, 68, 51, 25, 29, 29, 12]", - "total_badness": 5471.3255025 + "ne2d": 610, + "ne3d": 1936, + "quality_histogram": "[0, 1, 11, 66, 104, 143, 140, 142, 192, 179, 201, 199, 161, 135, 74, 57, 51, 46, 29, 5]", + "total_badness": 4606.0709672 }, { "ne1d": 132, - "ne2d": 778, - "ne3d": 2548, - "quality_histogram": "[0, 0, 12, 54, 87, 126, 142, 175, 269, 295, 255, 257, 215, 201, 152, 122, 80, 54, 38, 14]", - "total_badness": 5547.4387913 + "ne2d": 830, + "ne3d": 2751, + "quality_histogram": "[0, 0, 4, 57, 63, 116, 124, 163, 226, 230, 333, 307, 270, 240, 206, 164, 105, 82, 43, 18]", + "total_badness": 5616.8677502 }, { "ne1d": 174, - "ne2d": 1112, - "ne3d": 4528, - "quality_histogram": "[0, 0, 15, 52, 50, 61, 91, 184, 216, 326, 320, 439, 425, 505, 497, 419, 412, 289, 168, 59]", - "total_badness": 7915.0764915 + "ne2d": 1198, + "ne3d": 5176, + "quality_histogram": "[0, 0, 31, 113, 115, 69, 111, 172, 123, 209, 285, 339, 485, 597, 595, 628, 503, 468, 254, 79]", + "total_badness": 9086.4626755 }, { "ne1d": 248, - "ne2d": 2234, - "ne3d": 15738, - "quality_histogram": "[0, 0, 0, 1, 4, 9, 49, 111, 189, 286, 466, 759, 1180, 1558, 2068, 2417, 2414, 2223, 1548, 456]", - "total_badness": 21524.074952 + "ne2d": 2324, + "ne3d": 16341, + "quality_histogram": "[0, 0, 0, 0, 0, 7, 23, 64, 122, 219, 336, 666, 982, 1584, 2204, 2586, 2786, 2581, 1637, 544]", + "total_badness": 21749.164857 }, { "ne1d": 418, - "ne2d": 5836, - "ne3d": 99039, - "quality_histogram": "[0, 0, 0, 1, 1, 3, 15, 45, 125, 259, 646, 1399, 3028, 6125, 10634, 15783, 20056, 20888, 15273, 4758]", - "total_badness": 123167.25076 + "ne2d": 5968, + "ne3d": 100573, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 6, 18, 78, 192, 438, 1216, 2786, 6112, 10628, 15970, 20785, 21682, 15766, 4896]", + "total_badness": 124376.56219 } ], "ortho.geo": [ @@ -877,10 +921,10 @@ }, { "ne1d": 72, - "ne2d": 108, - "ne3d": 169, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 3, 10, 12, 23, 26, 26, 30, 23, 10, 4]", - "total_badness": 227.08316059 + "ne2d": 116, + "ne3d": 180, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 11, 12, 24, 35, 36, 29, 16, 9]", + "total_badness": 231.52239849 } ], "part1.stl": [ @@ -923,45 +967,45 @@ "period.geo": [ { "ne1d": 344, - "ne2d": 1092, - "ne3d": 3101, - "quality_histogram": "[0, 0, 0, 0, 4, 13, 23, 64, 104, 148, 235, 320, 331, 363, 393, 363, 304, 218, 161, 57]", - "total_badness": 4789.6346919 + "ne2d": 1136, + "ne3d": 3291, + "quality_histogram": "[0, 0, 0, 0, 1, 6, 24, 38, 73, 142, 237, 280, 363, 430, 473, 394, 337, 293, 163, 37]", + "total_badness": 4941.6426523 }, { "ne1d": 160, - "ne2d": 272, - "ne3d": 588, - "quality_histogram": "[0, 0, 1, 7, 13, 20, 23, 41, 47, 50, 42, 56, 45, 47, 50, 51, 22, 47, 15, 11]", - "total_badness": 1132.5775066 + "ne2d": 286, + "ne3d": 642, + "quality_histogram": "[0, 0, 4, 7, 11, 22, 28, 28, 40, 61, 66, 58, 59, 55, 53, 53, 40, 36, 16, 5]", + "total_badness": 1235.2259283 }, { "ne1d": 232, - "ne2d": 552, - "ne3d": 1329, - "quality_histogram": "[0, 0, 4, 13, 23, 41, 64, 69, 81, 107, 118, 125, 143, 114, 102, 95, 117, 58, 32, 23]", - "total_badness": 2516.6683318 + "ne2d": 598, + "ne3d": 1654, + "quality_histogram": "[5, 18, 43, 57, 47, 59, 62, 79, 117, 120, 126, 148, 134, 159, 134, 113, 117, 66, 39, 11]", + "total_badness": 3928.2006441 }, { "ne1d": 344, - "ne2d": 1092, - "ne3d": 3060, - "quality_histogram": "[0, 0, 0, 0, 4, 9, 20, 47, 94, 129, 219, 274, 328, 371, 378, 370, 334, 265, 162, 56]", - "total_badness": 4632.1450094 + "ne2d": 1136, + "ne3d": 3221, + "quality_histogram": "[0, 0, 0, 0, 0, 3, 20, 24, 54, 111, 178, 268, 317, 453, 436, 450, 365, 311, 187, 44]", + "total_badness": 4704.9518805 }, { "ne1d": 480, - "ne2d": 2172, - "ne3d": 11163, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 3, 5, 40, 73, 170, 308, 663, 985, 1444, 1852, 2071, 1910, 1223, 416]", - "total_badness": 14472.357604 + "ne2d": 2256, + "ne3d": 11709, + "quality_histogram": "[0, 0, 0, 0, 0, 1, 2, 9, 15, 51, 115, 243, 547, 966, 1489, 2032, 2273, 2081, 1459, 426]", + "total_badness": 14941.96653 }, { "ne1d": 820, - "ne2d": 6098, - "ne3d": 67286, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 7, 26, 114, 290, 816, 1898, 4057, 7076, 10984, 13871, 14152, 10618, 3377]", - "total_badness": 83173.133848 + "ne2d": 6226, + "ne3d": 68532, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 4, 18, 76, 261, 684, 1675, 3888, 7222, 11072, 14234, 14852, 11076, 3469]", + "total_badness": 84325.408672 } ], "plane.stl": [ @@ -1011,332 +1055,464 @@ "revolution.geo": [ { "ne1d": 320, - "ne2d": 2976, - "ne3d": 8188, - "quality_histogram": "[0, 0, 0, 0, 0, 2, 16, 79, 152, 311, 565, 736, 920, 1083, 1080, 1027, 960, 678, 480, 99]", - "total_badness": 12075.726682 + "ne2d": 3110, + "ne3d": 8443, + "quality_histogram": "[0, 0, 0, 0, 0, 1, 12, 45, 144, 318, 519, 804, 967, 1078, 1145, 1112, 987, 738, 454, 119]", + "total_badness": 12356.528396 }, { "ne1d": 160, - "ne2d": 800, - "ne3d": 1311, - "quality_histogram": "[0, 0, 1, 2, 6, 25, 68, 91, 144, 135, 132, 130, 126, 109, 101, 88, 79, 40, 31, 3]", - "total_badness": 2483.2141758 + "ne2d": 822, + "ne3d": 1279, + "quality_histogram": "[0, 0, 0, 0, 2, 14, 52, 81, 100, 116, 148, 146, 167, 114, 92, 74, 92, 44, 25, 12]", + "total_badness": 2305.3064983 }, { "ne1d": 240, - "ne2d": 1768, - "ne3d": 3842, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 8, 29, 95, 175, 307, 416, 446, 505, 495, 424, 392, 324, 178, 48]", - "total_badness": 5778.3652899 + "ne2d": 1830, + "ne3d": 3870, + "quality_histogram": "[0, 0, 0, 0, 0, 2, 5, 29, 108, 195, 310, 445, 521, 478, 473, 425, 351, 292, 195, 41]", + "total_badness": 5884.7598106 }, { "ne1d": 320, - "ne2d": 2976, - "ne3d": 8011, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 5, 23, 86, 233, 422, 652, 798, 1026, 1099, 1107, 1023, 849, 566, 122]", - "total_badness": 11388.557884 + "ne2d": 3110, + "ne3d": 8269, + "quality_histogram": "[0, 0, 0, 0, 0, 1, 0, 24, 69, 199, 438, 654, 876, 1057, 1127, 1199, 1061, 888, 548, 128]", + "total_badness": 11704.49421 }, { "ne1d": 480, - "ne2d": 6626, - "ne3d": 32594, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 5, 18, 105, 295, 716, 1448, 2646, 4240, 5435, 6192, 6037, 4244, 1212]", - "total_badness": 41402.678067 + "ne2d": 6864, + "ne3d": 33003, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 5, 20, 80, 243, 674, 1446, 2651, 4133, 5647, 6385, 6118, 4423, 1178]", + "total_badness": 41802.827145 }, { "ne1d": 800, - "ne2d": 17454, - "ne3d": 200716, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 2, 14, 52, 179, 608, 1704, 4559, 10434, 19984, 31785, 41963, 45605, 33701, 10126]", - "total_badness": 245716.04369 + "ne2d": 17934, + "ne3d": 201498, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 2, 44, 148, 603, 1656, 4364, 10078, 19992, 31915, 42284, 45543, 34094, 10774]", + "total_badness": 246262.93603 } ], "screw.step": [ { "ne1d": 400, - "ne2d": 1480, - "ne3d": 2651, - "quality_histogram": "[0, 0, 2, 0, 7, 15, 48, 74, 114, 189, 194, 241, 282, 297, 335, 308, 242, 172, 102, 29]", - "total_badness": 4282.6220755 + "ne2d": 1432, + "ne3d": 2402, + "quality_histogram": "[0, 0, 0, 0, 0, 4, 21, 78, 107, 181, 201, 246, 254, 284, 278, 249, 221, 161, 101, 16]", + "total_badness": 3838.1456915 }, { "ne1d": 530, - "ne2d": 2746, - "ne3d": 7967, - "quality_histogram": "[0, 2, 3, 1, 10, 18, 34, 59, 110, 180, 278, 411, 575, 811, 1049, 1251, 1297, 972, 713, 193]", - "total_badness": 11136.799459 + "ne2d": 2718, + "ne3d": 8015, + "quality_histogram": "[0, 0, 0, 0, 1, 2, 5, 17, 43, 88, 192, 275, 495, 749, 1086, 1287, 1380, 1267, 866, 262]", + "total_badness": 10583.964534 }, { "ne1d": 668, - "ne2d": 5066, - "ne3d": 31896, - "quality_histogram": "[0, 0, 0, 0, 2, 7, 10, 24, 43, 106, 221, 502, 969, 2036, 3531, 5162, 6478, 6558, 4810, 1437]", - "total_badness": 39857.410858 + "ne2d": 5002, + "ne3d": 31735, + "quality_histogram": "[0, 0, 0, 0, 0, 2, 1, 5, 28, 45, 134, 357, 793, 1795, 3287, 5145, 6774, 6789, 4992, 1588]", + "total_badness": 39141.53875 } ], "sculpture.geo": [ { "ne1d": 192, - "ne2d": 398, - "ne3d": 456, - "quality_histogram": "[0, 0, 0, 0, 0, 2, 2, 2, 11, 20, 37, 45, 57, 71, 77, 71, 38, 14, 9, 0]", - "total_badness": 702.3804118 + "ne2d": 414, + "ne3d": 475, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 2, 5, 17, 18, 32, 62, 64, 97, 98, 41, 25, 11, 2]", + "total_badness": 692.44104062 }, { "ne1d": 102, - "ne2d": 144, - "ne3d": 137, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 2, 10, 16, 17, 22, 29, 18, 18, 2]", - "total_badness": 178.33154961 + "ne2d": 146, + "ne3d": 141, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 5, 11, 19, 19, 36, 29, 17, 2]", + "total_badness": 178.07603683 }, { "ne1d": 144, - "ne2d": 234, - "ne3d": 235, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 2, 2, 3, 7, 11, 11, 25, 36, 49, 37, 32, 18, 2]", - "total_badness": 319.02266286 + "ne2d": 250, + "ne3d": 263, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 6, 7, 14, 24, 29, 53, 46, 49, 24, 7]", + "total_badness": 343.8094424 }, { "ne1d": 192, - "ne2d": 398, - "ne3d": 456, - "quality_histogram": "[0, 0, 0, 0, 0, 2, 1, 2, 11, 21, 39, 46, 57, 70, 77, 70, 37, 14, 9, 0]", - "total_badness": 702.94908258 + "ne2d": 414, + "ne3d": 475, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 2, 5, 17, 18, 32, 62, 64, 97, 98, 41, 25, 11, 2]", + "total_badness": 692.44104062 }, { "ne1d": 288, - "ne2d": 938, - "ne3d": 1253, - "quality_histogram": "[0, 0, 1, 0, 2, 6, 15, 34, 68, 89, 152, 139, 125, 125, 138, 126, 99, 59, 53, 22]", - "total_badness": 2054.7201979 + "ne2d": 962, + "ne3d": 1326, + "quality_histogram": "[0, 0, 0, 0, 0, 2, 6, 24, 53, 87, 122, 149, 125, 142, 117, 141, 144, 119, 80, 15]", + "total_badness": 2054.7475159 }, { "ne1d": 480, - "ne2d": 2324, - "ne3d": 6464, - "quality_histogram": "[0, 0, 0, 3, 7, 8, 17, 14, 20, 52, 96, 165, 302, 547, 852, 1076, 1204, 1135, 726, 240]", - "total_badness": 8431.4328551 + "ne2d": 2394, + "ne3d": 6791, + "quality_histogram": "[0, 0, 0, 0, 2, 3, 12, 10, 30, 33, 80, 135, 286, 503, 747, 1080, 1312, 1266, 984, 308]", + "total_badness": 8649.5978251 } ], "shaft.geo": [ { "ne1d": 708, - "ne2d": 1674, - "ne3d": 2489, - "quality_histogram": "[0, 0, 0, 2, 3, 14, 17, 34, 79, 156, 378, 332, 260, 273, 229, 266, 219, 132, 70, 25]", - "total_badness": 4028.4511449 + "ne2d": 1722, + "ne3d": 2757, + "quality_histogram": "[22, 11, 27, 30, 41, 40, 46, 62, 79, 140, 264, 373, 303, 274, 231, 291, 233, 179, 86, 25]", + "total_badness": 6328.6329226 }, { "ne1d": 410, - "ne2d": 586, - "ne3d": 869, - "quality_histogram": "[0, 0, 0, 0, 1, 2, 4, 17, 30, 46, 53, 64, 85, 80, 90, 104, 108, 115, 46, 24]", - "total_badness": 1295.3186437 + "ne2d": 606, + "ne3d": 933, + "quality_histogram": "[0, 0, 0, 0, 0, 1, 4, 1, 17, 25, 47, 58, 90, 116, 155, 146, 124, 96, 36, 17]", + "total_badness": 1336.5110795 }, { "ne1d": 510, - "ne2d": 970, - "ne3d": 1686, - "quality_histogram": "[0, 0, 12, 26, 56, 51, 61, 87, 109, 113, 134, 139, 159, 175, 176, 150, 125, 58, 39, 16]", - "total_badness": 3309.2557071 + "ne2d": 1004, + "ne3d": 2048, + "quality_histogram": "[11, 74, 88, 69, 81, 94, 99, 125, 99, 122, 96, 133, 133, 165, 190, 186, 163, 67, 45, 8]", + "total_badness": 5937.4200337 }, { "ne1d": 708, - "ne2d": 1674, - "ne3d": 2477, - "quality_histogram": "[0, 0, 0, 2, 1, 9, 15, 36, 69, 148, 389, 328, 265, 262, 218, 288, 215, 130, 77, 25]", - "total_badness": 3983.0754336 + "ne2d": 1722, + "ne3d": 2733, + "quality_histogram": "[6, 8, 10, 17, 29, 39, 34, 40, 80, 132, 254, 397, 302, 295, 238, 297, 250, 192, 88, 25]", + "total_badness": 4814.5951096 }, { "ne1d": 1138, - "ne2d": 4078, - "ne3d": 10809, - "quality_histogram": "[0, 0, 0, 0, 0, 1, 7, 19, 55, 142, 282, 437, 680, 1039, 1406, 1781, 1874, 1704, 1061, 321]", - "total_badness": 14354.482904 + "ne2d": 4220, + "ne3d": 11242, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 2, 1, 27, 78, 178, 382, 607, 934, 1459, 1772, 2147, 1927, 1325, 403]", + "total_badness": 14539.392197 }, { "ne1d": 1792, - "ne2d": 10390, - "ne3d": 61428, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 7, 36, 113, 262, 726, 1670, 3519, 6476, 9764, 12505, 13045, 10002, 3302]", - "total_badness": 75768.180822 + "ne2d": 10600, + "ne3d": 63895, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 2, 18, 53, 198, 529, 1486, 3387, 6482, 10124, 13426, 13922, 10754, 3514]", + "total_badness": 78232.724768 } ], "sphere.geo": [ { "ne1d": 0, - "ne2d": 110, - "ne3d": 110, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 4, 29, 47, 6, 7, 6, 2, 4, 0, 1, 3, 0]", - "total_badness": 205.55211745 + "ne2d": 126, + "ne3d": 126, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 6, 25, 47, 33, 12, 1, 2, 0, 0, 0, 0, 0]", + "total_badness": 237.42979301 }, { "ne1d": 0, - "ne2d": 52, - "ne3d": 52, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 4, 13, 14, 13, 3, 0]", - "total_badness": 65.101112061 + "ne2d": 56, + "ne3d": 56, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 18, 19, 15, 0, 0]", + "total_badness": 68.826138928 }, { "ne1d": 0, - "ne2d": 68, - "ne3d": 68, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 14, 24, 8, 7, 5, 4, 1, 2]", - "total_badness": 96.707948617 + "ne2d": 72, + "ne3d": 72, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 14, 27, 22, 7, 0, 0, 0]", + "total_badness": 97.572347502 }, { "ne1d": 0, - "ne2d": 110, - "ne3d": 110, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 4, 29, 47, 6, 7, 6, 2, 4, 0, 1, 3, 0]", - "total_badness": 205.55211745 + "ne2d": 126, + "ne3d": 126, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 6, 25, 47, 33, 12, 1, 2, 0, 0, 0, 0, 0]", + "total_badness": 237.42979301 }, { "ne1d": 0, - "ne2d": 254, - "ne3d": 350, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 2, 8, 28, 47, 48, 43, 51, 47, 20, 20, 20, 10, 6]", - "total_badness": 555.65023551 + "ne2d": 258, + "ne3d": 366, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 6, 22, 32, 55, 47, 62, 28, 39, 31, 22, 15, 6]", + "total_badness": 562.00749621 }, { "ne1d": 0, - "ne2d": 656, - "ne3d": 2286, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 15, 37, 92, 152, 276, 397, 471, 429, 303, 111]", - "total_badness": 2868.3272967 + "ne2d": 660, + "ne3d": 2329, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 1, 6, 10, 28, 76, 158, 282, 415, 502, 433, 327, 91]", + "total_badness": 2913.3426209 } ], "sphereincube.geo": [ { "ne1d": 46, - "ne2d": 182, - "ne3d": 445, - "quality_histogram": "[0, 0, 7, 60, 44, 43, 53, 44, 55, 33, 27, 23, 10, 12, 11, 12, 5, 2, 4, 0]", - "total_badness": 1401.4502735 + "ne2d": 202, + "ne3d": 490, + "quality_histogram": "[0, 0, 8, 59, 42, 29, 53, 45, 55, 46, 33, 14, 16, 11, 15, 12, 12, 24, 11, 5]", + "total_badness": 1429.7083119 }, { "ne1d": 24, "ne2d": 60, "ne3d": 166, - "quality_histogram": "[0, 0, 8, 15, 17, 13, 17, 7, 5, 4, 3, 4, 14, 4, 10, 15, 9, 15, 5, 1]", - "total_badness": 472.78592323 + "quality_histogram": "[0, 0, 5, 12, 14, 15, 31, 10, 2, 1, 3, 2, 7, 9, 13, 13, 15, 9, 4, 1]", + "total_badness": 454.94795255 }, { "ne1d": 30, - "ne2d": 104, - "ne3d": 294, - "quality_histogram": "[0, 0, 6, 19, 18, 35, 35, 32, 30, 29, 22, 15, 12, 6, 16, 5, 7, 4, 3, 0]", - "total_badness": 831.78873831 + "ne2d": 116, + "ne3d": 345, + "quality_histogram": "[0, 0, 5, 24, 43, 41, 26, 26, 38, 32, 20, 18, 24, 14, 8, 9, 5, 7, 4, 1]", + "total_badness": 988.81847916 }, { "ne1d": 46, - "ne2d": 182, - "ne3d": 443, - "quality_histogram": "[0, 0, 6, 47, 35, 45, 57, 44, 50, 34, 25, 31, 13, 15, 15, 13, 6, 3, 4, 0]", - "total_badness": 1315.3011324 + "ne2d": 202, + "ne3d": 498, + "quality_histogram": "[0, 0, 8, 41, 27, 29, 50, 44, 55, 58, 44, 25, 20, 15, 14, 15, 13, 24, 11, 5]", + "total_badness": 1326.92489 }, { "ne1d": 74, - "ne2d": 384, - "ne3d": 1597, - "quality_histogram": "[0, 0, 0, 0, 2, 7, 12, 21, 27, 49, 80, 121, 170, 205, 219, 215, 191, 158, 92, 28]", - "total_badness": 2350.3326171 + "ne2d": 418, + "ne3d": 1788, + "quality_histogram": "[0, 0, 0, 0, 0, 6, 6, 21, 28, 38, 73, 98, 167, 213, 251, 273, 258, 200, 112, 44]", + "total_badness": 2540.547751 }, { "ne1d": 122, - "ne2d": 1048, - "ne3d": 13579, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 8, 17, 66, 160, 274, 542, 950, 1530, 2203, 2751, 2677, 1867, 534]", - "total_badness": 17161.325004 + "ne2d": 1082, + "ne3d": 14039, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 5, 31, 105, 218, 465, 893, 1497, 2202, 2857, 2912, 2179, 674]", + "total_badness": 17464.78638 + } + ], + "square.in2d": [ + { + "ne1d": 35, + "ne2d": 121, + "ne3d": 0, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", + "total_badness": 0.0 + }, + { + "ne1d": 30, + "ne2d": 98, + "ne3d": 0, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", + "total_badness": 0.0 + }, + { + "ne1d": 30, + "ne2d": 96, + "ne3d": 0, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", + "total_badness": 0.0 + }, + { + "ne1d": 35, + "ne2d": 121, + "ne3d": 0, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", + "total_badness": 0.0 + }, + { + "ne1d": 44, + "ne2d": 190, + "ne3d": 0, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", + "total_badness": 0.0 + }, + { + "ne1d": 58, + "ne2d": 396, + "ne3d": 0, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", + "total_badness": 0.0 + } + ], + "squarecircle.in2d": [ + { + "ne1d": 32, + "ne2d": 158, + "ne3d": 0, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", + "total_badness": 0.0 + }, + { + "ne1d": 32, + "ne2d": 130, + "ne3d": 0, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", + "total_badness": 0.0 + }, + { + "ne1d": 32, + "ne2d": 140, + "ne3d": 0, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", + "total_badness": 0.0 + }, + { + "ne1d": 32, + "ne2d": 158, + "ne3d": 0, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", + "total_badness": 0.0 + }, + { + "ne1d": 45, + "ne2d": 313, + "ne3d": 0, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", + "total_badness": 0.0 + }, + { + "ne1d": 81, + "ne2d": 843, + "ne3d": 0, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", + "total_badness": 0.0 + } + ], + "squarehole.in2d": [ + { + "ne1d": 32, + "ne2d": 134, + "ne3d": 0, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", + "total_badness": 0.0 + }, + { + "ne1d": 32, + "ne2d": 108, + "ne3d": 0, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", + "total_badness": 0.0 + }, + { + "ne1d": 32, + "ne2d": 118, + "ne3d": 0, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", + "total_badness": 0.0 + }, + { + "ne1d": 32, + "ne2d": 134, + "ne3d": 0, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", + "total_badness": 0.0 + }, + { + "ne1d": 45, + "ne2d": 253, + "ne3d": 0, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", + "total_badness": 0.0 + }, + { + "ne1d": 81, + "ne2d": 709, + "ne3d": 0, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", + "total_badness": 0.0 } ], "torus.geo": [ { "ne1d": 0, - "ne2d": 2514, - "ne3d": 5726, - "quality_histogram": "[0, 0, 0, 0, 0, 22, 36, 90, 173, 330, 475, 680, 762, 771, 679, 619, 489, 354, 187, 59]", - "total_badness": 8967.2870294 + "ne2d": 2534, + "ne3d": 5745, + "quality_histogram": "[0, 0, 0, 0, 0, 4, 19, 59, 148, 286, 440, 581, 679, 796, 742, 668, 583, 418, 238, 84]", + "total_badness": 8709.4458795 }, { "ne1d": 0, - "ne2d": 670, - "ne3d": 2988, - "quality_histogram": "[127, 598, 433, 338, 287, 207, 194, 144, 150, 118, 102, 79, 66, 48, 36, 23, 15, 15, 6, 2]", - "total_badness": 21069.350308 + "ne2d": 692, + "ne3d": 3181, + "quality_histogram": "[166, 714, 477, 367, 312, 232, 199, 167, 108, 100, 92, 66, 48, 39, 30, 27, 18, 13, 6, 0]", + "total_badness": 24641.250872 }, { "ne1d": 0, - "ne2d": 1426, - "ne3d": 2701, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 7, 25, 75, 171, 327, 369, 435, 378, 339, 263, 179, 101, 31]", - "total_badness": 3988.6535111 + "ne2d": 1446, + "ne3d": 2743, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 3, 14, 62, 135, 247, 356, 403, 430, 384, 298, 200, 152, 59]", + "total_badness": 3928.1549928 }, { "ne1d": 0, - "ne2d": 2514, - "ne3d": 5554, - "quality_histogram": "[0, 0, 0, 0, 0, 2, 9, 46, 105, 218, 384, 584, 704, 751, 700, 704, 577, 454, 249, 67]", - "total_badness": 8273.8939465 + "ne2d": 2534, + "ne3d": 5584, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 27, 78, 171, 346, 509, 649, 760, 771, 771, 646, 472, 283, 100]", + "total_badness": 8111.5941443 }, { "ne1d": 0, - "ne2d": 5842, - "ne3d": 24282, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 3, 19, 81, 228, 548, 1135, 1947, 3128, 4133, 4719, 4422, 3081, 838]", - "total_badness": 30913.936434 + "ne2d": 5894, + "ne3d": 25294, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 9, 32, 149, 417, 947, 1723, 2990, 4145, 5146, 5002, 3604, 1129]", + "total_badness": 31642.969488 }, { "ne1d": 0, - "ne2d": 16170, - "ne3d": 174079, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 6, 34, 138, 426, 1276, 3495, 8503, 16924, 27371, 37192, 39797, 29753, 9164]", - "total_badness": 212322.15571 + "ne2d": 16296, + "ne3d": 175351, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 7, 36, 115, 401, 1106, 3230, 8059, 16480, 27460, 37219, 40628, 30958, 9652]", + "total_badness": 213157.95506 } ], "trafo.geo": [ { "ne1d": 690, - "ne2d": 1650, - "ne3d": 5153, - "quality_histogram": "[1, 4, 0, 2, 6, 22, 48, 90, 149, 211, 324, 377, 461, 583, 666, 681, 571, 443, 413, 101]", - "total_badness": 7797.9450152 + "ne2d": 1684, + "ne3d": 5231, + "quality_histogram": "[0, 2, 2, 2, 8, 24, 37, 50, 114, 203, 267, 363, 472, 583, 649, 706, 623, 527, 462, 137]", + "total_badness": 7683.599832 }, { "ne1d": 390, - "ne2d": 518, + "ne2d": 522, "ne3d": 1353, - "quality_histogram": "[0, 0, 4, 13, 32, 32, 71, 125, 125, 144, 170, 148, 134, 115, 95, 68, 33, 21, 22, 1]", - "total_badness": 2785.2527917 + "quality_histogram": "[0, 0, 3, 17, 15, 42, 75, 123, 130, 146, 161, 124, 147, 105, 84, 88, 47, 33, 11, 2]", + "total_badness": 2768.022266 }, { "ne1d": 512, - "ne2d": 858, - "ne3d": 2354, - "quality_histogram": "[0, 0, 1, 2, 11, 27, 57, 67, 161, 182, 217, 250, 264, 284, 290, 258, 140, 47, 59, 37]", - "total_badness": 4028.6466008 + "ne2d": 874, + "ne3d": 2397, + "quality_histogram": "[0, 0, 1, 3, 9, 23, 41, 72, 132, 142, 188, 204, 304, 389, 343, 237, 138, 97, 48, 26]", + "total_badness": 3983.5650135 }, { "ne1d": 690, - "ne2d": 1650, - "ne3d": 5071, - "quality_histogram": "[0, 0, 0, 1, 3, 16, 36, 81, 130, 210, 298, 368, 444, 592, 658, 654, 583, 456, 437, 104]", - "total_badness": 7501.8324545 + "ne2d": 1684, + "ne3d": 5147, + "quality_histogram": "[0, 0, 0, 1, 3, 12, 26, 40, 106, 188, 272, 357, 422, 561, 671, 714, 608, 558, 474, 134]", + "total_badness": 7408.6135626 }, { "ne1d": 1050, - "ne2d": 3712, - "ne3d": 17430, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 7, 31, 58, 112, 236, 621, 1624, 2131, 2389, 2547, 2560, 2483, 2004, 627]", - "total_badness": 23088.888517 + "ne2d": 3812, + "ne3d": 18010, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 4, 29, 42, 57, 198, 540, 1405, 2251, 2392, 2790, 2784, 2612, 2242, 664]", + "total_badness": 23560.24016 }, { "ne1d": 1722, - "ne2d": 9888, - "ne3d": 83916, - "quality_histogram": "[0, 0, 0, 2, 3, 9, 103, 1417, 624, 529, 1028, 1656, 3206, 6128, 9176, 13176, 15913, 15495, 11729, 3722]", - "total_badness": 108897.74798 + "ne2d": 10042, + "ne3d": 84690, + "quality_histogram": "[0, 0, 0, 0, 2, 3, 54, 1424, 754, 408, 795, 1316, 2637, 5766, 9155, 13453, 16224, 16583, 12169, 3947]", + "total_badness": 108937.41902 } ], "twobricks.geo": [ @@ -1370,17 +1546,17 @@ }, { "ne1d": 116, - "ne2d": 122, - "ne3d": 149, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 4, 10, 25, 25, 30, 19, 17, 7, 7, 4]", - "total_badness": 210.92258874 + "ne2d": 134, + "ne3d": 177, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 12, 10, 18, 38, 22, 27, 22, 18, 7]", + "total_badness": 234.47359 }, { "ne1d": 186, - "ne2d": 308, - "ne3d": 535, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 9, 18, 51, 66, 92, 87, 77, 61, 61, 10]", - "total_badness": 711.81286081 + "ne2d": 346, + "ne3d": 603, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 10, 25, 42, 66, 89, 101, 110, 93, 56, 10]", + "total_badness": 792.88605666 } ], "twocubes.geo": [ @@ -1414,61 +1590,61 @@ }, { "ne1d": 116, - "ne2d": 122, - "ne3d": 149, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 4, 10, 25, 25, 30, 19, 17, 7, 7, 4]", - "total_badness": 210.92258874 + "ne2d": 134, + "ne3d": 177, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 12, 10, 18, 38, 22, 27, 22, 18, 7]", + "total_badness": 234.47359 }, { "ne1d": 186, - "ne2d": 308, - "ne3d": 535, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 9, 18, 51, 66, 92, 87, 77, 61, 61, 10]", - "total_badness": 711.81286081 + "ne2d": 346, + "ne3d": 603, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 10, 25, 42, 66, 89, 101, 110, 93, 56, 10]", + "total_badness": 792.88605666 } ], "twocyl.geo": [ { "ne1d": 144, - "ne2d": 406, - "ne3d": 539, - "quality_histogram": "[0, 0, 0, 0, 0, 1, 5, 12, 24, 30, 56, 49, 74, 67, 67, 60, 43, 38, 12, 1]", - "total_badness": 858.68248624 + "ne2d": 408, + "ne3d": 576, + "quality_histogram": "[0, 0, 0, 0, 0, 2, 12, 19, 19, 17, 36, 50, 59, 82, 90, 73, 69, 34, 13, 1]", + "total_badness": 901.75131743 }, { "ne1d": 68, "ne2d": 100, - "ne3d": 188, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 1, 2, 3, 6, 14, 23, 27, 28, 25, 22, 28, 8, 0]", - "total_badness": 267.41201716 + "ne3d": 209, + "quality_histogram": "[0, 0, 0, 1, 3, 6, 11, 2, 8, 5, 15, 18, 12, 28, 28, 27, 24, 17, 3, 1]", + "total_badness": 357.15447323 }, { "ne1d": 102, - "ne2d": 236, - "ne3d": 561, - "quality_histogram": "[1, 8, 41, 60, 42, 46, 41, 50, 53, 36, 27, 27, 22, 15, 18, 17, 38, 5, 11, 3]", - "total_badness": 1876.9984411 + "ne2d": 238, + "ne3d": 548, + "quality_histogram": "[5, 24, 23, 35, 33, 46, 49, 52, 63, 39, 19, 20, 19, 22, 19, 24, 40, 14, 2, 0]", + "total_badness": 1932.6124156 }, { "ne1d": 144, - "ne2d": 406, - "ne3d": 538, - "quality_histogram": "[0, 0, 0, 0, 0, 2, 3, 12, 20, 25, 50, 52, 82, 65, 67, 64, 41, 39, 14, 2]", - "total_badness": 848.06909289 + "ne2d": 408, + "ne3d": 576, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 4, 12, 10, 12, 24, 41, 69, 88, 108, 88, 65, 40, 13, 2]", + "total_badness": 853.37034747 }, { "ne1d": 214, - "ne2d": 900, - "ne3d": 1820, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 3, 15, 43, 103, 172, 235, 307, 303, 304, 187, 120, 28]", - "total_badness": 2474.9963091 + "ne2d": 910, + "ne3d": 1921, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 1, 9, 33, 75, 117, 230, 320, 358, 348, 243, 159, 28]", + "total_badness": 2544.8927759 }, { "ne1d": 350, - "ne2d": 2350, - "ne3d": 13336, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 2, 12, 34, 122, 330, 749, 1426, 2105, 2852, 2877, 2178, 649]", - "total_badness": 16385.529152 + "ne2d": 2374, + "ne3d": 13509, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 2, 11, 29, 98, 286, 655, 1353, 2161, 2913, 3068, 2220, 713]", + "total_badness": 16499.785789 } ] } \ No newline at end of file diff --git a/tests/pytest/test_tutorials.py b/tests/pytest/test_tutorials.py index 169a8856..1dca6cd0 100644 --- a/tests/pytest/test_tutorials.py +++ b/tests/pytest/test_tutorials.py @@ -3,6 +3,7 @@ import os, pytest from netgen.meshing import meshsize, MeshingParameters, SetMessageImportance import netgen.csg as csg import netgen.stl as stl +import netgen.geom2d as geom2d from pyngcore import TaskManager import json try: @@ -34,12 +35,12 @@ def checkData(mesh, mp, ref): # get tutorials def getFiles(fileEnding): r, d, files = next(os.walk(os.path.join("..","..","tutorials"))) - return (f for f in files if f.endswith(fileEnding)) + return [f for f in files if f.endswith(fileEnding)] # get additional tests def getAdditionalFiles(fileEnding): r, d, files = next(os.walk("geofiles")) - return (f for f in files if f.endswith(fileEnding)) + return [f for f in files if f.endswith(fileEnding)] @pytest.fixture def refdata(): @@ -64,13 +65,13 @@ def getMeshingparameters(filename): return standard[0:1] + standard[2:] # very coarse does not work return standard -_geofiles = [f for f in getFiles(".geo")] + [f for f in getFiles(".stl")] +_geofiles = getFiles(".in2d") + getFiles(".geo") + getFiles(".stl") if has_occ: - _geofiles += [f for f in getFiles(".step")] + _geofiles += getFiles(".step") _geofiles.sort() -_additional_testfiles = [f for f in getAdditionalFiles(".stl")] +_additional_testfiles = getAdditionalFiles(".stl") if has_occ: - _additional_testfiles += [f for f in getAdditionalFiles(".step")] + _additional_testfiles += getAdditionalFiles(".step") _additional_testfiles.sort() def generateMesh(filename, mp): @@ -81,6 +82,8 @@ def generateMesh(filename, mp): geo = stl.STLGeometry(os.path.join(folder, filename)) elif filename.endswith(".step"): geo = occ.OCCGeometry(os.path.join(folder, filename)) + elif filename.endswith(".in2d"): + geo = geom2d.SplineGeometry(os.path.join(folder, filename)) return geo.GenerateMesh(mp) def isSlowTest(filename):