Skip to content

fix failing remove gripper link from link-list, (member 'string' list…#1588

Merged
k-okada merged 1 commit into
start-jsk:masterfrom
k-okada:fix_member
May 30, 2016
Merged

fix failing remove gripper link from link-list, (member 'string' list…#1588
k-okada merged 1 commit into
start-jsk:masterfrom
k-okada:fix_member

Conversation

@k-okada

@k-okada k-okada commented May 30, 2016

Copy link
Copy Markdown
Member

…) requries (member 'string' list #'equal)

@k-okada

k-okada commented May 30, 2016

Copy link
Copy Markdown
Member Author

This PR fixes the problem committed in #1529

 (when (member (send (car (last link-list)) :name) (list "right_gripper_vacuum_pad_base" "left_gripper_vacuum_pad_base"))

checks (= name "right_gripper_vacuum_pad_base") and this will not expected behavior, we need to use equal to check them,
This PR uses

(when (member (send (car (last link-list)) :name) (list "right_gripper_vacuum_pad_base" "left_gripper_vacuum_pad_base") :test #'equal)

and
Close #1586

This PR will relax test condition

 -    (assert (< (norm (v- av1 av2)) 10))
 +    (assert (< (norm (v- av1 av2)) 90)) ;;

The IK changes joint-angle value largely, but it seems only two yaw joint rotates and whole arm shape configuration did not change so much, so it is say, in addition to that we added another test

 +    (send *baxter* :angle-vector av1)
 +    (setq av3 (send-message *baxter* robot-model
 +              :inverse-kinematics (send (send *baxter* :rarm :end-coords :copy-worldcoords) :translate #f(0 0 -50))
 +              :move-target (send *baxter* :rarm :end-coords)
 +              :link-list (send *baxter* :link-list (send *baxter* :right_gripper_vacuum_pad_joint :parent-link) (send *baxter* :rarm :root-link))
 +              :debug-view t))
 +    (check-result av2 av3)
 +    (assert (and av2 av3))
 +    (assert (< (norm (v- av2 av3)) 5)) ;;

which checks Normal IK can solve this test.

https://github.com/start-jsk/jsk_apc/pull/1588/files#diff-db451fb82d2b39cbd79d693e2dd9e8d5R37

@pazeshun

pazeshun commented May 30, 2016

Copy link
Copy Markdown
Collaborator

Could you remove tabs?

@pazeshun

Copy link
Copy Markdown
Collaborator

I made #1589 to remove tabs that cause travis failing.
Please check #1589

@k-okada

k-okada commented May 30, 2016

Copy link
Copy Markdown
Member Author

On Mon, May 30, 2016 at 6:43 PM, pazeshun notifications@github.com wrote:

Can you remove tabs?

sorry, updated PR

◉ Kei Okada

@pazeshun

Copy link
Copy Markdown
Collaborator

@k-okada Oh, I already update it in #1589
Will I close #1589

@pazeshun

pazeshun commented May 30, 2016

Copy link
Copy Markdown
Collaborator

I closed #1589
Please merge this

@k-okada k-okada merged commit 0531741 into start-jsk:master May 30, 2016
@k-okada k-okada deleted the fix_member branch May 30, 2016 14:21
@k-okada

k-okada commented May 30, 2016

Copy link
Copy Markdown
Member Author

sorry for late

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants