Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions bindings/Modules/tests/SofaDeformable/SpringForceField.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@


def create_scene(root):
root.addObject("RequiredPlugin", name="Sofa.Component.Topology.Container.Grid")
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
root.addObject("RequiredPlugin", name="Sofa.Component.SolidMechanics.Spring")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.Topology.Container.Grid")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.SolidMechanics.Spring")

# Create a simple plane having 3x3 nodes and a size of 3x3 on the yz plane centered on (-0.5,0,0).
root.addChild('plane_1')
Expand Down
12 changes: 6 additions & 6 deletions bindings/Modules/tests/SofaLinearSolver/matrix_access.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ def simulate_beam(self, linear_solver_template):

loop = root.addObject('DefaultAnimationLoop')

root.addObject('RequiredPlugin', name='Sofa.Component.ODESolver.Backward')
root.addObject('RequiredPlugin', name='Sofa.Component.LinearSolver.Direct')
root.addObject('RequiredPlugin', name='Sofa.Component.Engine.Select')
root.addObject('RequiredPlugin', name='Sofa.Component.Constraint.Projective')
root.addObject('RequiredPlugin', name='Sofa.Component.SolidMechanics.FEM.Elastic')
root.addObject('RequiredPlugin', name='Sofa.Component.Mass')
root.addObject('RequiredPlugin', pluginName='Sofa.Component.ODESolver.Backward')
root.addObject('RequiredPlugin', pluginName='Sofa.Component.LinearSolver.Direct')
root.addObject('RequiredPlugin', pluginName='Sofa.Component.Engine.Select')
root.addObject('RequiredPlugin', pluginName='Sofa.Component.Constraint.Projective')
root.addObject('RequiredPlugin', pluginName='Sofa.Component.SolidMechanics.FEM.Elastic')
root.addObject('RequiredPlugin', pluginName='Sofa.Component.Mass')

root.addObject('EulerImplicitSolver', rayleighStiffness="0.1", rayleighMass="0.1")
linear_solver = root.addObject('SparseLDLSolver', name='linear_solver', template=linear_solver_template)
Expand Down
2 changes: 1 addition & 1 deletion bindings/Sofa/tests/Core/Base.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

def create_scene(rootName="root"):
root = Sofa.Core.Node(rootName)
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
return root

class Test(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion bindings/Sofa/tests/Core/BaseData.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def testValue(self, test):

def create_scene(rootName="root"):
root = Sofa.Core.Node(rootName)
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
return root

class Test(unittest.TestCase):
Expand Down
6 changes: 3 additions & 3 deletions bindings/Sofa/tests/Core/BaseLink.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

def create_scene(rootName="root"):
root = Sofa.Core.Node(rootName)
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
root.addObject("RequiredPlugin", name="Sofa.Component.SolidMechanics.Spring")
root.addObject("RequiredPlugin", name="Sofa.Component.Mapping.Linear")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.SolidMechanics.Spring")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.Mapping.Linear")
return root

class Test(unittest.TestCase):
Expand Down
4 changes: 2 additions & 2 deletions bindings/Sofa/tests/Core/BaseObject.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

def create_scene(rootName="root"):
root = Sofa.Core.Node(rootName)
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
root.addObject("RequiredPlugin", name="Sofa.Component.Topology.Container.Constant")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.Topology.Container.Constant")
return root

class Test(unittest.TestCase):
Expand Down
4 changes: 2 additions & 2 deletions bindings/Sofa/tests/Core/Events.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ class Test(unittest.TestCase):
def test_events(self):
"""Test the BuildConstraintSystem and SolveConstraintSystem events."""
node = Sofa.Core.Node("root")
node.addObject("RequiredPlugin", name="Sofa.Component.AnimationLoop")
node.addObject("RequiredPlugin", name="Sofa.Component.Constraint.Lagrangian.Solver")
node.addObject("RequiredPlugin", pluginName="Sofa.Component.AnimationLoop")
node.addObject("RequiredPlugin", pluginName="Sofa.Component.Constraint.Lagrangian.Solver")
node.addObject("FreeMotionAnimationLoop", name="loop")
node.addObject("BlockGaussSeidelConstraintSolver", name="constraintSolver")
controller = node.addObject( MyController() )
Expand Down
24 changes: 12 additions & 12 deletions bindings/Sofa/tests/Core/ForceField.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ def createParticle(node, node_name, use_implicit_scheme, use_iterative_solver):
def rssffScene(use_implicit_scheme=True, use_iterative_solver=True):
node = Sofa.Core.Node("root")
node.addObject('DefaultAnimationLoop')
node.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
node.addObject("RequiredPlugin", name="Sofa.Component.LinearSolver")
node.addObject("RequiredPlugin", name="Sofa.Component.ODESolver")
node.addObject("RequiredPlugin", name="Sofa.Component.Mass")
node.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
node.addObject("RequiredPlugin", pluginName="Sofa.Component.LinearSolver")
node.addObject("RequiredPlugin", pluginName="Sofa.Component.ODESolver")
node.addObject("RequiredPlugin", pluginName="Sofa.Component.Mass")

