Skip to content

Apply name changing on code and examples #560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bakpaul wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −14
Open

Apply name changing on code and examples #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/src/SofaPython3/SofaConstraintSolver/Binding_ConstraintSolver_doc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Returns the compliance matrix projected in constraint space, built in the constr
example:
------------

constraint_solver = root.addObject("ProjectedGaussSeidelConstraintSolver", tolerance=1e-9, maxIterations=1000)
constraint_solver = root.addObject("BlockGaussSeidelConstraintSolver", tolerance=1e-9, maxIterations=1000)
matrix = constraint_solver.W()
)";

Expand All @@ -45,7 +45,7 @@ Returns the force resulting from the constraints
example:
------------

constraint_solver = root.addObject("ProjectedGaussSeidelConstraintSolver", tolerance=1e-9, maxIterations=1000)
constraint_solver = root.addObject("BlockGaussSeidelConstraintSolver", tolerance=1e-9, maxIterations=1000)
lambda = constraint_solver.lambda_force()
)";

Expand All @@ -56,7 +56,7 @@ Returns the displacement computed without any constraint
example:
------------

constraint_solver = root.addObject("ProjectedGaussSeidelConstraintSolver", tolerance=1e-9, maxIterations=1000)
constraint_solver = root.addObject("BlockGaussSeidelConstraintSolver", tolerance=1e-9, maxIterations=1000)
dfree = constraint_solver.dfree()
)";

Expand Down
2 changes: 1 addition & 1 deletion bindings/Modules/tests/SofaConstraintSolver/matrix_access.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def simulate_pendulum(self):
"Sofa.Component.Topology.Container.Dynamic"])

root.addObject("FreeMotionAnimationLoop", solveVelocityConstraintFirst=True)
root.addObject("ProjectedGaussSeidelConstraintSolver", name="constraint_solver", tolerance=1e-9, maxIterations=1000)
root.addObject("BlockGaussSeidelConstraintSolver", name="constraint_solver", tolerance=1e-9, maxIterations=1000)
root.addObject("StringMeshCreator", name="loader", resolution="20")

root.addObject("EulerImplicitSolver")
Expand Down
2 changes: 1 addition & 1 deletion bindings/Sofa/tests/Core/Events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def test_events(self):
node.addObject("RequiredPlugin", name="Sofa.Component.AnimationLoop")
node.addObject("RequiredPlugin", name="Sofa.Component.Constraint.Lagrangian.Solver")
node.addObject("FreeMotionAnimationLoop", name="loop")
node.addObject("ProjectedGaussSeidelConstraintSolver", name="constraintSolver")
node.addObject("BlockGaussSeidelConstraintSolver", name="constraintSolver")
controller = node.addObject( MyController() )

Sofa.Simulation.init(node)
Expand Down
4 changes: 2 additions & 2 deletions docs/sphinx/source/content/FirstSteps.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ We first add a collision model for the scene in general, that is stating how a c
# Collision pipeline
rootNode.addObject('CollisionPipeline')
rootNode.addObject('FreeMotionAnimationLoop')
rootNode.addObject('ProjectedGaussSeidelConstraintSolver', tolerance="1e-6", maxIterations="1000")
rootNode.addObject('BlockGaussSeidelConstraintSolver', tolerance="1e-6", maxIterations="1000")
rootNode.addObject('BruteForceBroadPhase')
rootNode.addObject('BVHNarrowPhase')
rootNode.addObject('RuleBasedContactManager', responseParams="mu="+str(0.0), name='Response', response='FrictionContactConstraint')
Expand Down Expand Up @@ -435,7 +435,7 @@ Here is the entire code of the scene :
# Collision pipeline
rootNode.addObject('CollisionPipeline')
rootNode.addObject('FreeMotionAnimationLoop')
rootNode.addObject('ProjectedGaussSeidelConstraintSolver', tolerance="1e-6", maxIterations="1000")
rootNode.addObject('BlockGaussSeidelConstraintSolver', tolerance="1e-6", maxIterations="1000")
rootNode.addObject('BruteForceBroadPhase')
rootNode.addObject('BVHNarrowPhase')
rootNode.addObject('RuleBasedContactManager', responseParams="mu="+str(0.0), name='Response', response='FrictionContactConstraint')
Expand Down
4 changes: 2 additions & 2 deletions docs/sphinx/source/content/UsingThePlugin.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ We first add a collision model for the scene in general, that is stating how a c
# Collision pipeline
rootNode.addObject('DefaultPipeline')
rootNode.addObject('FreeMotionAnimationLoop')
rootNode.addObject('ProjectedGaussSeidelConstraintSolver', tolerance="1e-6", maxIterations="1000")
rootNode.addObject('BlockGaussSeidelConstraintSolver', tolerance="1e-6", maxIterations="1000")
rootNode.addObject('BruteForceBroadPhase')
rootNode.addObject('BVHNarrowPhase')
rootNode.addObject('RuleBasedContactManager', responseParams="mu="+str(0.0), name='Response', response='FrictionContactConstraint')
Expand Down Expand Up @@ -473,7 +473,7 @@ Here is the entire code of the scene :
# Collision pipeline
rootNode.addObject('DefaultPipeline')
rootNode.addObject('FreeMotionAnimationLoop')
rootNode.addObject('ProjectedGaussSeidelConstraintSolver', tolerance="1e-6", maxIterations="1000")
rootNode.addObject('BlockGaussSeidelConstraintSolver', tolerance="1e-6", maxIterations="1000")
rootNode.addObject('BruteForceBroadPhase')
rootNode.addObject('BVHNarrowPhase')
rootNode.addObject('RuleBasedContactManager', responseParams="mu="+str(0.0), name='Response', response='FrictionContactConstraint')
Expand Down
2 changes: 1 addition & 1 deletion examples/ReadTheDocs_Example.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def createScene(rootNode):

