X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling_Swig%2FMEDCouplingBasicsTest.py;h=0f7e74cf0787044b4ce83628eef6ba0ab701c653;hb=e440c33e8d9c04788fe848fe58d1e17cbea27e54;hp=b0523db87ecd7c3fb226f5da262b1fa2be5856da;hpb=48e298dbf14059e3392eb522cfdb634bfefeaf1b;p=tools%2Fmedcoupling.git diff --git a/src/MEDCoupling_Swig/MEDCouplingBasicsTest.py b/src/MEDCoupling_Swig/MEDCouplingBasicsTest.py index b0523db87..0f7e74cf0 100644 --- a/src/MEDCoupling_Swig/MEDCouplingBasicsTest.py +++ b/src/MEDCoupling_Swig/MEDCouplingBasicsTest.py @@ -21,7 +21,9 @@ from MEDCoupling import * import unittest from math import pi,e,sqrt,cos,sin +from datetime import datetime from MEDCouplingDataForTest import MEDCouplingDataForTest +import rlcompleter,readline # this line has to be here, ot ensure a usability of MEDCoupling/MEDLoader. B4 removing it please notify to anthony.geay@cea.fr class MEDCouplingBasicsTest(unittest.TestCase): def testArray2(self): @@ -89,6 +91,21 @@ class MEDCouplingBasicsTest(unittest.TestCase): -0.305, 0.024155, 0.04183768725682622, -0.2863, 0.04831000000000001, -1.015761910347357e-17, -0.2863, 0.09662000000000001, -1.832979297858306e-18, -0.2863, 0.120775, 0.04183768725682623, -0.2863, 0.09662000000000001, 0.08367537451365245, -0.2863, 0.04831000000000001, 0.08367537451365246, -0.2863 ] + self.assertEqual(MEDCouplingMesh.GetNumberOfNodesOfGeometricType(NORM_TRI3),3) + self.assertTrue(MEDCouplingMesh.IsStaticGeometricType(NORM_TRI3)) + self.assertTrue(MEDCouplingMesh.IsLinearGeometricType(NORM_TRI3)) + self.assertEqual(MEDCouplingMesh.GetDimensionOfGeometricType(NORM_TRI3),2) + self.assertEqual(MEDCouplingMesh.GetReprOfGeometricType(NORM_TRI3),"NORM_TRI3") + self.assertRaises(InterpKernelException,MEDCouplingMesh.GetNumberOfNodesOfGeometricType,NORM_POLYGON) + self.assertTrue(not MEDCouplingMesh.IsStaticGeometricType(NORM_POLYGON)) + self.assertTrue(MEDCouplingMesh.IsLinearGeometricType(NORM_POLYGON)) + self.assertEqual(MEDCouplingMesh.GetDimensionOfGeometricType(NORM_POLYGON),2) + self.assertEqual(MEDCouplingMesh.GetReprOfGeometricType(NORM_POLYGON),"NORM_POLYGON") + self.assertEqual(MEDCouplingMesh.GetNumberOfNodesOfGeometricType(NORM_TRI6),6) + self.assertTrue(MEDCouplingMesh.IsStaticGeometricType(NORM_TRI6)) + self.assertTrue(not MEDCouplingMesh.IsLinearGeometricType(NORM_TRI6)) + self.assertEqual(MEDCouplingMesh.GetDimensionOfGeometricType(NORM_TRI6),2) + self.assertEqual(MEDCouplingMesh.GetReprOfGeometricType(NORM_TRI6),"NORM_TRI6") mesh=MEDCouplingUMesh.New() mesh.setMeshDimension(2) mesh.allocateCells(8); @@ -582,6 +599,7 @@ class MEDCouplingBasicsTest(unittest.TestCase): self.assertTrue(not fieldOnNodes1.isEqual(fieldOnCells1,1e-12,1e-15)); # fieldOnCells2=MEDCouplingFieldDouble.New(ON_CELLS,ONE_TIME); + self.assertEqual(fieldOnCells2.getMesh(),None) # to check that convertMesh wrapping do not raise but return Py_None self.assertTrue(not fieldOnCells1.isEqual(fieldOnCells2,1e-12,1e-15)); self.assertTrue(not fieldOnCells2.isEqual(fieldOnCells1,1e-12,1e-15)); fieldOnCells1=MEDCouplingFieldDouble.New(ON_CELLS,ONE_TIME); @@ -1814,11 +1832,8 @@ class MEDCouplingBasicsTest(unittest.TestCase): self.assertEqual(1, len(dis)); self.assertEqual(NORM_HEXA8, dis[0][0]); self.assertEqual(27, dis[0][1]); - self.assertEqual(0, dis[0][2]); + self.assertEqual(-1, dis[0][2]); - idsPerType=[] - self.assertRaises(InterpKernelException, mesh1.checkTypeConsistencyAndContig, dis, idsPerType); - dis[0][2]=-1; idsPerType=[] self.assertTrue(not mesh1.checkTypeConsistencyAndContig(dis, idsPerType)); dis[0][0]=NORM_QUAD4; @@ -1827,20 +1842,20 @@ class MEDCouplingBasicsTest(unittest.TestCase): dis[0][2]=0; ids=DataArrayInt.New(); ids.alloc(10, 1); - ids.fillWithValue(111); + ids.fillWithValue(23); idsPerType=[ids]; check=mesh1.checkTypeConsistencyAndContig(dis, idsPerType); self.assertTrue(check); self.assertTrue(check.isEqual(ids)); code, idsInPflPerType, pfls=mesh1.splitProfilePerType(ids); - self.assertEqual(3, len(code)); - self.assertEqual(NORM_HEXA8, code[0]); - self.assertEqual(27, code[1]); - self.assertEqual(0, code[2]); + self.assertEqual(1, len(code)); + self.assertEqual(NORM_HEXA8, code[0][0]); + self.assertEqual(27, code[0][1]); + self.assertEqual(0, code[0][2]); self.assertEqual(1, len(idsInPflPerType)); self.assertEqual(1, len(pfls)); - self.assertTrue(idsInPflPerType[0].isEqual(ids)); + self.assertTrue(idsInPflPerType[0].isEqual(DataArrayInt([0,1,2,3,4,5,6,7,8,9]))); self.assertTrue(pfls[0].isEqual(ids)); cells1=[0, 1, 25, 26] @@ -3505,6 +3520,13 @@ class MEDCouplingBasicsTest(unittest.TestCase): self.assertAlmostEqual(5.6,f2.getIJ(i,0),13); pass # + d2,d2I=array.maxPerTupleWithCompoId() + self.assertEqual(1,d2.getNumberOfComponents()); + self.assertEqual(5,d2.getNumberOfTuples()); + for i in xrange(5): + self.assertAlmostEqual(5.6,d2.getIJ(i,0),13); + pass + self.assertTrue(d2I.isEqual(DataArrayInt([4,3,2,0,1]))) pass def testChangeNbOfComponents(self): @@ -7720,12 +7742,10 @@ class MEDCouplingBasicsTest(unittest.TestCase): d.setValues(val1,3,1); d.setName("sup") code,idsInPflPerType,pfls=m.splitProfilePerType(d); - self.assertEqual(6,len(code)); + self.assertEqual(2,len(code)); self.assertEqual(2,len(idsInPflPerType)); - expected1=[3,1,0, 4,2,1] - for i in xrange(6): - self.assertEqual(expected1[i],code[i]); - pass + expected1=[[3,1,0], [4,2,1]] + self.assertEqual(expected1,code) self.assertEqual(2,len(idsInPflPerType)); self.assertEqual(1,idsInPflPerType[0].getNumberOfTuples()); self.assertEqual(0,idsInPflPerType[0].getIJ(0,0)); @@ -7746,12 +7766,10 @@ class MEDCouplingBasicsTest(unittest.TestCase): d=DataArrayInt.New(); d.setValues(val2,4,1); code,idsInPflPerType,pfls=m.splitProfilePerType(d); - self.assertEqual(6,len(code)); + self.assertEqual(2,len(code)); self.assertEqual(2,len(idsInPflPerType)); - expected2=[3,1,0, 4,3,-1] - for i in xrange(6): - self.assertEqual(expected2[i],code[i]); - pass + expected2=[[3,1,0], [4,3,-1]] + self.assertEqual(expected2,code); self.assertEqual(2,len(idsInPflPerType)); self.assertEqual(1,idsInPflPerType[0].getNumberOfTuples()); self.assertEqual(0,idsInPflPerType[0].getIJ(0,0)); @@ -7768,12 +7786,10 @@ class MEDCouplingBasicsTest(unittest.TestCase): d=DataArrayInt.New(); d.setValues(val3,3,1); code,idsInPflPerType,pfls=m.splitProfilePerType(d); - self.assertEqual(6,len(code)); + self.assertEqual(2,len(code)); self.assertEqual(2,len(idsInPflPerType)); - expected3=[3,2,0, 4,1,1] - for i in xrange(6): - self.assertEqual(expected3[i],code[i]); - pass + expected3=[[3,2,0], [4,1,1]] + self.assertEqual(expected3,code); self.assertEqual(2,len(idsInPflPerType)); self.assertEqual(2,idsInPflPerType[0].getNumberOfTuples()); self.assertEqual(0,idsInPflPerType[0].getIJ(0,0)); @@ -7791,12 +7807,10 @@ class MEDCouplingBasicsTest(unittest.TestCase): d=DataArrayInt.New(); d.setValues(val4,2,1); code,idsInPflPerType,pfls=m.splitProfilePerType(d); - self.assertEqual(3,len(code)); + self.assertEqual(1,len(code)); self.assertEqual(1,len(idsInPflPerType)); - expected4=[4,2,0] - for i in xrange(3): - self.assertEqual(expected4[i],code[i]); - pass + expected4=[[4,2,0]] + self.assertEqual(expected4,code); self.assertEqual(1,len(idsInPflPerType)); self.assertEqual(2,idsInPflPerType[0].getNumberOfTuples()); self.assertEqual(0,idsInPflPerType[0].getIJ(0,0)); @@ -7868,10 +7882,10 @@ class MEDCouplingBasicsTest(unittest.TestCase): self.assertEqual(2,len(code)); self.assertEqual(3,code[0][0]); self.assertEqual(2,code[0][1]); - self.assertEqual(0,code[0][2]); + self.assertEqual(-1,code[0][2]); self.assertEqual(4,code[1][0]); self.assertEqual(3,code[1][1]); - self.assertEqual(0,code[1][2]); + self.assertEqual(-1,code[1][2]); pass def testNorm2_1(self): @@ -10890,11 +10904,11 @@ class MEDCouplingBasicsTest(unittest.TestCase): m.setCoords(coords) m.allocateCells(0) m.insertNextCell(NORM_TRI3,[0,1,2]) - a,b,c=m.distanceToPoint([-0.335,2.27,1.21]) - self.assertEqual(0,b) ; self.assertEqual(0,c) + a,b=m.distanceToPoint([-0.335,2.27,1.21]) + self.assertEqual(0,b) self.assertAlmostEqual(0.022360988100374124,a,14); - a,b,c=m.distanceToPoint(DataArrayDouble([-0.335,2.27,1.21],1,3)) - self.assertEqual(0,b) ; self.assertEqual(0,c) + a,b=m.distanceToPoint(DataArrayDouble([-0.335,2.27,1.21],1,3)) + self.assertEqual(0,b) self.assertAlmostEqual(0.022360988100374124,a,14); a,b=coords.distanceToTuple([-0.335,2.27,1.21]) self.assertAlmostEqual(5.243302871282566,a,14) @@ -10907,31 +10921,31 @@ class MEDCouplingBasicsTest(unittest.TestCase): m.insertNextCell(NORM_QUAD4,[0,1,2,3]) m.checkCoherency2() self.assertEqual([4,0,1,2,3],m.getNodalConnectivity().getValues()) - a,b,c=m.distanceToPoint([5.,2.,0.1]) - self.assertAlmostEqual(0.1,a,14) ; self.assertEqual(0,b) ; self.assertEqual(1,c) - a,b,c=m.distanceToPoint([5.,-2.,4.]) - self.assertAlmostEqual(sqrt(2*2+4*4),a,14) ; self.assertEqual(0,b) ; self.assertEqual(1,c) + a,b=m.distanceToPoint([5.,2.,0.1]) + self.assertAlmostEqual(0.1,a,14) ; self.assertEqual(0,b) + a,b=m.distanceToPoint([5.,-2.,4.]) + self.assertAlmostEqual(sqrt(2*2+4*4),a,14) ; self.assertEqual(0,b) m.allocateCells(0) m.insertNextCell(NORM_POLYGON,[0,1,2,3]) m.checkCoherency2() self.assertEqual([5,0,1,2,3],m.getNodalConnectivity().getValues()) - a,b,c=m.distanceToPoint([11.,3.,4.]) - self.assertAlmostEqual(sqrt(3*3+4*4),a,14) ; self.assertEqual(0,b) ; self.assertEqual(1,c) - a,b,c=m.distanceToPoint([4.,12.,5.]) - self.assertAlmostEqual(sqrt(4*4+5*5),a,14) ; self.assertEqual(0,b) ; self.assertEqual(2,c) + a,b=m.distanceToPoint([11.,3.,4.]) + self.assertAlmostEqual(sqrt(3*3+4*4),a,14) ; self.assertEqual(0,b) + a,b=m.distanceToPoint([4.,12.,5.]) + self.assertAlmostEqual(sqrt(4*4+5*5),a,14) ; self.assertEqual(0,b) d=DataArrayDouble([-1.2,3.,2.],1,3) for elt in d: - a,b,c=m.distanceToPoint(d) - self.assertAlmostEqual(sqrt(1.2*1.2+2*2),a,14) ; self.assertEqual(0,b) ; self.assertEqual(0,c) + a,b=m.distanceToPoint(d) + self.assertAlmostEqual(sqrt(1.2*1.2+2*2),a,14) ; self.assertEqual(0,b) pass # m=MEDCouplingUMesh("toto",1) coords=DataArrayDouble([0.,0.,4.,0.,0.,4.],3,2) ; m.setCoords(coords) m.allocateCells(0) ; m.insertNextCell(NORM_SEG2,[0,1]) ; m.insertNextCell(NORM_SEG2,[1,2]) - a,b,c=m.distanceToPoint([-0.1,4.1]) - self.assertAlmostEqual(0.14142135623730925,a,14) ; self.assertEqual(-1,b) ; self.assertEqual(2,c) - a,b,c=m.distanceToPoint([0.,3.9]) - self.assertAlmostEqual(0.07071067811865482,a,14) ; self.assertEqual(1,b) ; self.assertEqual(2,c) + a,b=m.distanceToPoint([-0.1,4.1]) + self.assertAlmostEqual(0.14142135623730925,a,14) # b==1 self.assertEqual(2,c) + a,b=m.distanceToPoint([0.,3.9]) + self.assertAlmostEqual(0.07071067811865482,a,14) ; self.assertEqual(1,b) # self.assertEqual(2,c) pass def testSwig2NonRegressionPartitionBySpreadZone1(self): @@ -12570,6 +12584,812 @@ class MEDCouplingBasicsTest(unittest.TestCase): self.assertTrue( field.getArray().getValues() == coords2 ) pass + def testSwig2UMeshDistanceToMesh2(self): + sz=5 + m=MEDCouplingCMesh() + arr=DataArrayDouble(sz+1) ; arr.iota() ; arr/=sz + m.setCoords(arr,arr,arr) + m=m.buildUnstructured() + m1=m.computeSkin() + m1.zipCoords() + c=m1.getCoords()[:] + d=2*(c-[0.5,0.5,0.5])+[0.5,0.5,0.5] + time_deb = datetime.now() + #print "go.." + a,b=m1.distanceToPoints(d) + #print 'time spent in distanceToPoints %s ' %str(datetime.now() - time_deb) + time_deb = datetime.now() + a1=DataArrayDouble(len(d)) + b1=DataArrayInt(len(d)) + m1s=[m1[i] for i in xrange(m1.getNumberOfCells())] + for j,pt in enumerate(d): + eter=1e308 + fter=-1 + for i,miter in enumerate(m1s): + e,f=miter.distanceToPoint(pt) + self.assertEqual(0,f) + if e