node.gravity = [0, -10, 0]
createParticle(node, "particle", use_implicit_scheme, use_iterative_solver)
Expand Down Expand Up @@ -108,14 +108,14 @@ def simulate_beam(linear_solver_template):

root.addObject('DefaultAnimationLoop')

root.addObject('RequiredPlugin', name='Sofa.Component.Constraint.Projective')
root.addObject('RequiredPlugin', name='Sofa.Component.Engine.Select')
root.addObject('RequiredPlugin', name='Sofa.Component.LinearSolver.Direct')
root.addObject('RequiredPlugin', name='Sofa.Component.Mass')
root.addObject('RequiredPlugin', name='Sofa.Component.ODESolver.Backward')
root.addObject('RequiredPlugin', name='Sofa.Component.SolidMechanics.FEM.Elastic')
root.addObject('RequiredPlugin', name='Sofa.Component.StateContainer')
root.addObject('RequiredPlugin', name='Sofa.Component.Topology.Container.Grid')
root.addObject('RequiredPlugin', pluginName='Sofa.Component.Constraint.Projective')
root.addObject('RequiredPlugin', pluginName='Sofa.Component.Engine.Select')
root.addObject('RequiredPlugin', pluginName='Sofa.Component.LinearSolver.Direct')
root.addObject('RequiredPlugin', pluginName='Sofa.Component.Mass')
root.addObject('RequiredPlugin', pluginName='Sofa.Component.ODESolver.Backward')
root.addObject('RequiredPlugin', pluginName='Sofa.Component.SolidMechanics.FEM.Elastic')
root.addObject('RequiredPlugin', pluginName='Sofa.Component.StateContainer')
root.addObject('RequiredPlugin', pluginName='Sofa.Component.Topology.Container.Grid')

root.addObject('EulerImplicitSolver', rayleighStiffness="0.1", rayleighMass="0.1")
root.addObject('SparseLDLSolver', template=linear_solver_template)
Expand Down
16 changes: 8 additions & 8 deletions bindings/Sofa/tests/Core/Mass.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ def simulate_beam(linear_solver_template):

root.addObject('DefaultAnimationLoop')

root.addObject('RequiredPlugin', name='Sofa.Component.StateContainer')
root.addObject('RequiredPlugin', name='Sofa.Component.ODESolver.Backward')
root.addObject('RequiredPlugin', name='Sofa.Component.LinearSolver.Direct')
root.addObject('RequiredPlugin', name='Sofa.Component.Engine.Select')
root.addObject('RequiredPlugin', name='Sofa.Component.Constraint.Projective')
root.addObject('RequiredPlugin', name='Sofa.Component.SolidMechanics.FEM.Elastic')
root.addObject('RequiredPlugin', name='Sofa.Component.Mass')
root.addObject('RequiredPlugin', name='Sofa.Component.Topology.Container.Grid')
root.addObject('RequiredPlugin', pluginName='Sofa.Component.StateContainer')
root.addObject('RequiredPlugin', pluginName='Sofa.Component.ODESolver.Backward')
root.addObject('RequiredPlugin', pluginName='Sofa.Component.LinearSolver.Direct')
root.addObject('RequiredPlugin', pluginName='Sofa.Component.Engine.Select')
root.addObject('RequiredPlugin', pluginName='Sofa.Component.Constraint.Projective')
root.addObject('RequiredPlugin', pluginName='Sofa.Component.SolidMechanics.FEM.Elastic')
root.addObject('RequiredPlugin', pluginName='Sofa.Component.Mass')
root.addObject('RequiredPlugin', pluginName='Sofa.Component.Topology.Container.Grid')

root.addObject('EulerImplicitSolver', rayleighStiffness="0.1", rayleighMass="0.1")
root.addObject('SparseLDLSolver', template=linear_solver_template)
Expand Down
32 changes: 16 additions & 16 deletions bindings/Sofa/tests/Simulation/Node.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def test_kwargs_constructor(self):

def test_GetAttr(self):
root = Sofa.Core.Node("rootNode")
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer", name="Sofa.Component.StateContainer")
c = root.addChild("child1")
self.assertTrue(c is not None)
self.assertTrue(root.child1 is not None)
Expand All @@ -52,7 +52,7 @@ def test_GetAttr(self):

def test_init(self):
root = Sofa.Core.Node("rootNode")
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
c = root.addChild("child1")
c = c.addObject("MechanicalObject", name="MO", position=[0.0,1.0,2.0]*100)
root.init()
Expand Down Expand Up @@ -94,7 +94,7 @@ def test_removeChild(self):

