From: El Hadi Moussi Date: Tue, 6 Aug 2024 12:30:25 +0000 (+0200) Subject: Add test for Cone X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f0781f790e5b2ec9b5200e8536312504e50eb36d;p=tools%2Fmedcoupling.git Add test for Cone --- diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt index de9d4c73b..919b6486e 100644 --- a/resources/CMakeLists.txt +++ b/resources/CMakeLists.txt @@ -96,6 +96,7 @@ SET(MED_other_FILES castem17_result_ascii.sauv ShapeRecognPlane.med ShapeRecognCylinder.med + ShapeRecognCone.med ) SET(MED_RESOURCES_FILES ${MED_test_fig_files}) diff --git a/resources/ShapeRecognCone.med b/resources/ShapeRecognCone.med new file mode 100644 index 000000000..da32d3e8b Binary files /dev/null and b/resources/ShapeRecognCone.med differ diff --git a/src/ShapeRecogn/Test/CMakeLists.txt b/src/ShapeRecogn/Test/CMakeLists.txt index c81c9c4b1..713284d32 100644 --- a/src/ShapeRecogn/Test/CMakeLists.txt +++ b/src/ShapeRecogn/Test/CMakeLists.txt @@ -34,6 +34,7 @@ SET(TestShapeRecogn_SOURCES MathOpsTest.cxx PlaneTest.cxx CylinderTest.cxx + ConeTest.cxx ) SALOME_ACCUMULATE_ENVIRONMENT(MEDCOUPLING_RESOURCE_DIR "${CMAKE_BINARY_DIR}/resources") diff --git a/src/ShapeRecogn/Test/ConeTest.cxx b/src/ShapeRecogn/Test/ConeTest.cxx new file mode 100644 index 000000000..74cd85401 --- /dev/null +++ b/src/ShapeRecogn/Test/ConeTest.cxx @@ -0,0 +1,326 @@ +#include "ConeTest.hxx" + +#include "ShapeRecognMesh.hxx" +#include "Areas.hxx" +#include "MathOps.hxx" +#include "TestInterpKernelUtils.hxx" // getResourceFile() + +using namespace MEDCoupling; + +void ConeTest::setUp() +{ + std::string file = INTERP_TEST::getResourceFile("ShapeRecognCone.med", 3); + srMesh = new ShapeRecognMesh(file); + srMesh->recognize(); + areas = srMesh->getAreas(); +} + +void ConeTest::tearDown() +{ + if (srMesh != 0) + delete srMesh; + areas = 0; +} + +void ConeTest::testNumberOfAreas() +{ + CPPUNIT_ASSERT_EQUAL(3, (int)areas->getNumberOfAreas()); +} + +void ConeTest::testComputePlaneProperties() +{ + const Nodes *nodes = srMesh->getNodes(); + Areas areas(nodes); + mcIdType areaId = areas.addArea(); + std::vector nodeIds{560, 561, 562, 563, 564}; + // Check the coordinates + std::vector coordsRef{ + -0.13274028, + -1.19035036, + 7.0, + 0.62579096, + -0.97231524, + 7.0, + -0.75942852, + -0.99273623, + 7.0, + 0.76454326, + 0.85588873, + 7.0, + 1.12546475, + -0.04924272, + 7.0, + }; + for (size_t i = 0; i < nodeIds.size(); ++i) + { + mcIdType nodeId = nodeIds[i]; + areas.addNode(areaId, nodeId); + std::array coords = nodes->getCoordinates(nodeId); + CPPUNIT_ASSERT_DOUBLES_EQUAL(coordsRef[3 * i], coords[0], 1E-6); + CPPUNIT_ASSERT_DOUBLES_EQUAL(coordsRef[3 * i + 1], coords[1], 1E-6); + CPPUNIT_ASSERT_DOUBLES_EQUAL(coordsRef[3 * i + 2], coords[2], 1E-6); + } + areas.computeProperties(areaId); + // Check normal + std::array normal = areas.getNormal(areaId); + std::array normalRef{0.0, 0.0, 1.0}; + for (size_t i = 0; i < 3; ++i) + CPPUNIT_ASSERT_DOUBLES_EQUAL(normalRef[i], normal[i], 1E-6); +} + +void ConeTest::testComputeCylinderProperties() +{ + const Nodes *nodes = srMesh->getNodes(); + Areas areas(nodes); + mcIdType areaId = areas.addArea(); + // check coordinates + std::vector coordsRef{ + 8.58402821e+00, + -2.10248053e-15, + 1.41597179e+00, + 7.87604232e+00, + -1.92907400e-15, + 2.12395768e+00, + 7.16805642e+00, + -1.75566747e-15, + 2.83194358e+00, + }; + // Add nodes + std::vector nodeIds{26, 27, 28}; + for (size_t i = 0; i < nodeIds.size(); ++i) + { + mcIdType nodeId = nodeIds[i]; + areas.addNode(areaId, nodeId); + std::array coords = nodes->getCoordinates(nodeId); + CPPUNIT_ASSERT_DOUBLES_EQUAL(coordsRef[3 * i], coords[0], 1E-6); + CPPUNIT_ASSERT_DOUBLES_EQUAL(coordsRef[3 * i + 1], coords[1], 1E-6); + CPPUNIT_ASSERT_DOUBLES_EQUAL(coordsRef[3 * i + 2], coords[2], 1E-6); + } + areas.computeProperties(areaId); + // Check radius + double radius = areas.getRadius(areaId); + double radiusRef = 11.016809459292505; + CPPUNIT_ASSERT_DOUBLES_EQUAL(radiusRef, radius, 1E-6); + // Check axis + std::array axis = areas.getAxis(areaId); + std::array axisRef{-2.85185021e-02, 2.47000552e-05, 9.99593264e-01}; + for (size_t i = 0; i < 3; ++i) + CPPUNIT_ASSERT_DOUBLES_EQUAL(axisRef[i], axis[i], 1E-6); + // Check axis point + std::array axisPoint = areas.getAxisPoint(areaId); + std::array axisPointRef{9.55163389e-02, -2.27195412e-05, -5.67562579e+00}; + for (size_t i = 0; i < 3; ++i) + CPPUNIT_ASSERT_DOUBLES_EQUAL(axisPointRef[i], axisPoint[i], 1E-6); +} + +void ConeTest::testComputeConeProperties() +{ + std::srand(0); + const Nodes *nodes = srMesh->getNodes(); + Areas areas(nodes); + mcIdType areaId = areas.addArea(PrimitiveType::Cone); + std::vector coordsRef{ + 8.58402821e+00, + -2.10248053e-15, + 1.41597179e+00, + 7.87604232e+00, + -1.92907400e-15, + 2.12395768e+00, + 7.16805642e+00, + -1.75566747e-15, + 2.83194358e+00, + 6.46007053e+00, + -1.58226094e-15, + 3.53992947e+00}; + // Add nodes + std::vector nodeIds{26, 27, 28, 29}; + for (size_t i = 0; i < nodeIds.size(); ++i) + { + mcIdType nodeId = nodeIds[i]; + areas.addNode(areaId, nodeId); + std::array coords = nodes->getCoordinates(nodeId); + CPPUNIT_ASSERT_DOUBLES_EQUAL(coordsRef[3 * i], coords[0], 1E-6); + CPPUNIT_ASSERT_DOUBLES_EQUAL(coordsRef[3 * i + 1], coords[1], 1E-6); + CPPUNIT_ASSERT_DOUBLES_EQUAL(coordsRef[3 * i + 2], coords[2], 1E-6); + } + areas.computeProperties(areaId); + // Radius + double radiusRef = 10.546213172989718; + CPPUNIT_ASSERT_DOUBLES_EQUAL(radiusRef, areas.getRadius(areaId), 1E-6); + // Angle + double angleRef = 0.7567719849399294; + CPPUNIT_ASSERT_DOUBLES_EQUAL(angleRef, areas.getAngle(areaId), 1E-6); + // Axis + std::array axisRef{-2.99093478e-02, 1.48776702e-05, 9.99552615e-01}; + std::array axis = areas.getAxis(areaId); + for (size_t i = 0; i < 3; ++i) + CPPUNIT_ASSERT_DOUBLES_EQUAL(axisRef[i], axis[i], 1E-6); + // Axis Point + std::array axisPointRef{ + 7.43242419e-02, -1.70396559e-05, -4.98890939e+00}; + std::array axisPoint = areas.getAxisPoint(areaId); + for (size_t i = 0; i < 3; ++i) + CPPUNIT_ASSERT_DOUBLES_EQUAL(axisPointRef[i], axisPoint[i], 1E-6); + // Apex + std::array apexRef{ + -3.87870047e-01, 1.98282729e-04, 1.03928162e+01}; + std::array apex = areas.getApex(areaId); + for (size_t i = 0; i < 3; ++i) + CPPUNIT_ASSERT_DOUBLES_EQUAL(apexRef[i], apex[i], 1E-6); +} + +void ConeTest::testFirstArea() +{ + // primitive type + CPPUNIT_ASSERT_EQUAL(PrimitiveType::Plane, areas->getPrimitiveType(0)); + // node ids + std::vector nodeIdsRef{ + 549, 550, 551, 552, 553, 554, 555, 556, 557, 558, 559, + 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, + 571}; + std::vector nodeIds = areas->getNodeIds(0); + std::sort(nodeIds.begin(), nodeIds.end()); + CPPUNIT_ASSERT_EQUAL(nodeIdsRef.size(), nodeIds.size()); + for (size_t i = 0; i < nodeIds.size(); ++i) + CPPUNIT_ASSERT_EQUAL(nodeIdsRef[i], nodeIds[i]); + // normal + std::array normal = areas->getNormal(0); + std::array normalRef{0.0, 0.0, 1.0}; + for (size_t i = 0; i < 3; ++i) + CPPUNIT_ASSERT_DOUBLES_EQUAL(normalRef[i], normal[i], 1E-6); +} + +void ConeTest::testSecondArea() +{ + // primitive type + CPPUNIT_ASSERT_EQUAL(PrimitiveType::Plane, areas->getPrimitiveType(0)); + // node ids + std::vector nodeIdsRef = { + 572, 573, 574, 575, 576, 577, 578, 579, 580, 581, 582, 583, + 584, 585, 586, 587, 588, 589, 590, 591, 592, 593, 594, 595, + 596, 597, 598, 599, 600, 601, 602, 603, 604, 605, 606, 607, + 608, 609, 610, 611, 612, 613, 614, 615, 616, 617, 618, 619, + 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 631, + 632, 633, 634, 635, 636, 637, 638, 639, 640, 641, 642, 643, + 644, 645, 646, 647, 648, 649, 650, 651, 652, 653, 654, 655, + 656, 657, 658, 659, 660, 661, 662, 663, 664, 665, 666, 667, + 668, 669, 670, 671, 672, 673, 674, 675, 676, 677, 678, 679, + 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691, + 692, 693, 694, 695, 696, 697, 698, 699, 700, 701, 702, 703, + 704, 705, 706, 707, 708, 709, 710, 711, 712, 713, 714, 715, + 716, 717, 718, 719, 720, 721, 722, 723, 724, 725, 726, 727, + 728, 729, 730, 731, 732, 733, 734, 735, 736, 737, 738, 739, + 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, 751, + 752, 753, 754, 755, 756, 757, 758, 759, 760, 761, 762, 763, + 764, 765, 766, 767, 768, 769, 770, 771, 772, 773, 774, 775, + 776, 777, 778, 779, 780, 781, 782, 783, 784, 785, 786, 787, + 788, 789, 790, 791, 792, 793, 794, 795, 796, 797, 798, 799, + 800, 801, 802, 803, 804, 805, 806, 807, 808, 809, 810, 811, + 812, 813, 814, 815, 816, 817, 818, 819, 820, 821, 822, 823, + 824, 825, 826, 827, 828, 829, 830, 831, 832, 833, 834, 835, + 836, 837, 838, 839, 840, 841, 842, 843, 844, 845, 846, 847, + 848, 849, 850, 851, 852, 853, 854, 855, 856, 857, 858, 859, + 860, 861, 862, 863, 864, 865, 866, 867, 868, 869, 870, 871, + 872, 873, 874, 875, 876, 877, 878, 879, 880, 881, 882, 883, + 884, 885, 886, 887, 888, 889, 890, 891, 892, 893, 894, 895, + 896, 897, 898, 899, 900, 901, 902, 903, 904, 905, 906, 907, + 908, 909, 910, 911, 912, 913, 914, 915, 916, 917, 918, 919, + 920, 921, 922, 923, 924, 925, 926, 927, 928, 929, 930, 931, + 932, 933, 934, 935, 936, 937, 938, 939, 940, 941, 942, 943, + 944, 945, 946, 947, 948, 949, 950, 951, 952, 953, 954, 955, + 956}; + std::vector nodeIds = areas->getNodeIds(1); + std::sort(nodeIds.begin(), nodeIds.end()); + CPPUNIT_ASSERT_EQUAL(nodeIdsRef.size(), nodeIds.size()); + for (size_t i = 0; i < nodeIds.size(); ++i) + CPPUNIT_ASSERT_EQUAL(nodeIdsRef[i], nodeIds[i]); + // normal + std::array normal = areas->getNormal(1); + std::array normalRef = {0.0, 0.0, -1.0}; + for (size_t i = 0; i < 3; ++i) + CPPUNIT_ASSERT_DOUBLES_EQUAL(normalRef[i], normal[i], 1E-6); +} + +void ConeTest::testThirdArea() +{ + // primitive type + CPPUNIT_ASSERT_EQUAL(PrimitiveType::Cone, areas->getPrimitiveType(2)); + // node ids + std::vector nodeIdsRef{ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, + 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, + 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, + 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, + 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, + 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, + 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, + 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, + 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, + 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, + 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, + 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, + 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, + 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, + 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, + 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, + 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, + 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, + 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, + 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, + 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, + 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, + 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, + 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, + 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, + 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, + 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, + 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, + 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, + 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, + 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, + 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, + 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, + 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, + 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, + 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, + 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, + 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, + 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, + 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, + 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, + 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, + 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, + 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, 517, + 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, + 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, + 540, 541, 542, 543, 544, 545, 546, 547, 548}; + std::vector nodeIds = areas->getNodeIds(2); + std::sort(nodeIds.begin(), nodeIds.end()); + CPPUNIT_ASSERT_EQUAL(nodeIdsRef.size(), nodeIds.size()); + for (size_t i = 0; i < nodeIds.size(); ++i) + CPPUNIT_ASSERT_EQUAL(nodeIdsRef[i], nodeIds[i]); + // radius + CPPUNIT_ASSERT_DOUBLES_EQUAL(9.893621777737378, areas->getRadius(2), 1E-2); + // angle + CPPUNIT_ASSERT_DOUBLES_EQUAL(0.7869372818478629, areas->getAngle(2), 1E-4); + // axis + std::array axis = areas->getAxis(2); + std::array axisRef{ + -1.17267701e-03, 2.96765974e-04, 9.99999268e-01}; + for (size_t i = 0; i < 3; ++i) + CPPUNIT_ASSERT_DOUBLES_EQUAL(axisRef[i], axis[i], 1E-4); + // axis point + std::array axisPoint = areas->getAxisPoint(2); + std::array axisPointRef{ + -6.50039462e-03, -5.76665576e-05, -3.99198765e+00}; + for (size_t i = 0; i < 3; ++i) + CPPUNIT_ASSERT_DOUBLES_EQUAL( + axisPointRef[i], axisPoint[i], 1E-2); + // apex + std::array apex = areas->getApex(2); + std::array apexRef{ + 1.86120942e-02, 2.86081304e-03, 1.00293742e+01}; + for (size_t i = 0; i < 3; ++i) + CPPUNIT_ASSERT_DOUBLES_EQUAL(apexRef[i], apex[i], 1E-1); +} diff --git a/src/ShapeRecogn/Test/ConeTest.hxx b/src/ShapeRecogn/Test/ConeTest.hxx new file mode 100644 index 000000000..283bfc845 --- /dev/null +++ b/src/ShapeRecogn/Test/ConeTest.hxx @@ -0,0 +1,62 @@ +// Copyright (C) 2007-2024 CEA, EDF +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// + +#ifndef __CONETEST_HXX__ +#define __CONETEST_HXX__ + +#include +#include + +namespace MEDCoupling +{ + class ShapeRecognMesh; + class Areas; + + class ConeTest : public CppUnit::TestFixture + { + CPPUNIT_TEST_SUITE(ConeTest); + CPPUNIT_TEST(testNumberOfAreas); + CPPUNIT_TEST(testComputePlaneProperties); + CPPUNIT_TEST(testComputeCylinderProperties); + CPPUNIT_TEST(testComputeConeProperties); + CPPUNIT_TEST(testFirstArea); + CPPUNIT_TEST(testSecondArea); + CPPUNIT_TEST(testThirdArea); + CPPUNIT_TEST_SUITE_END(); + + public: + void setUp() override; + void tearDown() override; + + void testComputePlaneProperties(); + void testComputeCylinderProperties(); + void testComputeConeProperties(); + + void testNumberOfAreas(); + void testFirstArea(); + void testSecondArea(); + void testThirdArea(); + + private: + ShapeRecognMesh *srMesh = 0; + const Areas *areas; + }; +}; + +#endif // __CONETEST_HXX__ diff --git a/src/ShapeRecogn/Test/TestShapeRecogn.cxx b/src/ShapeRecogn/Test/TestShapeRecogn.cxx index 89946ba5e..134f35b4b 100644 --- a/src/ShapeRecogn/Test/TestShapeRecogn.cxx +++ b/src/ShapeRecogn/Test/TestShapeRecogn.cxx @@ -20,9 +20,11 @@ #include "MathOpsTest.hxx" #include "PlaneTest.hxx" #include "CylinderTest.hxx" +#include "ConeTest.hxx" CPPUNIT_TEST_SUITE_REGISTRATION(MEDCoupling::MathOpsTest); CPPUNIT_TEST_SUITE_REGISTRATION(MEDCoupling::PlaneTest); CPPUNIT_TEST_SUITE_REGISTRATION(MEDCoupling::CylinderTest); +CPPUNIT_TEST_SUITE_REGISTRATION(MEDCoupling::ConeTest); #include "BasicMainTest.hxx"