|
36 | 36 |
|
37 | 37 | logger = logging.getLogger('pypy.planning.ompl')
|
38 | 38 |
|
| 39 | + |
39 | 40 | class OMPLPlanner(BasePlanner):
|
40 | 41 | def __init__(self, algorithm='RRTConnect'):
|
41 | 42 | super(OMPLPlanner, self).__init__()
|
42 | 43 |
|
43 | 44 | self.setup = False
|
44 | 45 | self.algorithm = algorithm
|
45 | 46 |
|
46 |
| - try: |
47 |
| - self.planner = openravepy.RaveCreatePlanner(self.env, 'OMPL_' + algorithm) |
48 |
| - except openravepy.openrave_exception: |
49 |
| - raise UnsupportedPlanningError('Unable to create OMPL planner.') |
| 47 | + planner_name = 'OMPL_{:s}'.format(algorithm) |
| 48 | + self.planner = openravepy.RaveCreatePlanner(self.env, planner_name) |
| 49 | + |
| 50 | + if self.planner is None: |
| 51 | + raise UnsupportedPlanningError( |
| 52 | + 'Unable to create "{:s}" planner.'.format(planner_name)) |
50 | 53 |
|
51 | 54 | def __str__(self):
|
52 | 55 | return 'OMPL {0:s}'.format(self.algorithm)
|
@@ -118,6 +121,7 @@ def _TSRPlan(self, robot, tsrchains, **kw_args):
|
118 | 121 |
|
119 | 122 | return self._Plan(robot, formatted_extra_params=extraParams, **kw_args)
|
120 | 123 |
|
| 124 | + |
121 | 125 | class RRTConnect(OMPLPlanner):
|
122 | 126 | def __init__(self):
|
123 | 127 | OMPLPlanner.__init__(self, algorithm='RRTConnect')
|
@@ -185,10 +189,12 @@ class OMPLSimplifier(BasePlanner):
|
185 | 189 | def __init__(self):
|
186 | 190 | super(OMPLSimplifier, self).__init__()
|
187 | 191 |
|
188 |
| - try: |
189 |
| - self.planner = openravepy.RaveCreatePlanner(self.env, 'OMPL_Simplifier') |
190 |
| - except openravepy.openrave_exception: |
191 |
| - raise UnsupportedPlanningError('Unable to create OMPL planner.') |
| 192 | + planner_name = 'OMPL_Simplifier' |
| 193 | + self.planner = openravepy.RaveCreatePlanner(self.env, planner_name) |
| 194 | + |
| 195 | + if self.planner is None: |
| 196 | + raise UnsupportedPlanningError( |
| 197 | + 'Unable to create OMPL_Simplifier planner.') |
192 | 198 |
|
193 | 199 | def __str__(self):
|
194 | 200 | return 'OMPL Simplifier'
|
|
0 commit comments