[Avida-SVN] r1896 - branches/uml/source/main

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2007-08-06 12:42:31 -0400 (Mon, 06 Aug 2007)
New Revision: 1896

Modified:
   branches/uml/source/main/cTaskLib.cc
Log:


Modified: branches/uml/source/main/cTaskLib.cc
===================================================================
--- branches/uml/source/main/cTaskLib.cc	2007-08-06 16:23:13 UTC (rev 1895)
+++ branches/uml/source/main/cTaskLib.cc	2007-08-06 16:42:31 UTC (rev 1896)
@@ -3121,31 +3121,31 @@
 		
 		// create the scenario
 		path1.push_back("timerEvent[]/");
-		path1.push_back("[]/^SensorInterface.readSensor()");
+		path1.push_back("[]/^SensorInterface.readObstacleSensor()");
 		path1.push_back("sensorData[]/");
 		path1.push_back("[obstacle=1]/^WheelActuatorInterface.stop()");
 		path1.push_back("wheelStopped[]/");
 		path1.push_back("[]/^NavigationControl.suspend()");
-		path1.push_back("[]/^SensorInterface.readSensor()");
+		path1.push_back("[]/^SensorInterface.readObstacleSensor()");
 		path1.push_back("sensorData[]/");
 		path1.push_back("[]/^NavigationControl.restart()");
 // sequence is repeated to encourage looping.		
 		path1.push_back("timerEvent[]/");
-		path1.push_back("[]/^SensorInterface.readSensor()");
+		path1.push_back("[]/^SensorInterface.readObstacleSensor()");
 		path1.push_back("sensorData[]/");
 		path1.push_back("[obstacle=1]/^WheelActuatorInterface.stop()");
 		path1.push_back("wheelStopped[]/");
 		path1.push_back("[]/^NavigationControl.suspend()");
-		path1.push_back("[]/^SensorInterface.readSensor()");
+		path1.push_back("[]/^SensorInterface.readObstacleSensor()");
 		path1.push_back("sensorData[]/");
 		path1.push_back("[]/^NavigationControl.restart()");
 		path1.push_back("timerEvent[]/");
-		path1.push_back("[]/^SensorInterface.readSensor()");
+		path1.push_back("[]/^SensorInterface.readObstacleSensor()");
 		path1.push_back("sensorData[]/");
 		path1.push_back("[obstacle=1]/^WheelActuatorInterface.stop()");
 		path1.push_back("wheelStopped[]/");
 		path1.push_back("[]/^NavigationControl.suspend()");
-		path1.push_back("[]/^SensorInterface.readSensor()");
+		path1.push_back("[]/^SensorInterface.readObstacleSensor()");
 		path1.push_back("sensorData[]/");
 		path1.push_back("[]/^NavigationControl.restart()");
 		
@@ -3180,16 +3180,16 @@
 		
 		// create the scenario
 		path1.push_back("timerEvent[]/");
-		path1.push_back("[]/^SensorInterface.readSensor()");
+		path1.push_back("[]/^SensorInterface.readObstacleSensor()");
 		path1.push_back("sensorData[]/");
 		path1.push_back("[obstacle=0]/");
 // sequence is repeated to encourage looping.		
 		path1.push_back("timerEvent[]/");
-		path1.push_back("[]/^SensorInterface.readSensor()");
+		path1.push_back("[]/^SensorInterface.readObstacleSensor()");
 		path1.push_back("sensorData[]/");
 		path1.push_back("[obstacle=0]/");
 		path1.push_back("timerEvent[]/");
-		path1.push_back("[]/^SensorInterface.readSensor()");
+		path1.push_back("[]/^SensorInterface.readObstacleSensor()");
 		path1.push_back("sensorData[]/");
 		path1.push_back("[obstacle=0]/");