Skip to content

Commit

Permalink
Update drakeFunction.geometry
Browse files Browse the repository at this point in the history
  • Loading branch information
avalenzu committed Jul 29, 2015
1 parent f508289 commit 80454ae
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
3 changes: 1 addition & 2 deletions solvers/+drakeFunction/+geometry/+test/testDesiredQuatDiff.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
function testDesiredQuatDiff
import drakeFunction.*
import drakeFunction.frame.*
import drakeFunction.geometry.*

quat_des = randn(4,1);
Expand All @@ -17,4 +16,4 @@
d = des_quat_diff_fcn.eval([1;0;0;0]);
axis_des = quat2axis(quat_des);
valuecheck(cos(axis_des(4)),d,1e-5);
end
end
8 changes: 4 additions & 4 deletions solvers/+drakeFunction/+geometry/DesiredQuatDiff.m
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
norm_quat_des = norm(quat_des);
valuecheck(norm_quat_des,1,1e-4);
quat_des = quat_des/norm_quat_des;
input_frame = drakeFunction.frames.realCoordinateSpace(4);
output_frame = drakeFunction.frames.realCoordinateSpace(1);
obj = [email protected](input_frame,output_frame);
dim_input = 4;
dim_output = 1;
obj = [email protected](dim_input, dim_output);
obj.quat_des = quat_des;
end

Expand All @@ -33,4 +33,4 @@
end
end
end
end
end

0 comments on commit 80454ae

Please sign in to comment.