| Thread Previous • Date Previous • Date Next • Thread Next |
------------------------------------------------------------ revno: 1880 committer: Václav Šmilauer <eudoxos@xxxxxxxx> branch nick: trunk timestamp: Wed 2009-12-09 19:24:09 +0100 message: 1. Finish renaming DeusExMachina -> PartialEngine renamed: pkg/common/DataClass/BoundingVolume/ => pkg/common/DataClass/Bound/ modified: py/linterpolation.py py/system.py py/tests/wrapper.py scripts/simple-scene.py scripts/test-spiral.py scripts/test/Se3Interpolator.py -- lp:yade https://code.launchpad.net/~yade-dev/yade/trunk Your team Yade developers is subscribed to branch lp:yade. To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription.
=== renamed directory 'pkg/common/DataClass/BoundingVolume' => 'pkg/common/DataClass/Bound'
=== modified file 'py/linterpolation.py'
--- py/linterpolation.py 2009-07-07 10:54:14 +0000
+++ py/linterpolation.py 2009-12-09 18:24:09 +0000
@@ -18,7 +18,7 @@
the sanitizeInterpolation function.
There is a c++ template function for interpolating on such sequences in
-pkg/common/Engine/DeusExMachina/LinearInterpolate.hpp (stateful, therefore
+pkg/common/Engine/PartialEngine/LinearInterpolate.hpp (stateful, therefore
fast for sequential reads).
TODO: Interpolating from within python is not (yet) supported.
=== modified file 'py/system.py'
--- py/system.py 2009-12-09 17:11:51 +0000
+++ py/system.py 2009-12-09 18:24:09 +0000
@@ -23,7 +23,7 @@
_noPropsClasses=set(['InteractionContainer','BodyContainer','Functor','Engine','Dispatcher'])
# classes that have special wrappers; only the most-bottom ones, with their names as it is in c++
_pyRootClasses=set([
- 'GlobalEngine','DeusExMachina','Shape','Bound','InteractionGeometry','InteractionPhysics','FileGenerator',
+ 'GlobalEngine','PartialEngine','Shape','Bound','InteractionGeometry','InteractionPhysics','FileGenerator',
'BoundFunctor','InteractionGeometryFunctor','InteractionPhysicsFunctor','LawFunctor','Material','State']
# childless classes
+['BoundDispatcher','InteractionGeometryDispatcher','InteractionPhysicsDispatcher','LawDispatcher','InteractionDispatchers','ParallelEngine']
=== modified file 'py/tests/wrapper.py'
--- py/tests/wrapper.py 2009-12-09 17:11:51 +0000
+++ py/tests/wrapper.py 2009-12-09 18:24:09 +0000
@@ -15,7 +15,7 @@
from yade import *
-rootClasses=set(['GlobalEngine','DeusExMachina','Shape','Bound','InteractionGeometry','InteractionPhysics','FileGenerator','BoundFunctor','InteractionGeometryFunctor','InteractionPhysicsFunctor','LawFunctor','Material','State'])
+rootClasses=set(['GlobalEngine','PartialEngine','Shape','Bound','InteractionGeometry','InteractionPhysics','FileGenerator','BoundFunctor','InteractionGeometryFunctor','InteractionPhysicsFunctor','LawFunctor','Material','State'])
allClasses=system.childClasses('Serializable')
=== modified file 'scripts/simple-scene.py'
--- scripts/simple-scene.py 2009-12-09 17:11:51 +0000
+++ scripts/simple-scene.py 2009-12-09 18:24:09 +0000
@@ -15,7 +15,7 @@
## Engines are called consecutively at each iteration. Their order matters.
##
-## Some of them work by themselves (GlobalEngine, DeusExMachina - the difference of these two is unimportant).
+## Some of them work by themselves (GlobalEngine, PartialEngine - the difference of these two is unimportant).
##
## MetaEngines act as dispatchers and based on the type of objects they operate on, different EngineUnits are called.
o.engines=[
=== modified file 'scripts/test-spiral.py'
--- scripts/test-spiral.py 2009-01-12 18:17:06 +0000
+++ scripts/test-spiral.py 2009-12-09 18:24:09 +0000
@@ -1,7 +1,7 @@
# script for testing InterpolatingSpiralEngine: sphere going in a sphere-like motion around bar
O.bodies.append([utils.box([0,0,0],[.005,.005,1],dynamic=False),utils.sphere([0,.1,-1],.04,dynamic=False)])
O.engines=[
- DeusExMachina('InterpolatingSpiralEngine',{'subscribedBodies':[1],'times':[10,20,30,40,50,60,70,80,90,100],'angularVelocities':[1,2,3,4,5,3,1,-1,-3,0],'axis':[0,0,1],'axisPt':[0,0,0],'period':-1,'slope':.003,'label':'spiral'}),
+ PartialEngine('InterpolatingSpiralEngine',{'subscribedBodies':[1],'times':[10,20,30,40,50,60,70,80,90,100],'angularVelocities':[1,2,3,4,5,3,1,-1,-3,0],'axis':[0,0,1],'axisPt':[0,0,0],'period':-1,'slope':.003,'label':'spiral'}),
]
O.dt=5e-4
O.saveTmp('initial')
=== modified file 'scripts/test/Se3Interpolator.py'
--- scripts/test/Se3Interpolator.py 2008-12-01 19:47:18 +0000
+++ scripts/test/Se3Interpolator.py 2009-12-09 18:24:09 +0000
@@ -5,7 +5,7 @@
])
O.engines=[
- DeusExMachina('Se3Interpolator',{'subscribedBodies':[0],'goal':[10,10,0,0,0,1,pi],'startIter':10,'goalIter':1010,'goalHook':'print "Finished moving the thing!"; O.pause()'}),
+ PartialEngine('Se3Interpolator',{'subscribedBodies':[0],'goal':[10,10,0,0,0,1,pi],'startIter':10,'goalIter':1010,'goalHook':'print "Finished moving the thing!"; O.pause()'}),
]
O.dt=1e-6
print 'Initial se3:',O.bodies[0].phys['se3']
| Thread Previous • Date Previous • Date Next • Thread Next |
