Remove useless controller

Author: alxbilger

bindings/Sofa/tests/Core/ForceField.py

@@ -95,7 +95,7 @@ def test_2_implicit_direct(self):
     def simulate_beam(linear_solver_template):
         root = Sofa.Core.Node("rootNode")
 
-        loop = root.addObject('DefaultAnimationLoop')
+        root.addObject('DefaultAnimationLoop')
 
         root.addObject('RequiredPlugin', name='Sofa.Component.ODESolver.Backward')
         root.addObject('RequiredPlugin', name='Sofa.Component.LinearSolver.Direct')
@@ -110,40 +110,29 @@ def simulate_beam(linear_solver_template):
         root.addObject('MechanicalObject', name="DoFs")
         root.addObject('UniformMass', name="mass", totalMass="320")
         root.addObject('RegularGridTopology', name="grid", nx="4", ny="4", nz="20", xmin="-9", xmax="-6", ymin="0", ymax="3", zmin="0", zmax="19")
-        root.addObject('BoxROI', name="box", box="-10 -1 -0.0001  -5 4 0.0001")
+        root.addObject('BoxROI', name="box", box=[-10, -1, -0.0001,  -5, 4, 0.0001])
         root.addObject('FixedConstraint', indices="@box.indices")
-        force_field = root.addObject('HexahedronFEMForceField', name="FEM", youngModulus="4000", poissonRatio="0.3", method="large")
-
-        matrix_accessor = root.addObject(MatrixAccessController('MatrixAccessor', name='matrixAccessor', force_field=force_field))
+        root.addObject('HexahedronFEMForceField', name="FEM", youngModulus="4000", poissonRatio="0.3", method="large")
 
         Sofa.Simulation.init(root)
         Sofa.Simulation.animate(root, 0.0001)
 
-        return matrix_accessor.stiffness_matrix
+        return root
 
     def test_stiffness_matrix_access_scalar(self):
 
-        K = self.simulate_beam("CompressedRowSparseMatrixd")
+        root = self.simulate_beam("CompressedRowSparseMatrixd")
+        K = root.FEM.assembleKMatrix()
 
         self.assertEqual(K.ndim, 2)
         self.assertEqual(K.shape, (960, 960))
         self.assertEqual(K.nnz, 52200)
 
     def test_stiffness_matrix_access_blocks3x3(self):
 
-        K = self.simulate_beam("CompressedRowSparseMatrixMat3x3d")
+        root = self.simulate_beam("CompressedRowSparseMatrixMat3x3d")
+        K = root.FEM.assembleKMatrix()
 
         self.assertEqual(K.ndim, 2)
         self.assertEqual(K.shape, (960, 960))
         self.assertEqual(K.nnz, 52200)
-
-
-class MatrixAccessController(Sofa.Core.Controller):
-
-
-    def __init__(self, *args, **kwargs):
-        Sofa.Core.Controller.__init__(self, *args, **kwargs)
-        self.force_field = kwargs.get("force_field")
-
-    def onAnimateEndEvent(self, event):
-        self.stiffness_matrix = self.force_field.assembleKMatrix()

bindings/Sofa/tests/Core/Mass.py

@@ -13,7 +13,7 @@ class Test(unittest.TestCase):
     def simulate_beam(linear_solver_template):
         root = Sofa.Core.Node("rootNode")
 
-        loop = root.addObject('DefaultAnimationLoop')
+        root.addObject('DefaultAnimationLoop')
 
         root.addObject('RequiredPlugin', name='Sofa.Component.ODESolver.Backward')
         root.addObject('RequiredPlugin', name='Sofa.Component.LinearSolver.Direct')
@@ -26,43 +26,31 @@ def simulate_beam(linear_solver_template):
         root.addObject('SparseLDLSolver', applyPermutation="false", template=linear_solver_template)
 
         root.addObject('MechanicalObject', name="DoFs")
-        mass = root.addObject('MeshMatrixMass', name="mass", totalMass="320")
+        root.addObject('MeshMatrixMass', name="mass", totalMass="320")
         root.addObject('RegularGridTopology', name="grid", nx="4", ny="4", nz="20", xmin="-9", xmax="-6", ymin="0", ymax="3", zmin="0", zmax="19")
-        root.addObject('BoxROI', name="box", box="-10 -1 -0.0001  -5 4 0.0001")
+        root.addObject('BoxROI', name="box", box=[-10, -1, -0.0001,  -5, 4, 0.0001])
         root.addObject('FixedConstraint', indices="@box.indices")
         root.addObject('HexahedronFEMForceField', name="FEM", youngModulus="4000", poissonRatio="0.3", method="large")
 
-        matrix_accessor = root.addObject(MatrixAccessController('MatrixAccessor', name='matrixAccessor', mass=mass))
-
         Sofa.Simulation.init(root)
         Sofa.Simulation.animate(root, 0.0001)
 
-        return matrix_accessor.mass_matrix
+        return root
 
-    def test_stiffness_matrix_access_scalar(self):
+    def test_mass_matrix_access_scalar(self):
 
-        M = self.simulate_beam("CompressedRowSparseMatrixd")
+        root = self.simulate_beam("CompressedRowSparseMatrixd")
+        M = root.mass.assembleMMatrix()
 
         self.assertEqual(M.ndim, 2)
         self.assertEqual(M.shape, (960, 960))
         self.assertEqual(M.nnz, 9480)
 
-    def test_stiffness_matrix_access_blocks3x3(self):
+    def test_mass_matrix_access_blocks3x3(self):
 
-        M = self.simulate_beam("CompressedRowSparseMatrixMat3x3d")
+        root = self.simulate_beam("CompressedRowSparseMatrixMat3x3d")
+        M = root.mass.assembleMMatrix()
 
         self.assertEqual(M.ndim, 2)
         self.assertEqual(M.shape, (960, 960))
         self.assertEqual(M.nnz, 9480)
-
-
-
-class MatrixAccessController(Sofa.Core.Controller):
-
-
-    def __init__(self, *args, **kwargs):
-        Sofa.Core.Controller.__init__(self, *args, **kwargs)
-        self.mass = kwargs.get("mass")
-
-    def onAnimateEndEvent(self, event):
-        self.mass_matrix = self.mass.assembleMMatrix()