Commits

German Larrain  committed 3d09a4c

robot.sensors: renamed 'Sensor' to 'BaseSourceSensor', analogous to 'BaseSignalSensor'.

  • Participants
  • Parent commits 1b6d35b

Comments (0)

Files changed (3)

File ars/model/robot/sensors.py

 
 Some abstract classes are:
 
-* :class:`Sensor`
-* :class:`SingleSignalSensor`, :class:`MultipleSignalsSensor`
+* :class:`BaseSourceSensor`
+* :class:`BaseSignalSensor`
 * :class:`BodySensor`
 * :class:`JointSensor`
 * :class:`SimulationSensor`
 #==============================================================================
 
 
-class Sensor(object):
+class BaseSourceSensor(object):
 
 	"""Abstract base class for all sensors.
 
 			                   sender=self._sender)
 
 
-class BodySensor(Sensor):
+class BodySensor(BaseSourceSensor):
 
 	"""Abstract base class for sensors whose source of data is a body."""
 
 		return self.source
 
 
-class JointSensor(Sensor):
+class JointSensor(BaseSourceSensor):
 
 	"""Abstract base class for sensors whose source of data is a joint."""
 
 	__metaclass__ = ABCMeta
 
 
-class SimulationSensor(Sensor):
+class SimulationSensor(BaseSourceSensor):
 
 	"""Abstract base class for sensors whose source of data is a simulation."""
 
 		return self._sim.sim_time
 
 
-class Laser(Sensor):
+class Laser(BaseSourceSensor):
 
 	"""Laser scanner."""
 

File demos/sensors/joint_power1.py

 	may be modified with :attr:`RAY_ROTATION`.
 
 	.. seealso::
-		:class:`ars.model.robot.sensors.Sensor`
+		:class:`ars.model.robot.sensors.BaseSourceSensor`
 
 	The sensor is created in :meth:`create_sim_objects`:
 		`self.sensor = sen.Laser(space, self.RAY_LENGTH)`

File demos/sensors/laser.py

 	:attr:`RAY_ROTATION`.
 
 	.. seealso::
-		:class:`ars.model.robot.sensors.Sensor`
+		:class:`ars.model.robot.sensors.BaseSourceSensor`
 
 	Sensor is created in the `create_sim_objects` method.
 		`self.sensor = sensors.Laser(space, self.RAY_LENGTH)`
 		"""Create and paint laser's closest contact point.
 
 		The sensor data is included in ``kwargs``. This method is to be
-		called at the the end of :meth:`sensors.Sensor.on_change`, when
+		called at the the end of :meth:`sensors.LaserSensor.on_change`, when
 		the measurement has already been calculated.
 
 		:param sender: signal sender