def test_createObjectWithParam(self):
root = Sofa.Core.Node("rootNode")
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
root.addObject("MechanicalObject", name="mechanical", position=[[0,0,0],[1,1,1],[2,2,2]])

def test_children_property(self):
Expand Down Expand Up @@ -124,7 +124,7 @@ def test_parents_property(self):

def test_objects_property(self):
root = Sofa.Core.Node("rootNode")
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
child = root.addChild(Sofa.Core.Node("child1"))
child.addObject("MechanicalObject", name="name1")
child.addObject("MechanicalObject", name="name2")
Expand All @@ -134,7 +134,7 @@ def test_objects_property(self):

def test_objects_property_contains_method(self):
root = Sofa.Core.Node("rootNode")
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
child = root.addChild(Sofa.Core.Node("child1"))
child.addObject("MechanicalObject", name="name1")
child.addObject("MechanicalObject", name="name2")
Expand All @@ -146,7 +146,7 @@ def test_objects_property_contains_method(self):

def test_objects_property_remove_at_method(self):
root = Sofa.Core.Node("rootNode")
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
child = root.addChild(Sofa.Core.Node("child1"))
child.addObject("MechanicalObject", name="name1")
child.addObject("MechanicalObject", name="name2")
Expand All @@ -166,7 +166,7 @@ def test_data_property(self):

def test_getItem(self):
root = Sofa.Core.Node("root")
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
node1 = root.addChild('node1')
object1 = root.addObject("MechanicalObject", name="object1")
node2 = node1.addChild('node2')
Expand Down Expand Up @@ -208,20 +208,20 @@ def test_getLink(self):

def test_hasObjectWithFastPath(self):
root = Sofa.Core.Node("root")
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer", name="Sofa.Component.StateContainer")
self.assertTrue(root.hasObject("Sofa.Component.StateContainer"))
self.assertFalse(root.hasObject("NonExistingObjectName"))

def test_hasObjectWithDefaultPythonFunction(self):
root = Sofa.Core.Node("root")
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer", name="Sofa.Component.StateContainer")

self.assertTrue(hasattr(root, "Sofa.Component.StateContainer"))
self.assertFalse(hasattr(root, "NonExistingObjectName"))

def test_removeObject(self):
root = Sofa.Core.Node("root")
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
child = root.addChild(Sofa.Core.Node("child1"))

obj1 = child.addObject("MechanicalObject", name="obj1")
Expand Down Expand Up @@ -271,29 +271,29 @@ def test_detachFromGraph(self):

def test_getMass(self):
root = Sofa.Core.Node("root")
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
root.addObject("MechanicalObject")
m = root.addObject("UniformMass", name="mass", vertexMass=0.1)
self.assertEqual(m,root.getMass())

def test_getForceField(self):
root = Sofa.Core.Node("root")
root.addObject("RequiredPlugin", name="Sofa.Component.MechanicalLoad")
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.MechanicalLoad")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
root.addObject("MechanicalObject")
ff = root.addObject('ConstantForceField', template="Vec3d", name="cff2")
self.assertEqual(ff, root.getForceField(0))

def test_getMechanicalState(self):
root = Sofa.Core.Node("root")
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
c = root.addObject("MechanicalObject")
self.assertEqual(c, root.getMechanicalState())

def test_getMechanicalMapping(self):
root = Sofa.Core.Node("root")
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
root.addObject("RequiredPlugin", name="Sofa.Component.Mapping.Linear")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.Mapping.Linear")
root.addObject("MechanicalObject", name="t1")
root.addObject("MechanicalObject", name="t2")
mm = root.addObject("BarycentricMapping", input="@/t1", output="@/t2")
Expand Down
2 changes: 1 addition & 1 deletion bindings/Sofa/tests/Types/Vec3.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

def create_scene(rootName="root"):
root = Sofa.Core.Node(rootName)
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
return root

class Test(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion bindings/Sofa/tests/bench_datacontainer.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
rawcpy = numpy.zeros((1000000,3), dtype=numpy.float64)

root = Sofa.Core.Node("root")
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
obj = root.createObject("MechanicalObject", name="test", position=rawcpy.tolist())

it=10
Expand Down
2 changes: 1 addition & 1 deletion bindings/Sofa/tests/benchmark.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
aList = rawcpy.tolist()

root = Sofa.Core.Node("root")
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
obj = root.createObject("MechanicalObject", name="test", position=aList)

obj.position = aList
Expand Down
2 changes: 1 addition & 1 deletion bindings/Sofa/tests/dataaccess.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def oldSofa(obj):
aList = zeros.tolist()

root = Sofa.Core.Node("root")
root.addObject("RequiredPlugin", name="Sofa.Component.StateContainer")
root.addObject("RequiredPlugin", pluginName="Sofa.Component.StateContainer")
obj = root.createObject("MechanicalObject", name="test", position=aList)
print("A counter: ", obj.position.getCounter())
obj.position += ones
Expand Down
Loading
Loading