[Personalrobots-commit] SF.net SVN: personalrobots:[18516] pkg/trunk

[<rdi...@us...>]

Revision: 18516
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=18516&view=rev
Author:   rdiankov
Date:     2009-07-08 23:35:28 +0000 (Wed, 08 Jul 2009)

Log Message:
-----------
removed blacklists

Modified Paths:
--------------
    pkg/trunk/openrave_planning/ormanipulation/octave/MakePR2GraspTables.m
    pkg/trunk/openrave_planning/ormanipulation/octave/startup.m

Removed Paths:
-------------
    pkg/trunk/calibration/laser_camera_calibration/ROS_BUILD_BLACKLIST
    pkg/trunk/openrave_planning/openraveros/ROS_BUILD_BLACKLIST
    pkg/trunk/openrave_planning/ormanipulation/ROS_BUILD_BLACKLIST

Deleted: pkg/trunk/calibration/laser_camera_calibration/ROS_BUILD_BLACKLIST
===================================================================
--- pkg/trunk/calibration/laser_camera_calibration/ROS_BUILD_BLACKLIST	2009-07-08 23:28:18 UTC (rev 18515)
+++ pkg/trunk/calibration/laser_camera_calibration/ROS_BUILD_BLACKLIST	2009-07-08 23:35:28 UTC (rev 18516)
@@ -1 +0,0 @@
-Depends on openraveros, which is blacklisted

