]> SALOME platform Git repositories - tools/medcoupling.git/commitdiff
Salome HOME
For 0.11.0 scipy users. spdiags used instead of diags.
authorageay <ageay>
Wed, 27 Nov 2013 09:40:31 +0000 (09:40 +0000)
committerageay <ageay>
Wed, 27 Nov 2013 09:40:31 +0000 (09:40 +0000)
src/MEDCoupling_Swig/MEDCouplingRemapperTest.py

index 9c463ca08e3b7710fa094977c2f84801de8e8dd5..9d4b26947123841f430bb00aecff93a7ca60bfcd 100644 (file)
@@ -591,7 +591,7 @@ class MEDCouplingBasicsTest(unittest.TestCase):
     def testGetCrudeCSRMatrix1(self):
         """ testing CSR matrix output using numpy/scipy.
         """
-        from scipy.sparse import diags
+        from scipy.sparse import spdiags #diags
         import scipy
         from numpy import array
         arr=DataArrayDouble(3) ; arr.iota()
@@ -620,7 +620,8 @@ class MEDCouplingBasicsTest(unittest.TestCase):
         self.assertEqual(diff.getnnz(),0)
         # IntegralGlobConstraint (division by sum of cols)
         colSum=m.sum(axis=0)
-        m_0=m*diags(array(1/colSum),[0])
+        # version 0.12.0 # m_0=m*diags(array(1/colSum),[0])
+        m_0=m*spdiags(array(1/colSum),[0],colSum.shape[1],colSum.shape[1])
         del colSum
         self.assertAlmostEqual(m_0[0,0],0.625,12)
         self.assertAlmostEqual(m_0[1,0],0.25,12)
@@ -632,7 +633,8 @@ class MEDCouplingBasicsTest(unittest.TestCase):
         self.assertEqual(m_0.getnnz(),7)
         # ConservativeVolumic (division by sum of rows)
         rowSum=m.sum(axis=1)
-        m_1=diags(array(1/rowSum.transpose()),[0])*m
+        # version 0.12.0 # m_1=diags(array(1/rowSum.transpose()),[0])*m
+        m_1=spdiags(array(1/rowSum.transpose()),[0],rowSum.shape[0],rowSum.shape[0])*m
         del rowSum
         self.assertAlmostEqual(m_1[0,0],1.,12)
         self.assertAlmostEqual(m_1[1,0],0.4,12)