From: <jpi...@us...> - 2012-09-22 10:03:27
|
Revision: 11071 http://octave.svn.sourceforge.net/octave/?rev=11071&view=rev Author: jpicarbajal Date: 2012-09-22 10:03:17 +0000 (Sat, 22 Sep 2012) Log Message: ----------- mechanics: All copyrights fixed. hopefully :D Modified Paths: -------------- trunk/octave-forge/main/mechanics/inst/core/EAmatrix.m trunk/octave-forge/main/mechanics/inst/core/RBequations_rot.m trunk/octave-forge/main/mechanics/inst/core/private/drawAxis3D.m Modified: trunk/octave-forge/main/mechanics/inst/core/EAmatrix.m =================================================================== --- trunk/octave-forge/main/mechanics/inst/core/EAmatrix.m 2012-09-22 08:40:14 UTC (rev 11070) +++ trunk/octave-forge/main/mechanics/inst/core/EAmatrix.m 2012-09-22 10:03:17 UTC (rev 11071) @@ -1,17 +1,17 @@ -%%copyright (c) 2011 Juan Pablo Carbajal <car...@if...> +%% Copyright (c) 2012 Juan Pablo Carbajal <car...@if...> %% -%% This program is free software: youcan redistribute itand/or modify -%% it under the terms of the GNU General Public Licenseas publishedby -%% the Free Software Foundation, either version 3 of the License, or -%% any later version. +%% This program is free software; you can redistribute it and/or modify +%% it under the terms of the GNU General Public License as published by +%% the Free Software Foundation; either version 3 of the License, or +%% (at your option) any later version. %% -%% This program is distributed in the hope that it willbe useful, -%% but WITHOUTaNY WARRANTY; without even the implied warranty of -%% MERCHANTABILITY or FITNESS FORa PARTICULAR PURPOSE. See the -%% GNU General Public License for more details. +%% This program is distributed in the hope that it will be useful, +%% but WITHOUT ANY WARRANTY; without even the implied warranty of +%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +%% GNU General Public License for more details. %% -%% You should have receivedacopy of the GNU General Public License -%% along with this program. If not, see <http://www.gnu.org/licenses/>. +%% You should have received a copy of the GNU General Public License +%% along with this program; if not, see <http://www.gnu.org/licenses/>. %% -*- texinfo -*- %% @deftypefn {Function File} {@var{output} = } EAmatrix (@var{angles}, @var{convention}) Modified: trunk/octave-forge/main/mechanics/inst/core/RBequations_rot.m =================================================================== --- trunk/octave-forge/main/mechanics/inst/core/RBequations_rot.m 2012-09-22 08:40:14 UTC (rev 11070) +++ trunk/octave-forge/main/mechanics/inst/core/RBequations_rot.m 2012-09-22 10:03:17 UTC (rev 11071) @@ -1,26 +1,26 @@ -%%copyright (c) 2011 Juan Pablocarbajal <car...@if...> -%% -%% This program is free software: youcan redistribute itand/or modify -%% it under the terms of the GNU General Public Licenseas publishedby -%% the Free Software Foundation, either version 3 of the License, or -%% any later version. -%% -%% This program is distributed in the hope that it willbe useful, -%% but WITHOUTaNY WARRANTY; without even the implied warranty of -%% MERCHANTABILITY or FITNESS FORa PARTICULAR PURPOSE. See the -%% GNU General Public License for more details. -%% -%% You should have receivedacopy of the GNU General Public License -%% along with this program. If not, see <http://www.gnu.org/licenses/>. +## Copyright (c) 2012 Juan Pablo Carbajal <car...@if...> +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program; if not, see <http://www.gnu.org/licenses/>. -%% -*- texinfo -*- -%% @deftypefn {Function File} {@var{dqdt} = } RBequations_rot (@var{t}, @var{q}, @var{opt}) -%% Rotational equations of motion of rigid body fixed in one point. -%% @end deftypefn +## -*- texinfo -*- +## @deftypefn {Function File} {@var{dqdt} = } RBequations_rot (@var{t}, @var{q}, @var{opt}) +## Rotational equations of motion of rigid body fixed in one point. +## @end deftypefn function dqdt = RBequations_rot(t,q, opt) -% TODO -% 2. Actuation +# TODO +# 2. Actuation w = q(1:3,1).'; s = q(4:7,1).'; @@ -29,18 +29,17 @@ m = opt.Mass; Rcm = quatvrot(opt.CoM,s); grav = opt.Gravity; - - + + Tgrav = quatvrot((cross(Rcm,m*grav)),quatconj(s)); dqdt = zeros(7,1); - %% Euler Equations + ## Euler Equations dqdt(1:3,1) = (cross( I .* w, w ) + Tgrav)./I; - - %% Quaternion equation + + ## Quaternion equation Omega = unvech ([0 ; q(1:3,1); 0; -q(3,1); q(2,1); 0; -q(1,1); 0],-1); dqdt(4:7,1) = 0.5*Omega*q(4:7,1); - -endfunction +endfunction Modified: trunk/octave-forge/main/mechanics/inst/core/private/drawAxis3D.m =================================================================== --- trunk/octave-forge/main/mechanics/inst/core/private/drawAxis3D.m 2012-09-22 08:40:14 UTC (rev 11070) +++ trunk/octave-forge/main/mechanics/inst/core/private/drawAxis3D.m 2012-09-22 10:03:17 UTC (rev 11071) @@ -1,17 +1,17 @@ -%%copyright (c) 2011 Juan Pablocarbajal <car...@if...> -%% -%% This program is free software: youcan redistribute itand/or modify -%% it under the terms of the GNU General Public Licenseas publishedby -%% the Free Software Foundation, either version 3 of the License, or -%% any later version. -%% -%% This program is distributed in the hope that it willbe useful, -%% but WITHOUTaNY WARRANTY; without even the implied warranty of -%% MERCHANTABILITY or FITNESS FORa PARTICULAR PURPOSE. See the -%% GNU General Public License for more details. -%% -%% You should have receivedacopy of the GNU General Public License -%% along with this program. If not, see <http://www.gnu.org/licenses/>. +## Copyright (c) 2012 Juan Pablo Carbajal <car...@if...> +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program; if not, see <http://www.gnu.org/licenses/>. function drawAxis3D (p,E,c) for i=1:3 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |