From 3a1d4824e41c5d3a3e96f60d9ccc1338e5fbbe81 Mon Sep 17 00:00:00 2001 From: ageay Date: Tue, 2 Apr 2013 16:12:20 +0000 Subject: [PATCH] Bug correction of MEDCouplingUMesh::convertExtrudedPolyhedra --- .../Test/MEDCouplingBasicsTest4.cxx | 20 +++++++++---------- src/MEDCoupling_Swig/MEDCouplingBasicsTest.py | 10 +--------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest4.cxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest4.cxx index 3a0f222ed..cba01a300 100644 --- a/src/MEDCoupling/Test/MEDCouplingBasicsTest4.cxx +++ b/src/MEDCoupling/Test/MEDCouplingBasicsTest4.cxx @@ -1635,17 +1635,15 @@ void MEDCouplingBasicsTest4::testConvertExtrudedPolyhedra1() CPPUNIT_ASSERT_EQUAL((std::size_t)10,dai->getNbOfElems()); CPPUNIT_ASSERT_EQUAL((std::size_t)159,da->getNbOfElems()); // - const int expected1[159]={14, 1, 2, 3, 4, - 18, 5, 6, 7, 8, 9, 10, 11, 12, - 14, 13, 14, 15, 16, - 31, 17, 18, 19, -1, 20, 22, 21, -1, 17, 18, 21, 20, -1, 18, 19, 22, 21, -1, 19, 17, 20, - 22, - 16, 23, 24, 25, 26, 27, 28, - 31, 29, 30, 31, 32, 33, -1, 34, 38, 37, 36, 35, -1, 29, 30, 35, 34, -1, 30, 31, 36, 35, -1, 31, 32, 37, 36, -1, 32, 33, 38, 37, - -1, 33, 29, 34, 38, - 18, 39, 40, 41, 42, 43, 44, 45, 46, - 22, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, - 31, 59, 60, 61, 62, 63, 64, 65, -1, 66, 72, 71, 70, 69, 68, 67, -1, 59, 60, 67, 66, -1, 60, 61, 68, 67, -1, 61, 62, 69, 68, -1, 62, 63, 70, 69, -1, 63, 64, 71, 70, -1, 64, 65, 72, 71, -1, 65, 59, 66, 72}; + const int expected1[159]={14,1,2,3,4, + 18,5,6,7,8,9,10,11,12, + 14,13,14,15,16, + 31,17,18,19,-1,20,22,21,-1,17,20,21,18,-1,18,21,22,19,-1,19,22,20,17, + 16,23,24,25,26,27,28, + 31,29,30,31,32,33,-1,34,38,37,36,35,-1,29,34,35,30,-1,30,35,36,31,-1,31,36,37,32,-1,32,37,38,33,-1,33,38,34,29, + 18,39,40,41,42,43,44,45,46, + 22,47,48,49,50,51,52,53,54,55,56,57,58, + 31,59,60,61,62,63,64,65,-1,66,72,71,70,69,68,67,-1,59,66,67,60,-1,60,67,68,61,-1,61,68,69,62,-1,62,69,70,63,-1,63,70,71,64,-1,64,71,72,65,-1,65,72,66,59}; const int expected2[10]={0,5,14,19,42,49,86,95,108,159}; CPPUNIT_ASSERT(std::equal(expected1,expected1+159,da->getConstPointer())); CPPUNIT_ASSERT(std::equal(expected2,expected2+10,dai->getConstPointer())); diff --git a/src/MEDCoupling_Swig/MEDCouplingBasicsTest.py b/src/MEDCoupling_Swig/MEDCouplingBasicsTest.py index 0b7838de8..585018792 100644 --- a/src/MEDCoupling_Swig/MEDCouplingBasicsTest.py +++ b/src/MEDCoupling_Swig/MEDCouplingBasicsTest.py @@ -7957,15 +7957,7 @@ class MEDCouplingBasicsTest(unittest.TestCase): self.assertEqual(10,dai.getNbOfElems()); self.assertEqual(159,da.getNbOfElems()); # - expected1=[14, 1, 2, 3, 4, - 18, 5, 6, 7, 8, 9, 10, 11, 12, - 14, 13, 14, 15, 16, - 31, 17, 18, 19, -1, 20, 22, 21, -1, 17, 18, 21, 20, -1, 18, 19, 22, 21, -1, 19, 17, 20, 22, - 16, 23, 24, 25, 26, 27, 28, - 31, 29, 30, 31, 32, 33, -1, 34, 38, 37, 36, 35, -1, 29, 30, 35, 34, -1, 30, 31, 36, 35, -1, 31, 32, 37, 36, -1, 32, 33, 38, 37, -1, 33, 29, 34, 38, - 18, 39, 40, 41, 42, 43, 44, 45, 46, - 22, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, - 31, 59, 60, 61, 62, 63, 64, 65, -1, 66, 72, 71, 70, 69, 68, 67, -1, 59, 60, 67, 66, -1, 60, 61, 68, 67, -1, 61, 62, 69, 68, -1, 62, 63, 70, 69, -1, 63, 64, 71, 70, -1, 64, 65, 72, 71, -1, 65, 59, 66, 72]; + expected1=[14,1,2,3,4,18,5,6,7,8,9,10,11,12,14,13,14,15,16,31,17,18,19,-1,20,22,21,-1,17,20,21,18,-1,18,21,22,19,-1,19,22,20,17,16,23,24,25,26,27,28,31,29,30,31,32,33,-1,34,38,37,36,35,-1,29,34,35,30,-1,30,35,36,31,-1,31,36,37,32,-1,32,37,38,33,-1,33,38,34,29,18,39,40,41,42,43,44,45,46,22,47,48,49,50,51,52,53,54,55,56,57,58,31,59,60,61,62,63,64,65,-1,66,72,71,70,69,68,67,-1,59,66,67,60,-1,60,67,68,61,-1,61,68,69,62,-1,62,69,70,63,-1,63,70,71,64,-1,64,71,72,65,-1,65,72,66,59]; expected2=[0,5,14,19,42,49,86,95,108,159] self.assertEqual(expected1,da.getValues()); self.assertEqual(expected2,dai.getValues()); -- 2.39.2