rootNode.addObject('CollisionPipeline')
rootNode.addObject('FreeMotionAnimationLoop')
rootNode.addObject('ProjectedGaussSeidelConstraintSolver', tolerance="1e-6", maxIterations="1000")
rootNode.addObject('BlockGaussSeidelConstraintSolver', tolerance="1e-6", maxIterations="1000")
rootNode.addObject('BruteForceBroadPhase', name="BroadPhase")
rootNode.addObject('BVHNarrowPhase', name="NarrowPhase")
rootNode.addObject('RuleBasedContactManager', responseParams="mu="+str(0.0), name='Response', response='FrictionContactConstraint')
Expand Down
2 changes: 1 addition & 1 deletion examples/access_compliance_matrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def createScene(root):
])

root.addObject("FreeMotionAnimationLoop", solveVelocityConstraintFirst=True)
constraint_solver = root.addObject("ProjectedGaussSeidelConstraintSolver", tolerance=1e-9, maxIterations=1000)
constraint_solver = root.addObject("BlockGaussSeidelConstraintSolver", tolerance=1e-9, maxIterations=1000)
root.addObject("StringMeshCreator", name="loader", resolution="20")

root.addObject("EulerImplicitSolver")
Expand Down
2 changes: 1 addition & 1 deletion examples/access_constraint_matrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def createScene(root):
])

root.addObject("FreeMotionAnimationLoop", solveVelocityConstraintFirst=True)
root.addObject("ProjectedGaussSeidelConstraintSolver", tolerance=1e-9, maxIterations=1000)
root.addObject("BlockGaussSeidelConstraintSolver", tolerance=1e-9, maxIterations=1000)
root.addObject("StringMeshCreator", name="loader", resolution="20")

root.addObject("EulerImplicitSolver")
Expand Down
2 changes: 1 addition & 1 deletion examples/access_contact_forces.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def createScene(root):

root.addObject('FreeMotionAnimationLoop')
# Constraint solver computing the constraint/contact forces, stored in the constraint space (normal , tangential_1, tangential_2)
constraint_solver = root.addObject('ProjectedGaussSeidelConstraintSolver', maxIterations=1000, tolerance=1e-6, computeConstraintForces=True)
constraint_solver = root.addObject('BlockGaussSeidelConstraintSolver', maxIterations=1000, tolerance=1e-6, computeConstraintForces=True)

root.addObject('VisualStyle', displayFlags="showCollisionModels hideVisualModels showForceFields")
root.addObject('CollisionPipeline', name="collision_pipeline")
Expand Down
2 changes: 1 addition & 1 deletion examples/access_energy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def createScene(rootNode, dt=0.01, m=1, g=1, L=100, mu=0):
rootNode.addObject('ParallelBVHNarrowPhase')
rootNode.addObject('MinProximityIntersection', name='Proximity', alarmDistance='10', contactDistance='0.02')
rootNode.addObject('CollisionResponse', name='Response', response='FrictionContactConstraint', responseParams=f'mu={mu}')
rootNode.addObject('ProjectedGaussSeidelConstraintSolver', maxIterations='10', multithreading='true', tolerance='1.0e-3')
rootNode.addObject('BlockGaussSeidelConstraintSolver', maxIterations='10', multithreading='true', tolerance='1.0e-3')

boxTranslation = "-20 -0.9 0"
rootNode.addObject('MeshOBJLoader', name='Loader-box', filename='mesh/cube.obj', translation=boxTranslation)
Expand Down
Loading