Deleted: pkg/trunk/openrave_planning/openraveros/ROS_BUILD_BLACKLIST
===================================================================
--- pkg/trunk/openrave_planning/openraveros/ROS_BUILD_BLACKLIST	2009-07-08 23:28:18 UTC (rev 18515)
+++ pkg/trunk/openrave_planning/openraveros/ROS_BUILD_BLACKLIST	2009-07-08 23:35:28 UTC (rev 18516)
@@ -1,19 +0,0 @@
-In file included from /home/rosbuild/.hudson/jobs/personalrobots-stable-update/workspace/personalrobots/openrave_planning/openraveros/src/session.h:36,
-                 from /home/rosbuild/.hudson/jobs/personalrobots-stable-update/workspace/personalrobots/openrave_planning/openraveros/src/openraveros.cpp:27:
-/home/rosbuild/.hudson/jobs/personalrobots-stable-update/workspace/personalrobots/openrave_planning/openraveros/src/rosserver.h: In member function 'void ROSServer::FillRobotInfo(OpenRAVE::RobotBase*, openraveros::RobotInfo&, uint32_t)':
-/home/rosbuild/.hudson/jobs/personalrobots-stable-update/workspace/personalrobots/openrave_planning/openraveros/src/rosserver.h:829: error: cannot convert 'const char*' to 'const wchar_t*' for argument '1' to 'std::string _stdwcstombs(const wchar_t*)'
-/home/rosbuild/.hudson/jobs/personalrobots-stable-update/workspace/personalrobots/openrave_planning/openraveros/src/rosserver.h: In member function 'bool ROSServer::robot_sensorgetdata_srv(openraveros::robot_sensorgetdata::Request&, openraveros::robot_sensorgetdata::Response&)':
-/home/rosbuild/.hudson/jobs/personalrobots-stable-update/workspace/personalrobots/openrave_planning/openraveros/src/rosserver.h:1326: warning: enumeration value 'ST_Invalid' not handled in switch
-/home/rosbuild/.hudson/jobs/personalrobots-stable-update/workspace/personalrobots/openrave_planning/openraveros/src/rosserver.h:1326: warning: enumeration value 'ST_JointEncoder' not handled in switch
-/home/rosbuild/.hudson/jobs/personalrobots-stable-update/workspace/personalrobots/openrave_planning/openraveros/src/rosserver.h:1326: warning: enumeration value 'ST_Force6D' not handled in switch
-In file included from /home/rosbuild/.hudson/jobs/personalrobots-stable-update/workspace/personalrobots/openrave_planning/openraveros/src/openraveros.cpp:27:
-/home/rosbuild/.hudson/jobs/personalrobots-stable-update/workspace/personalrobots/openrave_planning/openraveros/src/session.h: In member function 'bool SessionServer::Init()':
-/home/rosbuild/.hudson/jobs/personalrobots-stable-update/workspace/personalrobots/openrave_planning/openraveros/src/session.h:96: warning: 'mapName' is deprecated (declared at /home/rosbuild/.hudson/jobs/personalrobots-stable-update/workspace/ros/core/roscpp/include/ros/node.h:1251)
-make[3]: *** [CMakeFiles/openraveros.dir/src/openraveros.o] Error 1
-make[3]: Leaving directory `/home/rosbuild/.hudson/jobs/personalrobots-stable-update/workspace/personalrobots/openrave_planning/openraveros/build'
-make[2]: Leaving directory `/home/rosbuild/.hudson/jobs/personalrobots-stable-update/workspace/personalrobots/openrave_planning/openraveros/build'
-make[1]: Leaving directory `/home/rosbuild/.hudson/jobs/personalrobots-stable-update/workspace/personalrobots/openrave_planning/openraveros/build'
-make[2]: *** [CMakeFiles/openraveros.dir/all] Error 2
-make[1]: *** [all] Error 2
-make: *** [all] Error 2
-[rosmakeall-buildfail] Build of openraveros failed

Deleted: pkg/trunk/openrave_planning/ormanipulation/ROS_BUILD_BLACKLIST
===================================================================
--- pkg/trunk/openrave_planning/ormanipulation/ROS_BUILD_BLACKLIST	2009-07-08 23:28:18 UTC (rev 18515)
+++ pkg/trunk/openrave_planning/ormanipulation/ROS_BUILD_BLACKLIST	2009-07-08 23:35:28 UTC (rev 18516)
@@ -1 +0,0 @@
-Depends on openraveros, which is blacklisted

Modified: pkg/trunk/openrave_planning/ormanipulation/octave/MakePR2GraspTables.m
===================================================================
--- pkg/trunk/openrave_planning/ormanipulation/octave/MakePR2GraspTables.m	2009-07-08 23:28:18 UTC (rev 18515)
+++ pkg/trunk/openrave_planning/ormanipulation/octave/MakePR2GraspTables.m	2009-07-08 23:35:28 UTC (rev 18516)
@@ -64,11 +64,14 @@
 
 orBodySetTransform(Target.id, [0 0 0], [1 0 0 0]); % identity
 
-standoffs = [0.01];
-rolls = [0 pi/2]; % hand is symmetric
+standoffs = [0.01 0.03];
+rolls = [0 pi/4 pi/2]; % hand is symmetric
+use_noise = 0;
+stepsize = 0.02;
+add_spherenorms = 1;
 
 % start simulating grasps
-[GraspTable, GraspStats] = MakeGraspTable(robot,Target,preshapes, standoffs, rolls,0,0.02);
+[GraspTable, GraspStats] = MakeGraspTable(robot,Target,preshapes, standoffs, rolls,use_noise,stepsize,add_spherenorms);
 
 if( ~isempty(GraspTable) && ~isempty(GraspStats) )
     %% save the table

Modified: pkg/trunk/openrave_planning/ormanipulation/octave/startup.m
===================================================================
--- pkg/trunk/openrave_planning/ormanipulation/octave/startup.m	2009-07-08 23:28:18 UTC (rev 18515)
+++ pkg/trunk/openrave_planning/ormanipulation/octave/startup.m	2009-07-08 23:35:28 UTC (rev 18516)
@@ -21,4 +21,4 @@
 orEnvSetOptions('wdims 800 600');
 orEnvSetOptions('simulation timestep 0.001');
 orEnvSetOptions('collision ode');
-%orEnvSetOptions('debug debug');
+orEnvSetOptions('debug debug');


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.