From: <par...@us...> - 2010-05-16 20:22:32
|
Revision: 7313 http://octave.svn.sourceforge.net/octave/?rev=7313&view=rev Author: paramaniac Date: 2010-05-16 20:22:25 +0000 (Sun, 16 May 2010) Log Message: ----------- quaternion_oo: first commit Added Paths: ----------- trunk/octave-forge/extra/quaternion_oo/doc/ trunk/octave-forge/extra/quaternion_oo/inst/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2010-05-17 00:35:26
|
Revision: 7316 http://octave.svn.sourceforge.net/octave/?rev=7316&view=rev Author: paramaniac Date: 2010-05-17 00:35:19 +0000 (Mon, 17 May 2010) Log Message: ----------- quaternion_oo: add files Added Paths: ----------- trunk/octave-forge/extra/quaternion_oo/COPYING trunk/octave-forge/extra/quaternion_oo/DESCRIPTION Added: trunk/octave-forge/extra/quaternion_oo/COPYING =================================================================== --- trunk/octave-forge/extra/quaternion_oo/COPYING (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/COPYING 2010-05-17 00:35:19 UTC (rev 7316) @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. Added: trunk/octave-forge/extra/quaternion_oo/DESCRIPTION =================================================================== --- trunk/octave-forge/extra/quaternion_oo/DESCRIPTION (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/DESCRIPTION 2010-05-17 00:35:19 UTC (rev 7316) @@ -0,0 +1,11 @@ +Name: quaternion +Version: 0.1.0 +Date: 2010-05-17 +Author: Lukas Reichlin <luk...@gm...> +Maintainer: Lukas Reichlin <luk...@gm...> +Title: Quaternion +Description: Overloaded operators for quaternions +Depends: octave (>= 3.2.3) +Autoload: yes +License: GPL version 3 or later +Url: http://octave.sf.net This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2010-05-17 18:17:53
|
Revision: 7318 http://octave.svn.sourceforge.net/octave/?rev=7318&view=rev Author: paramaniac Date: 2010-05-17 18:17:46 +0000 (Mon, 17 May 2010) Log Message: ----------- quaternion_oo: add some operators Modified Paths: -------------- trunk/octave-forge/extra/quaternion_oo/INDEX Added Paths: ----------- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/inv.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mldivide.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mrdivide.m Modified: trunk/octave-forge/extra/quaternion_oo/INDEX =================================================================== --- trunk/octave-forge/extra/quaternion_oo/INDEX 2010-05-17 00:45:25 UTC (rev 7317) +++ trunk/octave-forge/extra/quaternion_oo/INDEX 2010-05-17 18:17:46 UTC (rev 7318) @@ -10,6 +10,9 @@ @quaternion/uminus @quaternion/times @quaternion/mtimes + @quaternion/inv + @quaternion/mldivide + @quaternion/mrdivide @quaternion/transpose @quaternion/ctranspose @quaternion/horzcat Added: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/inv.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/inv.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/inv.m 2010-05-17 18:17:46 UTC (rev 7318) @@ -0,0 +1,43 @@ +## Copyright (C) 2010 Lukas F. Reichlin +## +## 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{qinv} =} inv (@var{q}) +## Return inverse of a quaternion. +## @end deftypefn + +## Author: Lukas Reichlin <luk...@gm...> +## Created: May 2010 +## Version: 0.1 + + +function a = inv (a) + + if (nargin != 1) + print_usage (); + endif + + if (! isscalar (a.w)) + error ("quaternion: inv: implemented for scalar quaternions only"); + endif + + norm2 = a.w*a.w + a.x*a.x + a.y*a.y + a.z*a.z; + + a.w = a.w / norm2; + a.x = -a.x / norm2; + a.y = -a.y / norm2; + a.z = -a.z / norm2; + +endfunction \ No newline at end of file Added: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mldivide.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mldivide.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mldivide.m 2010-05-17 18:17:46 UTC (rev 7318) @@ -0,0 +1,28 @@ +## Copyright (C) 2010 Lukas F. Reichlin +## +## 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 -*- +## Matrix left division for quaternions. Used by Octave for "q1 \ q2" + +## Author: Lukas Reichlin <luk...@gm...> +## Created: May 2010 +## Version: 0.1 + + +function q = mldivide (a, b) + + q = inv (a) * b; + +endfunction \ No newline at end of file Added: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mrdivide.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mrdivide.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mrdivide.m 2010-05-17 18:17:46 UTC (rev 7318) @@ -0,0 +1,28 @@ +## Copyright (C) 2010 Lukas F. Reichlin +## +## 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 -*- +## Matrix right division for quaternions. Used by Octave for "q1 / q2" + +## Author: Lukas Reichlin <luk...@gm...> +## Created: May 2010 +## Version: 0.1 + + +function q = mrdivide (a, b) + + q = a * inv (b); + +endfunction \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2010-05-18 04:49:50
|
Revision: 7319 http://octave.svn.sourceforge.net/octave/?rev=7319&view=rev Author: paramaniac Date: 2010-05-18 04:49:43 +0000 (Tue, 18 May 2010) Log Message: ----------- quaternion_oo: add some more operators Modified Paths: -------------- trunk/octave-forge/extra/quaternion_oo/INDEX Added Paths: ----------- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/ldivide.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mpower.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/power.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/rdivide.m Modified: trunk/octave-forge/extra/quaternion_oo/INDEX =================================================================== --- trunk/octave-forge/extra/quaternion_oo/INDEX 2010-05-17 18:17:46 UTC (rev 7318) +++ trunk/octave-forge/extra/quaternion_oo/INDEX 2010-05-18 04:49:43 UTC (rev 7319) @@ -11,8 +11,12 @@ @quaternion/times @quaternion/mtimes @quaternion/inv + @quaternion/rdivide + @quaternion/ldivide + @quaternion/mrdivide @quaternion/mldivide - @quaternion/mrdivide + @quaternion/power + @quaternion/mpower @quaternion/transpose @quaternion/ctranspose @quaternion/horzcat Added: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/ldivide.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/ldivide.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/ldivide.m 2010-05-18 04:49:43 UTC (rev 7319) @@ -0,0 +1,28 @@ +## Copyright (C) 2010 Lukas F. Reichlin +## +## 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 -*- +## Element-wise left division for quaternions. Used by Octave for "q1 .\ q2" + +## Author: Lukas Reichlin <luk...@gm...> +## Created: May 2010 +## Version: 0.1 + + +function q = ldivide (a, b) + + q = a.^-1 .* b; + +endfunction \ No newline at end of file Added: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mpower.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mpower.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mpower.m 2010-05-18 04:49:43 UTC (rev 7319) @@ -0,0 +1,9 @@ +function a = mpower (a, b) + + if (b == -1 && isa (a, "quaternion") && isscalar (a.w)) + a = inv (a); + else + error ("quaternion: mpower: case not implemeted"); + endif + +endfunction \ No newline at end of file Added: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/power.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/power.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/power.m 2010-05-18 04:49:43 UTC (rev 7319) @@ -0,0 +1,9 @@ +function a = power (a, b) + + if (b == -1 && isa (a, "quaternion") && isscalar (a.w)) + a = inv (a); + else + error ("quaternion: power: case not implemeted"); + endif + +endfunction \ No newline at end of file Added: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/rdivide.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/rdivide.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/rdivide.m 2010-05-18 04:49:43 UTC (rev 7319) @@ -0,0 +1,28 @@ +## Copyright (C) 2010 Lukas F. Reichlin +## +## 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 -*- +## Element-wise right division for quaternions. Used by Octave for "q1 ./ q2" + +## Author: Lukas Reichlin <luk...@gm...> +## Created: May 2010 +## Version: 0.1 + + +function q = rdivide (a, b) + + q = a .* b.^-1; + +endfunction \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2010-05-18 05:30:43
|
Revision: 7320 http://octave.svn.sourceforge.net/octave/?rev=7320&view=rev Author: paramaniac Date: 2010-05-18 05:30:37 +0000 (Tue, 18 May 2010) Log Message: ----------- quaternion_oo: add size functions Modified Paths: -------------- trunk/octave-forge/extra/quaternion_oo/INDEX trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/inv.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mpower.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/power.m Added Paths: ----------- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/columns.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/rows.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/size.m Modified: trunk/octave-forge/extra/quaternion_oo/INDEX =================================================================== --- trunk/octave-forge/extra/quaternion_oo/INDEX 2010-05-18 04:49:43 UTC (rev 7319) +++ trunk/octave-forge/extra/quaternion_oo/INDEX 2010-05-18 05:30:37 UTC (rev 7320) @@ -4,6 +4,9 @@ @quaternion/conj @quaternion/diag @quaternion/ispure + @quaternion/rows + @quaternion/columns + @quaternion/size Overloaded and Arithmetic Operators @quaternion/plus @quaternion/minus Added: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/columns.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/columns.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/columns.m 2010-05-18 05:30:37 UTC (rev 7320) @@ -0,0 +1,9 @@ +function c = columns (a) + + if (nargin != 1) + print_usage (); + endif + + c = columns (a.w); + +endfunction \ No newline at end of file Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/inv.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/inv.m 2010-05-18 04:49:43 UTC (rev 7319) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/inv.m 2010-05-18 05:30:37 UTC (rev 7320) @@ -33,6 +33,8 @@ error ("quaternion: inv: implemented for scalar quaternions only"); endif + ## TODO: quaternion arrays + norm2 = a.w*a.w + a.x*a.x + a.y*a.y + a.z*a.z; a.w = a.w / norm2; Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mpower.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mpower.m 2010-05-18 04:49:43 UTC (rev 7319) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mpower.m 2010-05-18 05:30:37 UTC (rev 7320) @@ -6,4 +6,7 @@ error ("quaternion: mpower: case not implemeted"); endif + ## TODO: - q1 ^ q2 + ## - arrays + endfunction \ No newline at end of file Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/power.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/power.m 2010-05-18 04:49:43 UTC (rev 7319) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/power.m 2010-05-18 05:30:37 UTC (rev 7320) @@ -6,4 +6,7 @@ error ("quaternion: power: case not implemeted"); endif + ## TODO: - q1 .^ q2 + ## - arrays + endfunction \ No newline at end of file Added: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/rows.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/rows.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/rows.m 2010-05-18 05:30:37 UTC (rev 7320) @@ -0,0 +1,9 @@ +function r = rows (a) + + if (nargin != 1) + print_usage (); + endif + + r = rows (a.w); + +endfunction \ No newline at end of file Added: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/size.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/size.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/size.m 2010-05-18 05:30:37 UTC (rev 7320) @@ -0,0 +1,12 @@ +function s = size (a, b = ":") + + if (nargin > 2) + print_usage (); + endif + + s = size (a.w)(b).'; + + ## TODO: - catch case nargout == 2 + ## - return 1 if b > numel (s) + +endfunction \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2010-08-19 07:41:09
|
Revision: 7556 http://octave.svn.sourceforge.net/octave/?rev=7556&view=rev Author: paramaniac Date: 2010-08-19 07:41:03 +0000 (Thu, 19 Aug 2010) Log Message: ----------- quaternion-oo: add abs.m Modified Paths: -------------- trunk/octave-forge/extra/quaternion_oo/INDEX Added Paths: ----------- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/abs.m Modified: trunk/octave-forge/extra/quaternion_oo/INDEX =================================================================== --- trunk/octave-forge/extra/quaternion_oo/INDEX 2010-08-18 21:35:28 UTC (rev 7555) +++ trunk/octave-forge/extra/quaternion_oo/INDEX 2010-08-19 07:41:03 UTC (rev 7556) @@ -1,6 +1,7 @@ quaternion >> Quaternion Quaternions quaternion + @quaternion/abs @quaternion/conj @quaternion/diag @quaternion/ispure Added: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/abs.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/abs.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/abs.m 2010-08-19 07:41:03 UTC (rev 7556) @@ -0,0 +1,39 @@ +## Copyright (C) 2010 Lukas F. Reichlin +## +## 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{qabs} =} abs (@var{q}) +## Modulus of a quaternion. +## +## @example +## q = w + x*i + y*j + z*k +## abs (q) = sqrt (w.^2 + x.^2 + y.^2 + z.^2) +## @end example +## @end deftypefn + +## Author: Lukas Reichlin <luk...@gm...> +## Created: August 2010 +## Version: 0.1 + + +function b = abs (a) + + if (nargin != 1) + print_usage (); + endif + + b = sqrt (a.w.^2 + a.x.^2 + a.y.^2 + a.z.^2); + +endfunction \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2011-11-03 17:21:23
|
Revision: 8955 http://octave.svn.sourceforge.net/octave/?rev=8955&view=rev Author: paramaniac Date: 2011-11-03 17:21:17 +0000 (Thu, 03 Nov 2011) Log Message: ----------- quaternion-oo: nicer display routine, add devel folder Modified Paths: -------------- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/display.m Added Paths: ----------- trunk/octave-forge/extra/quaternion_oo/devel/ trunk/octave-forge/extra/quaternion_oo/devel/demoml.m trunk/octave-forge/extra/quaternion_oo/devel/q2rot.m trunk/octave-forge/extra/quaternion_oo/devel/rot2q.m Added: trunk/octave-forge/extra/quaternion_oo/devel/demoml.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/devel/demoml.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/devel/demoml.m 2011-11-03 17:21:17 UTC (rev 8955) @@ -0,0 +1,10 @@ +q = rot2q ([0, 0, 1], pi/4) + +% [vv, theta] = q2rot (q) + +x = quaternion (0, 1, 1, 0) % nicht normiert + % s x y z + +rx = q * x * conj (q) % q x q^-1 + +% [vv, theta] = q2rot (rx) Added: trunk/octave-forge/extra/quaternion_oo/devel/q2rot.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/devel/q2rot.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/devel/q2rot.m 2011-11-03 17:21:17 UTC (rev 8955) @@ -0,0 +1,31 @@ +function [vv, theta] = q2rot (q) + + if (nargin ~= 1 || nargout ~= 2) + print_usage (); + end + + if (abs (norm (q) - 1) > 1e-12) + warning ('quaternion: ||q||=%e, setting=1 for vv, theta', norm (q)); + q = q / norm (q); + end + + s = q.s; + x = q.x; + y = q.y; + z = q.z; + + theta = acos (s) * 2; + + if (abs (theta) > pi) + theta = theta - sign (theta) * pi; + end + + sin_th_2 = norm ([x, y, z]); + + if (sin_th_2 ~= 0) + vv = [x, y, z] / sin_th_2; + else + vv = [x, y, z]; + end + +end \ No newline at end of file Added: trunk/octave-forge/extra/quaternion_oo/devel/rot2q.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/devel/rot2q.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/devel/rot2q.m 2011-11-03 17:21:17 UTC (rev 8955) @@ -0,0 +1,33 @@ +function q = rot2q (vv, theta) + + if (nargin ~= 2 || nargout ~= 1) + print_usage (); + end + + if (~ isvector (vv) || length (vv) ~= 3) + error ('vv must be a length three vector'); + end + + if (~ isscalar (theta)) + error ('theta must be a scalar'); + end + + if (norm (vv) == 0) + error ('quaternion: vv is zero'); + end + + if (abs (norm (vv) - 1) > 1e-12) + warning ('quaternion: ||vv|| != 1, normalizing') + vv = vv / norm (vv); + end + + if (abs (theta) > 2*pi) + warning ('quaternion: |theta| > 2 pi, normalizing') + theta = rem (theta, 2*pi); + end + + vv = vv * sin (theta / 2); + d = cos (theta / 2); + q = quaternion (d, vv(1), vv(2), vv(3)); + +end \ No newline at end of file Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/display.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/display.m 2011-11-03 14:11:57 UTC (rev 8954) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/display.m 2011-11-03 17:21:17 UTC (rev 8955) @@ -1,4 +1,4 @@ -## Copyright (C) 2010 Lukas F. Reichlin +## Copyright (C) 2010, 2011 Lukas F. Reichlin ## ## 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 @@ -14,28 +14,52 @@ ## along with this program. If not, see <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## Display routine for quaternions. Used by Octave internally. +## Display routine for quaternions. Used by Octave internally. ## Author: Lukas Reichlin <luk...@gm...> ## Created: May 2010 -## Version: 0.1 +## Version: 0.2 function display (q) - inputname_str = inputname(1); + name = inputname(1); + s = size (q); + + if (ndims (s) == 2 && all (s == 1)) # scalar quaternion + w = num2str (q.w, 4); + x = __num2str__ (q.x); + y = __num2str__ (q.y); + z = __num2str__ (q.z); + disp (""); + disp ([name, " = ", w, x, "i" y, "j", z, "k"]); + disp (""); + else # non-scalar quaternion + disp ([name, ".w ="]); + disp (q.w); + disp (""); + disp ([name, ".x ="]); + disp (q.x); + disp (""); + disp ([name, ".y ="]); + disp (q.y); + disp (""); + disp ([name, ".z ="]); + disp (q.z); + disp (""); + endif - disp ([inputname_str, ".w ="]); - disp (q.w); - disp (""); - disp ([inputname_str, ".x ="]); - disp (q.x); - disp (""); - disp ([inputname_str, ".y ="]); - disp (q.y); - disp (""); - disp ([inputname_str, ".z ="]); - disp (q.z); - disp (""); +endfunction -endfunction \ No newline at end of file + +function str = __num2str__ (num) + + if (sign (num) == -1) + str = " - "; + else + str = " + "; + endif + + str = [str, num2str(abs (num), 4), " "]; + +endfunction This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2011-11-03 21:52:37
|
Revision: 8965 http://octave.svn.sourceforge.net/octave/?rev=8965&view=rev Author: paramaniac Date: 2011-11-03 21:52:30 +0000 (Thu, 03 Nov 2011) Log Message: ----------- quaternion-oo: simplify constructor again, add an oct-file for argument checking Modified Paths: -------------- trunk/octave-forge/extra/quaternion_oo/DESCRIPTION trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/quaternion.m Added Paths: ----------- trunk/octave-forge/extra/quaternion_oo/Makefile trunk/octave-forge/extra/quaternion_oo/devel/makefile_quaternion.m trunk/octave-forge/extra/quaternion_oo/src/ trunk/octave-forge/extra/quaternion_oo/src/Makefile trunk/octave-forge/extra/quaternion_oo/src/is_real_matrice.cc Modified: trunk/octave-forge/extra/quaternion_oo/DESCRIPTION =================================================================== --- trunk/octave-forge/extra/quaternion_oo/DESCRIPTION 2011-11-03 21:51:53 UTC (rev 8964) +++ trunk/octave-forge/extra/quaternion_oo/DESCRIPTION 2011-11-03 21:52:30 UTC (rev 8965) @@ -1,6 +1,6 @@ Name: quaternion -Version: 0.1.0 -Date: 2010-05-17 +Version: 0.2.0 +Date: 2011-11-03 Author: Lukas Reichlin <luk...@gm...> Maintainer: Lukas Reichlin <luk...@gm...> Title: Quaternion Added: trunk/octave-forge/extra/quaternion_oo/Makefile =================================================================== --- trunk/octave-forge/extra/quaternion_oo/Makefile (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/Makefile 2011-11-03 21:52:30 UTC (rev 8965) @@ -0,0 +1,16 @@ +sinclude ../../Makeconf + +PKG_FILES = COPYING DESCRIPTION INDEX $(wildcard inst/*) +SUBDIRS = doc/ + +.PHONY: $(SUBDIRS) + +pre-pkg:: + @for _dir in $(SUBDIRS); do \ + $(MAKE) -C $$_dir all; \ + done + +clean: + @for _dir in $(SUBDIRS); do \ + $(MAKE) -C $$_dir $(MAKECMDGOALS); \ + done Added: trunk/octave-forge/extra/quaternion_oo/devel/makefile_quaternion.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/devel/makefile_quaternion.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/devel/makefile_quaternion.m 2011-11-03 21:52:30 UTC (rev 8965) @@ -0,0 +1,9 @@ +homedir = pwd (); +develdir = fileparts (which ("makefile_quaternion")); +srcdir = [develdir, "/../src"]; +cd (srcdir); + +mkoctfile is_real_matrice.cc + +system ("rm *.o"); +cd (homedir); \ No newline at end of file Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/quaternion.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/quaternion.m 2011-11-03 21:51:53 UTC (rev 8964) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/quaternion.m 2011-11-03 21:52:30 UTC (rev 8965) @@ -36,46 +36,38 @@ if (isa (a, "quaternion")) q = a; return; - elseif (isnumeric (a)) - w = a; - x = y = z = zeros (size (a), class (a)); + elseif (is_real_matrice (a)) + b = c = d = zeros (size (a)); else print_usage (); endif case 3 + if (! is_real_matrice (a, b, c)) + error ("quaternion: arguments must be real matrices"); + endif if (! size_equal (a, b, c)); error ("quaternion: arguments must have identical sizes"); endif - c_a = class (a); - if (isnumeric (a) && strcmp (c_a, class (b)) && strcmp (c_a, class (c))) - w = zeros (size (a), c_a); - x = a; - y = b; - z = c; - else - error ("quaternion: arguments must be numeric and of the same type"); - endif + d = c; + c = b; + b = a; + a = zeros (size (a)); case 4 + if (! is_real_matrice (a, b, c, d)) + error ("quaternion: arguments must be real matrices"); + endif if (! size_equal (a, b, c, d)); error ("quaternion: arguments must have identical sizes"); endif - c_a = class (a); - if (isnumeric (a) && strcmp (c_a, class (b)) && \ - strcmp (c_a, class (c)) && strcmp (c_a, class (d))) - w = a; - x = b; - y = c; - z = d; - else - error ("quaternion: arguments must be numeric and of the same type"); - endif otherwise print_usage (); endswitch - q = class (struct ("w", w, "x", x, "y", y, "z", z), "quaternion"); + q = class (struct ("w", a, "x", b, "y", c, "z", d), "quaternion"); + + ## TODO: avoid duplicate code in case 3 and 4 endfunction Property changes on: trunk/octave-forge/extra/quaternion_oo/src ___________________________________________________________________ Added: svn:ignore + *.oct Added: trunk/octave-forge/extra/quaternion_oo/src/Makefile =================================================================== --- trunk/octave-forge/extra/quaternion_oo/src/Makefile (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/src/Makefile 2011-11-03 21:52:30 UTC (rev 8965) @@ -0,0 +1,8 @@ +all: is_real_matrice.oct + +# helper +is_real_matrice.oct: is_real_matrice.cc + mkoctfile is_real_matrice.cc + +clean: + rm *.o core octave-core *.oct *~ Added: trunk/octave-forge/extra/quaternion_oo/src/is_real_matrice.cc =================================================================== --- trunk/octave-forge/extra/quaternion_oo/src/is_real_matrice.cc (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/src/is_real_matrice.cc 2011-11-03 21:52:30 UTC (rev 8965) @@ -0,0 +1,61 @@ +/* + +Copyright (C) 2010 Lukas F. Reichlin + +This file is part of LTI Syncope. + +LTI Syncope 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. + +LTI Syncope 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 LTI Syncope. If not, see <http://www.gnu.org/licenses/>. + +Return true if argument is a real matrix. + +Author: Lukas Reichlin <luk...@gm...> +Created: September 2010 +Version: 0.1 + +*/ + +#include <octave/oct.h> + +DEFUN_DLD (is_real_matrice, args, nargout, + "-*- texinfo -*-\n\ +@deftypefn {Loadable Function} {} is_real_matrice (@var{a}, @dots{})\n\ +Return true if argument is a real matrix.\n\ +@var{[]} is a valid matrix.\n\ +Avoid nasty stuff like @code{true = isreal (\"a\")}.\n\ +Renamed to is_real_matrice to avoid conflicts with \n\ +is_real_matrix from the control package.\n\ +@end deftypefn") +{ + octave_value retval = true; + int nargin = args.length (); + + if (nargin == 0) + { + print_usage (); + } + else + { + for (int i = 0; i < nargin; i++) + { + if (args(i).ndims () != 2 || ! args(i).is_numeric_type () + || ! args(i).is_real_type ()) + { + retval = false; + break; + } + } + } + + return retval; +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2011-11-03 22:17:19
|
Revision: 8969 http://octave.svn.sourceforge.net/octave/?rev=8969&view=rev Author: paramaniac Date: 2011-11-03 22:17:13 +0000 (Thu, 03 Nov 2011) Log Message: ----------- quaternion-oo: move q0 - q4 from /inst to /devel Added Paths: ----------- trunk/octave-forge/extra/quaternion_oo/devel/q0.m trunk/octave-forge/extra/quaternion_oo/devel/q1.m trunk/octave-forge/extra/quaternion_oo/devel/q2.m trunk/octave-forge/extra/quaternion_oo/devel/q3.m trunk/octave-forge/extra/quaternion_oo/devel/q4.m Removed Paths: ------------- trunk/octave-forge/extra/quaternion_oo/inst/q0.m trunk/octave-forge/extra/quaternion_oo/inst/q1.m trunk/octave-forge/extra/quaternion_oo/inst/q2.m trunk/octave-forge/extra/quaternion_oo/inst/q3.m trunk/octave-forge/extra/quaternion_oo/inst/q4.m Copied: trunk/octave-forge/extra/quaternion_oo/devel/q0.m (from rev 8968, trunk/octave-forge/extra/quaternion_oo/inst/q0.m) =================================================================== --- trunk/octave-forge/extra/quaternion_oo/devel/q0.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/devel/q0.m 2011-11-03 22:17:13 UTC (rev 8969) @@ -0,0 +1,9 @@ +function q = q0 + + if (nargin != 0) + print_usage (); + endif + + q = quaternion (1, 0, 0, 0); + +endfunction \ No newline at end of file Copied: trunk/octave-forge/extra/quaternion_oo/devel/q1.m (from rev 8968, trunk/octave-forge/extra/quaternion_oo/inst/q1.m) =================================================================== --- trunk/octave-forge/extra/quaternion_oo/devel/q1.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/devel/q1.m 2011-11-03 22:17:13 UTC (rev 8969) @@ -0,0 +1,9 @@ +function q = q1 + + if (nargin != 0) + print_usage (); + endif + + q = quaternion (0, 1, 0, 0); + +endfunction \ No newline at end of file Copied: trunk/octave-forge/extra/quaternion_oo/devel/q2.m (from rev 8968, trunk/octave-forge/extra/quaternion_oo/inst/q2.m) =================================================================== --- trunk/octave-forge/extra/quaternion_oo/devel/q2.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/devel/q2.m 2011-11-03 22:17:13 UTC (rev 8969) @@ -0,0 +1,9 @@ +function q = q2 + + if (nargin != 0) + print_usage (); + endif + + q = quaternion (0, 0, 1, 0); + +endfunction \ No newline at end of file Copied: trunk/octave-forge/extra/quaternion_oo/devel/q3.m (from rev 8968, trunk/octave-forge/extra/quaternion_oo/inst/q3.m) =================================================================== --- trunk/octave-forge/extra/quaternion_oo/devel/q3.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/devel/q3.m 2011-11-03 22:17:13 UTC (rev 8969) @@ -0,0 +1,9 @@ +function q = q3 + + if (nargin != 0) + print_usage (); + endif + + q = quaternion (0, 0, 0, 1); + +endfunction \ No newline at end of file Copied: trunk/octave-forge/extra/quaternion_oo/devel/q4.m (from rev 8968, trunk/octave-forge/extra/quaternion_oo/inst/q4.m) =================================================================== --- trunk/octave-forge/extra/quaternion_oo/devel/q4.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/devel/q4.m 2011-11-03 22:17:13 UTC (rev 8969) @@ -0,0 +1,9 @@ +function q = q4 + + if (nargin != 0) + print_usage (); + endif + + q = quaternion (1, 0, 0, 0); + +endfunction \ No newline at end of file Deleted: trunk/octave-forge/extra/quaternion_oo/inst/q0.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/q0.m 2011-11-03 22:14:08 UTC (rev 8968) +++ trunk/octave-forge/extra/quaternion_oo/inst/q0.m 2011-11-03 22:17:13 UTC (rev 8969) @@ -1,9 +0,0 @@ -function q = q0 - - if (nargin != 0) - print_usage (); - endif - - q = quaternion (1, 0, 0, 0); - -endfunction \ No newline at end of file Deleted: trunk/octave-forge/extra/quaternion_oo/inst/q1.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/q1.m 2011-11-03 22:14:08 UTC (rev 8968) +++ trunk/octave-forge/extra/quaternion_oo/inst/q1.m 2011-11-03 22:17:13 UTC (rev 8969) @@ -1,9 +0,0 @@ -function q = q1 - - if (nargin != 0) - print_usage (); - endif - - q = quaternion (0, 1, 0, 0); - -endfunction \ No newline at end of file Deleted: trunk/octave-forge/extra/quaternion_oo/inst/q2.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/q2.m 2011-11-03 22:14:08 UTC (rev 8968) +++ trunk/octave-forge/extra/quaternion_oo/inst/q2.m 2011-11-03 22:17:13 UTC (rev 8969) @@ -1,9 +0,0 @@ -function q = q2 - - if (nargin != 0) - print_usage (); - endif - - q = quaternion (0, 0, 1, 0); - -endfunction \ No newline at end of file Deleted: trunk/octave-forge/extra/quaternion_oo/inst/q3.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/q3.m 2011-11-03 22:14:08 UTC (rev 8968) +++ trunk/octave-forge/extra/quaternion_oo/inst/q3.m 2011-11-03 22:17:13 UTC (rev 8969) @@ -1,9 +0,0 @@ -function q = q3 - - if (nargin != 0) - print_usage (); - endif - - q = quaternion (0, 0, 0, 1); - -endfunction \ No newline at end of file Deleted: trunk/octave-forge/extra/quaternion_oo/inst/q4.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/q4.m 2011-11-03 22:14:08 UTC (rev 8968) +++ trunk/octave-forge/extra/quaternion_oo/inst/q4.m 2011-11-03 22:17:13 UTC (rev 8969) @@ -1,9 +0,0 @@ -function q = q4 - - if (nargin != 0) - print_usage (); - endif - - q = quaternion (1, 0, 0, 0); - -endfunction \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2011-11-13 13:32:42
|
Revision: 9074 http://octave.svn.sourceforge.net/octave/?rev=9074&view=rev Author: paramaniac Date: 2011-11-13 13:32:36 +0000 (Sun, 13 Nov 2011) Log Message: ----------- quaternion-oo: add unit method, various enhancements Modified Paths: -------------- trunk/octave-forge/extra/quaternion_oo/INDEX trunk/octave-forge/extra/quaternion_oo/devel/demoml.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/abs.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/columns.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/inv.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mpower.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/power.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/rows.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/size.m Added Paths: ----------- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/private/ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/private/norm2.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/unit.m Modified: trunk/octave-forge/extra/quaternion_oo/INDEX =================================================================== --- trunk/octave-forge/extra/quaternion_oo/INDEX 2011-11-13 12:40:38 UTC (rev 9073) +++ trunk/octave-forge/extra/quaternion_oo/INDEX 2011-11-13 13:32:36 UTC (rev 9074) @@ -8,6 +8,7 @@ @quaternion/rows @quaternion/columns @quaternion/size + @quaternion/unit Overloaded and Arithmetic Operators @quaternion/plus @quaternion/minus Modified: trunk/octave-forge/extra/quaternion_oo/devel/demoml.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/devel/demoml.m 2011-11-13 12:40:38 UTC (rev 9073) +++ trunk/octave-forge/extra/quaternion_oo/devel/demoml.m 2011-11-13 13:32:36 UTC (rev 9074) @@ -1,10 +1,10 @@ q = rot2q ([0, 0, 1], pi/4) -% [vv, theta] = q2rot (q) +[vv, theta] = q2rot (q) x = quaternion (0, 1, 1, 0) % nicht normiert % s x y z rx = q * x * conj (q) % q x q^-1 -% [vv, theta] = q2rot (rx) +[vv, theta] = q2rot (rx) Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/abs.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/abs.m 2011-11-13 12:40:38 UTC (rev 9073) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/abs.m 2011-11-13 13:32:36 UTC (rev 9074) @@ -1,4 +1,4 @@ -## Copyright (C) 2010 Lukas F. Reichlin +## Copyright (C) 2010, 2011 Lukas F. Reichlin ## ## 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 @@ -25,7 +25,7 @@ ## Author: Lukas Reichlin <luk...@gm...> ## Created: August 2010 -## Version: 0.1 +## Version: 0.2 function b = abs (a) @@ -34,6 +34,6 @@ print_usage (); endif - b = sqrt (a.w.^2 + a.x.^2 + a.y.^2 + a.z.^2); + b = sqrt (norm2 (a)); endfunction \ No newline at end of file Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/columns.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/columns.m 2011-11-13 12:40:38 UTC (rev 9073) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/columns.m 2011-11-13 13:32:36 UTC (rev 9074) @@ -1,3 +1,26 @@ +## Copyright (C) 2010 Lukas F. Reichlin +## +## 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 -*- +## Return number of columns of quaternion arrays. + +## Author: Lukas Reichlin <luk...@gm...> +## Created: May 2010 +## Version: 0.1 + + function c = columns (a) if (nargin != 1) Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/inv.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/inv.m 2011-11-13 12:40:38 UTC (rev 9073) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/inv.m 2011-11-13 13:32:36 UTC (rev 9074) @@ -1,4 +1,4 @@ -## Copyright (C) 2010 Lukas F. Reichlin +## Copyright (C) 2010, 2011 Lukas F. Reichlin ## ## 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 @@ -20,7 +20,7 @@ ## Author: Lukas Reichlin <luk...@gm...> ## Created: May 2010 -## Version: 0.1 +## Version: 0.2 function a = inv (a) @@ -35,7 +35,7 @@ ## TODO: quaternion arrays - norm2 = a.w*a.w + a.x*a.x + a.y*a.y + a.z*a.z; + norm2 = norm2 (a); a.w = a.w / norm2; a.x = -a.x / norm2; Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mpower.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mpower.m 2011-11-13 12:40:38 UTC (rev 9073) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mpower.m 2011-11-13 13:32:36 UTC (rev 9074) @@ -1,3 +1,26 @@ +## Copyright (C) 2010 Lukas F. Reichlin +## +## 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 -*- +## matrix power operator of quaternions. Used by Octave for "q^x". + +## Author: Lukas Reichlin <luk...@gm...> +## Created: May 2010 +## Version: 0.1 + + function a = mpower (a, b) if (b == -1 && isa (a, "quaternion") && isscalar (a.w)) Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/power.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/power.m 2011-11-13 12:40:38 UTC (rev 9073) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/power.m 2011-11-13 13:32:36 UTC (rev 9074) @@ -1,12 +1,38 @@ +## Copyright (C) 2010 Lukas F. Reichlin +## +## 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 -*- +## power operator of quaternions. Used by Octave for "q.^x". + +## Author: Lukas Reichlin <luk...@gm...> +## Created: May 2010 +## Version: 0.1 + + function a = power (a, b) - if (b == -1 && isa (a, "quaternion") && isscalar (a.w)) - a = inv (a); + if (b == -1 && isa (a, "quaternion")) + norm2 = norm2 (a); + a.w = a.w ./ norm2; + a.x = -a.x ./ norm2; + a.y = -a.y ./ norm2; + a.z = -a.z ./ norm2; else error ("quaternion: power: case not implemeted"); endif - ## TODO: - q1 .^ q2 - ## - arrays + ## TODO: q1 .^ q2 endfunction \ No newline at end of file Added: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/private/norm2.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/private/norm2.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/private/norm2.m 2011-11-13 13:32:36 UTC (rev 9074) @@ -0,0 +1,30 @@ +## Copyright (C) 2011 Lukas F. Reichlin +## +## 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{norm2} =} norm2 (@var{q}) +## Return squared norm of a quaternion. +## @end deftypefn + +## Author: Lukas Reichlin <luk...@gm...> +## Created: November 2011 +## Version: 0.1 + + +function ret = norm2 (a) + + ret = a.w.^2 + a.x.^2 + a.y.^2 + a.z.^2; + +endfunction \ No newline at end of file Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/rows.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/rows.m 2011-11-13 12:40:38 UTC (rev 9073) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/rows.m 2011-11-13 13:32:36 UTC (rev 9074) @@ -1,3 +1,26 @@ +## Copyright (C) 2010 Lukas F. Reichlin +## +## 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 -*- +## Return number of rows of quaternion arrays. + +## Author: Lukas Reichlin <luk...@gm...> +## Created: May 2010 +## Version: 0.1 + + function r = rows (a) if (nargin != 1) Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/size.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/size.m 2011-11-13 12:40:38 UTC (rev 9073) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/size.m 2011-11-13 13:32:36 UTC (rev 9074) @@ -1,3 +1,26 @@ +## Copyright (C) 2010 Lukas F. Reichlin +## +## 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 -*- +## Return size of quaternion arrays. + +## Author: Lukas Reichlin <luk...@gm...> +## Created: May 2010 +## Version: 0.1 + + function [s, varargout] = size (a, b) switch (nargout) Added: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/unit.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/unit.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/unit.m 2011-11-13 13:32:36 UTC (rev 9074) @@ -0,0 +1,39 @@ +## Copyright (C) 2010 Lukas F. Reichlin +## +## 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{qabs} =} abs (@var{q}) +## Normalize quaternion to length 1 (unit quaternion). +## +## @example +## q = w + x*i + y*j + z*k +## unit (q) = q ./ sqrt (w.^2 + x.^2 + y.^2 + z.^2) +## @end example +## @end deftypefn + +## Author: Lukas Reichlin <luk...@gm...> +## Created: August 2010 +## Version: 0.1 + + +function q = unit (a) + + if (nargin != 1) + print_usage (); + endif + + q = a ./ abs (a); + +endfunction \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2011-11-13 13:43:49
|
Revision: 9075 http://octave.svn.sourceforge.net/octave/?rev=9075&view=rev Author: paramaniac Date: 2011-11-13 13:43:25 +0000 (Sun, 13 Nov 2011) Log Message: ----------- quaternion-oo: add norm Modified Paths: -------------- trunk/octave-forge/extra/quaternion_oo/INDEX Added Paths: ----------- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/norm.m Modified: trunk/octave-forge/extra/quaternion_oo/INDEX =================================================================== --- trunk/octave-forge/extra/quaternion_oo/INDEX 2011-11-13 13:32:36 UTC (rev 9074) +++ trunk/octave-forge/extra/quaternion_oo/INDEX 2011-11-13 13:43:25 UTC (rev 9075) @@ -9,6 +9,7 @@ @quaternion/columns @quaternion/size @quaternion/unit + @quaternion/norm Overloaded and Arithmetic Operators @quaternion/plus @quaternion/minus Added: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/norm.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/norm.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/norm.m 2011-11-13 13:43:25 UTC (rev 9075) @@ -0,0 +1,39 @@ +## Copyright (C) 2011 Lukas F. Reichlin +## +## 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{n} =} norm (@var{q}) +## Norm of a quaternion. +## @end deftypefn + +## Author: Lukas Reichlin <luk...@gm...> +## Created: November 2011 +## Version: 0.1 + + +function n = norm (a) + + if (nargin != 1) + print_usage (); + endif + + if (! isscalar (a.w)) + warning ("norm: use ""abs"" to calculate the lengths of quaternion arrays"); + error ("norm: only the 2-norm of scalar quaternions is implemented until now"); + endif + + n = abs (a); + +endfunction This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jpi...@us...> - 2011-11-14 14:54:36
|
Revision: 9087 http://octave.svn.sourceforge.net/octave/?rev=9087&view=rev Author: jpicarbajal Date: 2011-11-14 14:54:28 +0000 (Mon, 14 Nov 2011) Log Message: ----------- quaternion_oo . Adding time derivative of a quaternion as method with tests To test use: test @quaternion/dot after the object oriented version of quaternion was installed. Modified Paths: -------------- trunk/octave-forge/extra/quaternion_oo/devel/RV9_Quaternions.txt Added Paths: ----------- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/dot.m Modified: trunk/octave-forge/extra/quaternion_oo/devel/RV9_Quaternions.txt =================================================================== --- trunk/octave-forge/extra/quaternion_oo/devel/RV9_Quaternions.txt 2011-11-14 14:53:49 UTC (rev 9086) +++ trunk/octave-forge/extra/quaternion_oo/devel/RV9_Quaternions.txt 2011-11-14 14:54:28 UTC (rev 9087) @@ -94,21 +94,35 @@ We hope not to run into the c tag. == Quaternion == +DONE Q = Quaternion() is the identitity quaternion 1<0,0,0> representing a null rotation. +DONE Q = Quaternion(Q1) is a copy of the quaternion Q1 + +DONE Q = Quaternion([S V1 V2 V3]) is a quaternion formed by specifying directly its 4 elements + +DONE Q = Quaternion(S) is a quaternion formed from the scalar S and zero vector part: S<0,0,0> + +DONE Q = Quaternion(V) is a pure quaternion with the specified vector part: 0<V> + +DONE Q = Quaternion(TH, V) is a unit quaternion corresponding to rotation of TH about the vector V. + + Q = Quaternion(R) is a unit quaternion corresponding to the orthonormal rotation matrix R. + + Q = Quaternion(T) is a unit quaternion equivalent to the rotational + = methods = DONE [c] inv return inverse of quaterion By Monday, November 07 2011 this function is equivalent to the conj function of quaternions_oo not to inv of that package. -DONE [e] norm: We will wrap abs from quaternions_oo +DONE [e] norm: Wraps abs from quaternions_oo -[] unit return unit quaternion -[] unitize unitize this quaternion +DONE [] unit return unit quaternion [] plot same options as trplot() [] interp interpolation (slerp) between q and q2, 0<=s<=1 [] scale interpolation (slerp) between identity and q, 0<=s<=1 -[] dot derivative of quaternion with angular velocity w +DONE [x] dot derivative of quaternion with angular velocity w = Operators = [*] q+q2 return elementwise sum of quaternions @@ -120,7 +134,7 @@ [] q^n return q to power n (integer only) = Properties (read only)= -[] s real part -[] v vector part -[] R 3x3 rotation matrix -[] T 4x4 homogeneous transform matrix +DONE [] s real part +DONE [] v vector part +DONE [] R 3x3 rotation matrix +DONE [] T 4x4 homogeneous transform matrix Added: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/dot.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/dot.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/dot.m 2011-11-14 14:54:28 UTC (rev 9087) @@ -0,0 +1,61 @@ +%% Copyright (c) 1998, 2000, 2005, 2007 Auburn University. +%% Copyright (c) 2011 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 +%% 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} {} dot (q, omega) +%% Derivative of a quaternion. +%% +%% Let Q be a quaternion to transform a vector from a fixed frame to +%% a rotating frame. If the rotating frame is rotating about the +%% [x, y, z] axes at angular rates [wx, wy, wz], then the derivative +%% of Q is given by +%% +%% @example +%% Q' = dot(Q, omega) +%% @end example +%% +%% If the passive convention is used (rotate the frame, not the vector), +%% then +%% +%% @example +%% Q' = dot(Q,-omega) +%% @end example +%% @end deftypefn + +%% Adapted from: qderiv by A. S. Hodel <a.s...@en...> + +function qd = dot (q, Omega) + + if (nargin != 2) + print_usage (); + endif + + Omega = vec (Omega); + + if (length (Omega) != 3) + error ("Quaternion:InvalidArgument: Omega must be a length 3 vector"); + endif + + qd = 0.5 * quaternion(Omega(1),Omega(2),Omega(3)) * q; + +endfunction + +%!shared q +%! q = quaternion(3,1,0,0); + +%!assert(quaternion(0,0,0.5,1.5) == dot(q,[0 0 1])) +%!assert(quaternion(0,0,2,1) == dot(q,[0 1 1])) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jpi...@us...> - 2011-11-14 16:34:17
|
Revision: 9092 http://octave.svn.sourceforge.net/octave/?rev=9092&view=rev Author: jpicarbajal Date: 2011-11-14 16:34:11 +0000 (Mon, 14 Nov 2011) Log Message: ----------- quaternions_oo . power function implemented Modified Paths: -------------- trunk/octave-forge/extra/quaternion_oo/devel/RV9_Quaternions.txt trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/power.m Modified: trunk/octave-forge/extra/quaternion_oo/devel/RV9_Quaternions.txt =================================================================== --- trunk/octave-forge/extra/quaternion_oo/devel/RV9_Quaternions.txt 2011-11-14 16:24:51 UTC (rev 9091) +++ trunk/octave-forge/extra/quaternion_oo/devel/RV9_Quaternions.txt 2011-11-14 16:34:11 UTC (rev 9092) @@ -111,26 +111,24 @@ Q = Quaternion(T) is a unit quaternion equivalent to the rotational = methods = - DONE [c] inv return inverse of quaterion -By Monday, November 07 2011 this function is equivalent to the conj function of quaternions_oo -not to inv of that package. - DONE [e] norm: Wraps abs from quaternions_oo +DONE [x] dot derivative of quaternion with angular velocity w +DONE [c] display +DONE [] q2tr +DONE [*] unit return unit quaternion -DONE [] unit return unit quaternion [] plot same options as trplot() [] interp interpolation (slerp) between q and q2, 0<=s<=1 [] scale interpolation (slerp) between identity and q, 0<=s<=1 -DONE [x] dot derivative of quaternion with angular velocity w = Operators = -[*] q+q2 return elementwise sum of quaternions -[*] q-q2 return elementwise difference of quaternions -[*] q*q2 return quaternion product -[*] q*v rotate vector by quaternion, v is 3x1 -[*] q/q2 return q*q2.inv +DONE [*] q+q2 return elementwise sum of quaternions +DONE [*] q-q2 return elementwise difference of quaternions +DONE [*] q*q2 return quaternion product +DONE [*] q/q2 return q*q2.inv +[*] q*v rotate vector by quaternion, v is 3x1 [] q^n return q to power n (integer only) = Properties (read only)= Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/power.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/power.m 2011-11-14 16:24:51 UTC (rev 9091) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/power.m 2011-11-14 16:34:11 UTC (rev 9092) @@ -23,6 +23,10 @@ function a = power (a, b) + if !isreal(b) + error('quaternion:InvalidArgument','Exponent must be real'); + end + if (b == -1 && isa (a, "quaternion")) norm2 = norm2 (a); a.w = a.w ./ norm2; @@ -30,9 +34,19 @@ a.y = -a.y ./ norm2; a.z = -a.z ./ norm2; else - error ("quaternion: power: case not implemeted"); + + na = abs (a); + th = acos (a.w / na); + n = [a.x a.y a.z] ./ sqrt((a.x).^2 + (a.y).^2 + (a.z).^2); + + nab = na.^b; + a.w = nab .* cos (b.*th); + + snt = sin (b.*th); + a.x = n(:,1) .* nab .* snt; + a.y = n(:,2) .* nab .* snt; + a.z = n(:,3) .* nab .* snt; + endif - ## TODO: q1 .^ q2 - -endfunction \ No newline at end of file +endfunction This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jpi...@us...> - 2011-11-14 16:55:22
|
Revision: 9095 http://octave.svn.sourceforge.net/octave/?rev=9095&view=rev Author: jpicarbajal Date: 2011-11-14 16:55:12 +0000 (Mon, 14 Nov 2011) Log Message: ----------- quaternions_oo. retouching power and RTB transition file Modified Paths: -------------- trunk/octave-forge/extra/quaternion_oo/devel/RV9_Quaternions.txt trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/power.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/quaternion.m Modified: trunk/octave-forge/extra/quaternion_oo/devel/RV9_Quaternions.txt =================================================================== --- trunk/octave-forge/extra/quaternion_oo/devel/RV9_Quaternions.txt 2011-11-14 16:54:18 UTC (rev 9094) +++ trunk/octave-forge/extra/quaternion_oo/devel/RV9_Quaternions.txt 2011-11-14 16:55:12 UTC (rev 9095) @@ -129,7 +129,7 @@ DONE [*] q/q2 return q*q2.inv [*] q*v rotate vector by quaternion, v is 3x1 -[] q^n return q to power n (integer only) +DONE [*] q^n return q to power n (real) = Properties (read only)= DONE [] s real part Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/power.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/power.m 2011-11-14 16:54:18 UTC (rev 9094) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/power.m 2011-11-14 16:55:12 UTC (rev 9095) @@ -1,4 +1,5 @@ ## Copyright (C) 2010 Lukas F. Reichlin +## Copyright (c) 2011 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 @@ -20,7 +21,6 @@ ## Created: May 2010 ## Version: 0.1 - function a = power (a, b) if !isreal(b) Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/quaternion.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/quaternion.m 2011-11-14 16:54:18 UTC (rev 9094) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/quaternion.m 2011-11-14 16:55:12 UTC (rev 9095) @@ -51,7 +51,7 @@ otherwise print_usage (); endswitch - + if (! is_real_matrice (a, b, c, d)) error ("quaternion: arguments must be real matrices"); endif @@ -59,7 +59,7 @@ if (! size_equal (a, b, c, d)); error ("quaternion: arguments must have identical sizes"); endif - + q = class (struct ("w", a, "x", b, "y", c, "z", d), "quaternion"); endfunction This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jpi...@us...> - 2011-11-14 22:35:52
|
Revision: 9098 http://octave.svn.sourceforge.net/octave/?rev=9098&view=rev Author: jpicarbajal Date: 2011-11-14 22:35:45 +0000 (Mon, 14 Nov 2011) Log Message: ----------- quaternions_oo . Power vectorized to matrices of quaternions. Modified Paths: -------------- trunk/octave-forge/extra/quaternion_oo/devel/RV9_Quaternions.txt trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/power.m Modified: trunk/octave-forge/extra/quaternion_oo/devel/RV9_Quaternions.txt =================================================================== --- trunk/octave-forge/extra/quaternion_oo/devel/RV9_Quaternions.txt 2011-11-14 19:13:11 UTC (rev 9097) +++ trunk/octave-forge/extra/quaternion_oo/devel/RV9_Quaternions.txt 2011-11-14 22:35:45 UTC (rev 9098) @@ -106,9 +106,9 @@ DONE Q = Quaternion(TH, V) is a unit quaternion corresponding to rotation of TH about the vector V. - Q = Quaternion(R) is a unit quaternion corresponding to the orthonormal rotation matrix R. +DONE Q = Quaternion(R) is a unit quaternion corresponding to the orthonormal rotation matrix R. - Q = Quaternion(T) is a unit quaternion equivalent to the rotational +DONE Q = Quaternion(T) is a unit quaternion equivalent to the rotational = methods = DONE [c] inv return inverse of quaterion Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/power.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/power.m 2011-11-14 19:13:11 UTC (rev 9097) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/power.m 2011-11-14 22:35:45 UTC (rev 9098) @@ -33,8 +33,9 @@ a.x = -a.x ./ norm2; a.y = -a.y ./ norm2; a.z = -a.z ./ norm2; - else + elseif isvector (a.w) + na = abs (a); th = acos (a.w ./ na); n = bsxfun (@rdivide, [a.x a.y a.z] ,sqrt ((a.x).^2 + (a.y).^2 + (a.z).^2)); @@ -47,6 +48,23 @@ a.y = n(:,2) .* nab .* snt; a.z = n(:,3) .* nab .* snt; + else + + na = abs (a); + th = acos (a.w ./ na); + nv = sqrt ((a.x).^2 + (a.y).^2 + (a.z).^2); + n.x = a.x ./ nv; + n.y = a.y ./ nv; + n.z = a.z ./ nv; + + nab = na.^b; + a.w = nab .* cos (b.*th); + + snt = sin (b.*th); + a.x = n.x .* nab .* snt; + a.y = n.y .* nab .* snt; + a.z = n.z .* nab .* snt; + endif endfunction This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2011-11-15 14:12:52
|
Revision: 9101 http://octave.svn.sourceforge.net/octave/?rev=9101&view=rev Author: paramaniac Date: 2011-11-15 14:12:41 +0000 (Tue, 15 Nov 2011) Log Message: ----------- quaternion_oo: minor style fixes Modified Paths: -------------- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/abs.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/columns.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/conj.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/ctranspose.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/diag.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/display.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/eq.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/horzcat.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/inv.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/ispure.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/ldivide.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/minus.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mldivide.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mpower.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mrdivide.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mtimes.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/norm.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/plus.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/private/norm2.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/quaternion.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/rdivide.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/rows.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/size.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/subsref.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/times.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/transpose.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/uminus.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/unit.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/vertcat.m Added Paths: ----------- trunk/octave-forge/extra/quaternion_oo/devel/q_2x2.m Added: trunk/octave-forge/extra/quaternion_oo/devel/q_2x2.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/devel/q_2x2.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/devel/q_2x2.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -0,0 +1,10 @@ +w = [2, 6; 10, 14]; + +x = [3, 7; 11, 15]; + +y = [4, 8; 12, 16]; + +z = [5, 9; 13, 17]; + +q = quaternion (w, x, y, z) + Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/abs.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/abs.m 2011-11-15 14:04:39 UTC (rev 9100) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/abs.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -27,7 +27,6 @@ ## Created: August 2010 ## Version: 0.2 - function b = abs (a) if (nargin != 1) @@ -36,4 +35,4 @@ b = sqrt (norm2 (a)); -endfunction \ No newline at end of file +endfunction Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/columns.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/columns.m 2011-11-15 14:04:39 UTC (rev 9100) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/columns.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -20,7 +20,6 @@ ## Created: May 2010 ## Version: 0.1 - function c = columns (a) if (nargin != 1) @@ -29,4 +28,4 @@ c = columns (a.w); -endfunction \ No newline at end of file +endfunction Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/conj.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/conj.m 2011-11-15 14:04:39 UTC (rev 9100) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/conj.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -27,7 +27,6 @@ ## Created: May 2010 ## Version: 0.1 - function a = conj (a) if (nargin != 1) @@ -38,4 +37,4 @@ a.y = -a.y; a.z = -a.z; -endfunction \ No newline at end of file +endfunction Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/ctranspose.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/ctranspose.m 2011-11-15 14:04:39 UTC (rev 9100) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/ctranspose.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -14,13 +14,12 @@ ## along with this program. If not, see <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## Conjugate transpose of a quaternion. Used by Octave for "q'" +## Conjugate transpose of a quaternion. Used by Octave for "q'". ## Author: Lukas Reichlin <luk...@gm...> ## Created: May 2010 ## Version: 0.1 - function a = ctranspose (a) if (nargin != 1) @@ -29,4 +28,4 @@ a = conj (transpose (a)); -endfunction \ No newline at end of file +endfunction Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/diag.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/diag.m 2011-11-15 14:04:39 UTC (rev 9100) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/diag.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -28,7 +28,6 @@ ## Created: May 2010 ## Version: 0.1 - function a = diag (a, b = 0) if (nargin == 0 || nargin > 2) @@ -40,4 +39,4 @@ a.y = diag (a.y, b); a.z = diag (a.z, b); -endfunction \ No newline at end of file +endfunction Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/display.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/display.m 2011-11-15 14:04:39 UTC (rev 9100) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/display.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -20,7 +20,6 @@ ## Created: May 2010 ## Version: 0.2 - function display (q) name = inputname(1); Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/eq.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/eq.m 2011-11-15 14:04:39 UTC (rev 9100) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/eq.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -14,13 +14,12 @@ ## along with this program. If not, see <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## Equal to operator for two quaternions. Used by Octave for "q1 == q2" +## Equal to operator for two quaternions. Used by Octave for "q1 == q2". ## Author: Lukas Reichlin <luk...@gm...> ## Created: May 2010 ## Version: 0.1 - function flg = eq (a, b) if (! isa (a, "quaternion")) @@ -33,4 +32,4 @@ flg = (a.w == b.w) && (a.x == b.x) && (a.y == b.y) && (a.z == a.z); -endfunction \ No newline at end of file +endfunction Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/horzcat.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/horzcat.m 2011-11-15 14:04:39 UTC (rev 9100) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/horzcat.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -14,13 +14,12 @@ ## along with this program. If not, see <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## Horizontal concatenation of quaternions. Used by Octave for "[q1, q2]" +## Horizontal concatenation of quaternions. Used by Octave for "[q1, q2]". ## Author: Lukas Reichlin <luk...@gm...> ## Created: May 2010 ## Version: 0.1 - function q = horzcat (varargin) qstr = cellfun (@quaternion, varargin); # uniformoutput = true ! @@ -32,4 +31,4 @@ q = quaternion (w, x, y, z); -endfunction \ No newline at end of file +endfunction Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/inv.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/inv.m 2011-11-15 14:04:39 UTC (rev 9100) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/inv.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -22,7 +22,6 @@ ## Created: May 2010 ## Version: 0.2 - function a = inv (a) if (nargin != 1) @@ -42,4 +41,4 @@ a.y = -a.y / norm2; a.z = -a.z / norm2; -endfunction \ No newline at end of file +endfunction Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/ispure.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/ispure.m 2011-11-15 14:04:39 UTC (rev 9100) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/ispure.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -22,7 +22,6 @@ ## Created: May 2010 ## Version: 0.1 - function flg = ispure (a) if (nargin != 1) @@ -31,4 +30,4 @@ flg = all (all (abs (a.w) < eps)); -endfunction \ No newline at end of file +endfunction Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/ldivide.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/ldivide.m 2011-11-15 14:04:39 UTC (rev 9100) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/ldivide.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -14,15 +14,14 @@ ## along with this program. If not, see <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## Element-wise left division for quaternions. Used by Octave for "q1 .\ q2" +## Element-wise left division for quaternions. Used by Octave for "q1 .\ q2". ## Author: Lukas Reichlin <luk...@gm...> ## Created: May 2010 ## Version: 0.1 - function q = ldivide (a, b) q = a.^-1 .* b; -endfunction \ No newline at end of file +endfunction Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/minus.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/minus.m 2011-11-15 14:04:39 UTC (rev 9100) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/minus.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -14,13 +14,12 @@ ## along with this program. If not, see <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## Subtraction of two quaternions. Used by Octave for "q1 - q2" +## Subtraction of two quaternions. Used by Octave for "q1 - q2". ## Author: Lukas Reichlin <luk...@gm...> ## Created: May 2010 ## Version: 0.1 - function a = minus (a, b) if (! isa (a, "quaternion")) @@ -36,4 +35,4 @@ a.y = a.y - b.y; a.z = a.z - b.z; -endfunction \ No newline at end of file +endfunction Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mldivide.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mldivide.m 2011-11-15 14:04:39 UTC (rev 9100) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mldivide.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -14,15 +14,14 @@ ## along with this program. If not, see <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## Matrix left division for quaternions. Used by Octave for "q1 \ q2" +## Matrix left division for quaternions. Used by Octave for "q1 \ q2". ## Author: Lukas Reichlin <luk...@gm...> ## Created: May 2010 ## Version: 0.1 - function q = mldivide (a, b) q = inv (a) * b; -endfunction \ No newline at end of file +endfunction Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mpower.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mpower.m 2011-11-15 14:04:39 UTC (rev 9100) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mpower.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -20,7 +20,6 @@ ## Created: May 2010 ## Version: 0.1 - function a = mpower (a, b) if (b == -1 && isa (a, "quaternion") && isscalar (a.w)) @@ -32,4 +31,4 @@ ## TODO: - q1 ^ q2 ## - arrays -endfunction \ No newline at end of file +endfunction Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mrdivide.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mrdivide.m 2011-11-15 14:04:39 UTC (rev 9100) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mrdivide.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -14,15 +14,14 @@ ## along with this program. If not, see <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## Matrix right division for quaternions. Used by Octave for "q1 / q2" +## Matrix right division for quaternions. Used by Octave for "q1 / q2". ## Author: Lukas Reichlin <luk...@gm...> ## Created: May 2010 ## Version: 0.1 - function q = mrdivide (a, b) q = a * inv (b); -endfunction \ No newline at end of file +endfunction Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mtimes.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mtimes.m 2011-11-15 14:04:39 UTC (rev 9100) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mtimes.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -14,13 +14,12 @@ ## along with this program. If not, see <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## Matrix multiplication of two quaternions. Used by Octave for "q1 * q2" +## Matrix multiplication of two quaternions. Used by Octave for "q1 * q2". ## Author: Lukas Reichlin <luk...@gm...> ## Created: May 2010 ## Version: 0.1 - function a = mtimes (a, b) if (! isa (a, "quaternion")) @@ -41,4 +40,4 @@ a.y = y; a.z = z; -endfunction \ No newline at end of file +endfunction Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/norm.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/norm.m 2011-11-15 14:04:39 UTC (rev 9100) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/norm.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -22,7 +22,6 @@ ## Created: November 2011 ## Version: 0.1 - function n = norm (a) if (nargin != 1) Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/plus.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/plus.m 2011-11-15 14:04:39 UTC (rev 9100) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/plus.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -14,13 +14,12 @@ ## along with this program. If not, see <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## Addition of two quaternions. Used by Octave for "q1 + q2" +## Addition of two quaternions. Used by Octave for "q1 + q2". ## Author: Lukas Reichlin <luk...@gm...> ## Created: May 2010 ## Version: 0.1 - function a = plus (a, b) if (! isa (a, "quaternion")) @@ -36,4 +35,4 @@ a.y = a.y + b.y; a.z = a.z + b.z; -endfunction \ No newline at end of file +endfunction Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/private/norm2.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/private/norm2.m 2011-11-15 14:04:39 UTC (rev 9100) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/private/norm2.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -22,9 +22,8 @@ ## Created: November 2011 ## Version: 0.1 - function ret = norm2 (a) ret = a.w.^2 + a.x.^2 + a.y.^2 + a.z.^2; -endfunction \ No newline at end of file +endfunction Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/quaternion.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/quaternion.m 2011-11-15 14:04:39 UTC (rev 9100) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/quaternion.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -28,7 +28,6 @@ ## Created: May 2010 ## Version: 0.2 - function q = quaternion (a, b, c, d) switch (nargin) Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/rdivide.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/rdivide.m 2011-11-15 14:04:39 UTC (rev 9100) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/rdivide.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -14,15 +14,14 @@ ## along with this program. If not, see <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## Element-wise right division for quaternions. Used by Octave for "q1 ./ q2" +## Element-wise right division for quaternions. Used by Octave for "q1 ./ q2". ## Author: Lukas Reichlin <luk...@gm...> ## Created: May 2010 ## Version: 0.1 - function q = rdivide (a, b) q = a .* b.^-1; -endfunction \ No newline at end of file +endfunction Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/rows.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/rows.m 2011-11-15 14:04:39 UTC (rev 9100) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/rows.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -20,7 +20,6 @@ ## Created: May 2010 ## Version: 0.1 - function r = rows (a) if (nargin != 1) @@ -29,4 +28,4 @@ r = rows (a.w); -endfunction \ No newline at end of file +endfunction Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/size.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/size.m 2011-11-15 14:04:39 UTC (rev 9100) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/size.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -20,7 +20,6 @@ ## Created: May 2010 ## Version: 0.1 - function [s, varargout] = size (a, b) switch (nargout) @@ -47,4 +46,4 @@ print_usage (); endswitch -endfunction \ No newline at end of file +endfunction Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/subsref.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/subsref.m 2011-11-15 14:04:39 UTC (rev 9100) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/subsref.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -14,13 +14,12 @@ ## along with this program. If not, see <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## Subscripted reference for quaternions. Used by Octave for "q.w" +## Subscripted reference for quaternions. Used by Octave for "q.w". ## Author: Lukas Reichlin <luk...@gm...> ## Created: May 2010 ## Version: 0.1.1 - function ret = subsref (q, s) switch (s(1).type) @@ -77,4 +76,4 @@ error ("quaternion: invalid subscript type"); endswitch -endfunction \ No newline at end of file +endfunction Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/times.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/times.m 2011-11-15 14:04:39 UTC (rev 9100) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/times.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -14,13 +14,12 @@ ## along with this program. If not, see <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## Element-wise multiplication of two quaternions. Used by Octave for "q1 .* q2" +## Element-wise multiplication of two quaternions. Used by Octave for "q1 .* q2". ## Author: Lukas Reichlin <luk...@gm...> ## Created: May 2010 ## Version: 0.1 - function a = times (a, b) if (! isa (a, "quaternion")) @@ -41,4 +40,4 @@ a.y = y; a.z = z; -endfunction \ No newline at end of file +endfunction Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/transpose.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/transpose.m 2011-11-15 14:04:39 UTC (rev 9100) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/transpose.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -14,13 +14,12 @@ ## along with this program. If not, see <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## Transpose of a quaternion. Used by Octave for "q.'" +## Transpose of a quaternion. Used by Octave for "q.'". ## Author: Lukas Reichlin <luk...@gm...> ## Created: May 2010 ## Version: 0.1 - function a = transpose (a) if (nargin != 1) @@ -32,4 +31,4 @@ a.y = transpose (a.y); a.z = transpose (a.z); -endfunction \ No newline at end of file +endfunction Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/uminus.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/uminus.m 2011-11-15 14:04:39 UTC (rev 9100) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/uminus.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -14,13 +14,12 @@ ## along with this program. If not, see <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## Unary minus of a quaternion. Used by Octave for "-q" +## Unary minus of a quaternion. Used by Octave for "-q". ## Author: Lukas Reichlin <luk...@gm...> ## Created: May 2010 ## Version: 0.1 - function a = uminus (a) a.w = -a.w; @@ -28,4 +27,4 @@ a.y = -a.y; a.z = -a.z; -endfunction \ No newline at end of file +endfunction Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/unit.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/unit.m 2011-11-15 14:04:39 UTC (rev 9100) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/unit.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -27,7 +27,6 @@ ## Created: November 2011 ## Version: 0.1 - function q = unit (a) if (nargin != 1) @@ -36,4 +35,4 @@ q = a ./ abs (a); -endfunction \ No newline at end of file +endfunction Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/vertcat.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/vertcat.m 2011-11-15 14:04:39 UTC (rev 9100) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/vertcat.m 2011-11-15 14:12:41 UTC (rev 9101) @@ -14,13 +14,12 @@ ## along with this program. If not, see <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## Vertical concatenation of quaternions. Used by Octave for "[q1; q2]" +## Vertical concatenation of quaternions. Used by Octave for "[q1; q2]". ## Author: Lukas Reichlin <luk...@gm...> ## Created: May 2010 ## Version: 0.1 - function q = vertcat (varargin) qstr = cellfun (@quaternion, varargin); # uniformoutput = true ! @@ -32,4 +31,4 @@ q = quaternion (w, x, y, z); -endfunction \ No newline at end of file +endfunction This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2011-11-16 10:18:29
|
Revision: 9114 http://octave.svn.sourceforge.net/octave/?rev=9114&view=rev Author: paramaniac Date: 2011-11-16 10:18:18 +0000 (Wed, 16 Nov 2011) Log Message: ----------- quaternion_oo: minor style fixes Modified Paths: -------------- trunk/octave-forge/extra/quaternion_oo/devel/PROJECTS trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/ldivide.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mldivide.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/power.m Modified: trunk/octave-forge/extra/quaternion_oo/devel/PROJECTS =================================================================== --- trunk/octave-forge/extra/quaternion_oo/devel/PROJECTS 2011-11-16 07:52:13 UTC (rev 9113) +++ trunk/octave-forge/extra/quaternion_oo/devel/PROJECTS 2011-11-16 10:18:18 UTC (rev 9114) @@ -24,7 +24,7 @@ * Add subsasgn. - * Implement (integer) power and mpower. + * Implement mpower. * Inverses of quaternion arrays. Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/ldivide.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/ldivide.m 2011-11-16 07:52:13 UTC (rev 9113) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/ldivide.m 2011-11-16 10:18:18 UTC (rev 9114) @@ -14,7 +14,7 @@ ## along with this program. If not, see <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## Element-wise left division for quaternions. Used by Octave for "q1 .\ q2". +## Element-wise left division for quaternions. Used by Octave for "q1 .\\ q2". ## Author: Lukas Reichlin <luk...@gm...> ## Created: May 2010 Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mldivide.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mldivide.m 2011-11-16 07:52:13 UTC (rev 9113) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/mldivide.m 2011-11-16 10:18:18 UTC (rev 9114) @@ -14,7 +14,7 @@ ## along with this program. If not, see <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## Matrix left division for quaternions. Used by Octave for "q1 \ q2". +## Matrix left division for quaternions. Used by Octave for "q1 \\ q2". ## Author: Lukas Reichlin <luk...@gm...> ## Created: May 2010 Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/power.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/power.m 2011-11-16 07:52:13 UTC (rev 9113) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/power.m 2011-11-16 10:18:18 UTC (rev 9114) @@ -26,7 +26,7 @@ function a = power (a, b) if (! isreal (b)) - error("quaternion: power: exponent must be real"); + error ("quaternion: power: exponent must be real"); endif ## NOTE: if b is real, a is always a quaternion because This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2011-11-17 20:52:23
|
Revision: 9120 http://octave.svn.sourceforge.net/octave/?rev=9120&view=rev Author: paramaniac Date: 2011-11-17 20:52:16 +0000 (Thu, 17 Nov 2011) Log Message: ----------- quaternion_oo: add exp Added Paths: ----------- trunk/octave-forge/extra/quaternion_oo/devel/quat.pdf trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/exp.m Added: trunk/octave-forge/extra/quaternion_oo/devel/quat.pdf =================================================================== (Binary files differ) Property changes on: trunk/octave-forge/extra/quaternion_oo/devel/quat.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/exp.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/exp.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/exp.m 2011-11-17 20:52:16 UTC (rev 9120) @@ -0,0 +1,38 @@ +## Copyright (C) 2011 Lukas F. Reichlin +## +## 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 -*- +## Exponential of a quaternion. Used by octave for "exp (q)". + +## Author: Lukas Reichlin <luk...@gm...> +## Created: November 2011 +## Version: 0.1 + +function q = exp (q) + + if (nargin != 1) + print_usage (); + endif + + normv = sqrt (q.x.^2 + q.y.^2 + q.z.^2); + exps = exp (q.w); + sinv = sin (normv); + + q.w = exps .* cos (normv); + q.x = exps .* (q.x ./ normv) .* sinv; + q.y = exps .* (q.y ./ normv) .* sinv; + q.z = exps .* (q.z ./ normv) .* sinv; + +endfunction This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2011-11-18 08:14:54
|
Revision: 9128 http://octave.svn.sourceforge.net/octave/?rev=9128&view=rev Author: paramaniac Date: 2011-11-18 08:14:47 +0000 (Fri, 18 Nov 2011) Log Message: ----------- quaternion_oo: add uplus Modified Paths: -------------- trunk/octave-forge/extra/quaternion_oo/INDEX Added Paths: ----------- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/uplus.m Modified: trunk/octave-forge/extra/quaternion_oo/INDEX =================================================================== --- trunk/octave-forge/extra/quaternion_oo/INDEX 2011-11-18 07:08:09 UTC (rev 9127) +++ trunk/octave-forge/extra/quaternion_oo/INDEX 2011-11-18 08:14:47 UTC (rev 9128) @@ -10,9 +10,12 @@ @quaternion/size @quaternion/unit @quaternion/norm + @quaternion/exp + @quaternion/log Overloaded and Arithmetic Operators @quaternion/plus @quaternion/minus + @quaternion/uplus @quaternion/uminus @quaternion/times @quaternion/mtimes @@ -23,12 +26,9 @@ @quaternion/mldivide @quaternion/power @quaternion/mpower - @quaternion/exp - @quaternion/log @quaternion/transpose @quaternion/ctranspose @quaternion/horzcat @quaternion/vertcat @quaternion/subsref @quaternion/eq - Added: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/uplus.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/uplus.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/uplus.m 2011-11-18 08:14:47 UTC (rev 9128) @@ -0,0 +1,27 @@ +## Copyright (C) 2011 Lukas F. Reichlin +## +## 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 -*- +## Unary plus of a quaternion. Used by Octave for "+q". + +## Author: Lukas Reichlin <luk...@gm...> +## Created: November 2011 +## Version: 0.1 + +function a = uplus (a) + + ## nothing to do here + +endfunction This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2011-11-19 15:43:58
|
Revision: 9138 http://octave.svn.sourceforge.net/octave/?rev=9138&view=rev Author: paramaniac Date: 2011-11-19 15:43:51 +0000 (Sat, 19 Nov 2011) Log Message: ----------- quaternion_oo: add cat Modified Paths: -------------- trunk/octave-forge/extra/quaternion_oo/INDEX Added Paths: ----------- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/cat.m Modified: trunk/octave-forge/extra/quaternion_oo/INDEX =================================================================== --- trunk/octave-forge/extra/quaternion_oo/INDEX 2011-11-19 09:28:05 UTC (rev 9137) +++ trunk/octave-forge/extra/quaternion_oo/INDEX 2011-11-19 15:43:51 UTC (rev 9138) @@ -4,6 +4,7 @@ @quaternion/abs @quaternion/conj @quaternion/diag + @quaternion/inv @quaternion/ispure @quaternion/rows @quaternion/columns @@ -12,6 +13,7 @@ @quaternion/norm @quaternion/exp @quaternion/log + @quaternion/cat Overloaded and Arithmetic Operators @quaternion/plus @quaternion/minus @@ -19,7 +21,6 @@ @quaternion/uminus @quaternion/times @quaternion/mtimes - @quaternion/inv @quaternion/rdivide @quaternion/ldivide @quaternion/mrdivide Added: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/cat.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/cat.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/cat.m 2011-11-19 15:43:51 UTC (rev 9138) @@ -0,0 +1,36 @@ +## Copyright (C) 2011 Lukas F. Reichlin +## +## 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{q} =} cat (@var{dim}, @var{q1}, @var{q2}, @dots{}) +## Concatenation of quaternions along dimension @var{dim}. +## @end deftypefn + +## Author: Lukas Reichlin <luk...@gm...> +## Created: November 2011 +## Version: 0.1 + +function q = cat (dim, varargin) + + qstr = cellfun (@quaternion, varargin); # uniformoutput = true ! + + w = cat (dim, qstr.w); + x = cat (dim, qstr.x); + y = cat (dim, qstr.y); + z = cat (dim, qstr.z); + + q = quaternion (w, x, y, z); + +endfunction This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2011-11-19 21:21:49
|
Revision: 9143 http://octave.svn.sourceforge.net/octave/?rev=9143&view=rev Author: paramaniac Date: 2011-11-19 21:21:42 +0000 (Sat, 19 Nov 2011) Log Message: ----------- quaternion_oo: move files, add header Added Paths: ----------- trunk/octave-forge/extra/quaternion_oo/inst/q2rot.m trunk/octave-forge/extra/quaternion_oo/inst/rot2q.m Removed Paths: ------------- trunk/octave-forge/extra/quaternion_oo/devel/q2rot.m trunk/octave-forge/extra/quaternion_oo/devel/rot2q.m Deleted: trunk/octave-forge/extra/quaternion_oo/devel/q2rot.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/devel/q2rot.m 2011-11-19 21:07:44 UTC (rev 9142) +++ trunk/octave-forge/extra/quaternion_oo/devel/q2rot.m 2011-11-19 21:21:42 UTC (rev 9143) @@ -1,31 +0,0 @@ -function [vv, theta] = q2rot (q) - - if (nargin != 1 || nargout != 2) - print_usage (); - endif - - if (abs (norm (q) - 1) > 1e-12) - warning ("quaternion: ||q||=%e, setting=1 for vv, theta", norm (q)); - q = unit (q); - endif - - s = q.s; - x = q.x; - y = q.y; - z = q.z; - - theta = acos (s) * 2; - - if (abs (theta) > pi) - theta = theta - sign (theta) * pi; - endif - - sin_th_2 = norm ([x, y, z]); - - if (sin_th_2 != 0) - vv = [x, y, z] / sin_th_2; - else - vv = [x, y, z]; - endif - -endfunction \ No newline at end of file Deleted: trunk/octave-forge/extra/quaternion_oo/devel/rot2q.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/devel/rot2q.m 2011-11-19 21:07:44 UTC (rev 9142) +++ trunk/octave-forge/extra/quaternion_oo/devel/rot2q.m 2011-11-19 21:21:42 UTC (rev 9143) @@ -1,33 +0,0 @@ -function q = rot2q (vv, theta) - - if (nargin != 2 || nargout != 1) - print_usage (); - endif - - if (! isvector (vv) || length (vv) != 3) - error ("vv must be a length three vector"); - endif - - if (! isscalar (theta)) - error ("theta must be a scalar"); - endif - - if (norm (vv) == 0) - error ("quaternion: vv is zero"); - endif - - if (abs (norm (vv) - 1) > 1e-12) - warning ("quaternion: ||vv|| != 1, normalizing") - vv = vv / norm (vv); - endif - - if (abs (theta) > 2*pi) - warning ("quaternion: |theta| > 2 pi, normalizing") - theta = rem (theta, 2*pi); - endif - - vv = vv * sin (theta / 2); - d = cos (theta / 2); - q = quaternion (d, vv(1), vv(2), vv(3)); - -endfunction \ No newline at end of file Copied: trunk/octave-forge/extra/quaternion_oo/inst/q2rot.m (from rev 9138, trunk/octave-forge/extra/quaternion_oo/devel/q2rot.m) =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/q2rot.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/inst/q2rot.m 2011-11-19 21:21:42 UTC (rev 9143) @@ -0,0 +1,55 @@ +## Copyright (C) 1998, 1999, 2000, 2002, 2005, 2006, 2007 Auburn University +## Copyright (C) 2010, 2011 Lukas F. Reichlin +## +## 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 -*- +## TODO + +## Adapted from: quaternion by A. S. Hodel <a.s...@en...> +## Author: Lukas Reichlin <luk...@gm...> +## Created: May 2010 +## Version: 0.1 + +function [vv, theta] = q2rot (q) + + if (nargin != 1 || nargout != 2) + print_usage (); + endif + + if (abs (norm (q) - 1) > 1e-12) + warning ("quaternion: ||q||=%e, setting=1 for vv, theta", norm (q)); + q = unit (q); + endif + + s = q.s; + x = q.x; + y = q.y; + z = q.z; + + theta = acos (s) * 2; + + if (abs (theta) > pi) + theta = theta - sign (theta) * pi; + endif + + sin_th_2 = norm ([x, y, z]); + + if (sin_th_2 != 0) + vv = [x, y, z] / sin_th_2; + else + vv = [x, y, z]; + endif + +endfunction \ No newline at end of file Copied: trunk/octave-forge/extra/quaternion_oo/inst/rot2q.m (from rev 9138, trunk/octave-forge/extra/quaternion_oo/devel/rot2q.m) =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/rot2q.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/inst/rot2q.m 2011-11-19 21:21:42 UTC (rev 9143) @@ -0,0 +1,57 @@ +## Copyright (C) 1998, 1999, 2000, 2002, 2005, 2006, 2007 Auburn University +## Copyright (C) 2010, 2011 Lukas F. Reichlin +## +## 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 -*- +## TODO + +## Adapted from: quaternion by A. S. Hodel <a.s...@en...> +## Author: Lukas Reichlin <luk...@gm...> +## Created: May 2010 +## Version: 0.1 + +function q = rot2q (vv, theta) + + if (nargin != 2 || nargout != 1) + print_usage (); + endif + + if (! isvector (vv) || length (vv) != 3) + error ("vv must be a length three vector"); + endif + + if (! isscalar (theta)) + error ("theta must be a scalar"); + endif + + if (norm (vv) == 0) + error ("quaternion: vv is zero"); + endif + + if (abs (norm (vv) - 1) > 1e-12) + warning ("quaternion: ||vv|| != 1, normalizing") + vv = vv / norm (vv); + endif + + if (abs (theta) > 2*pi) + warning ("quaternion: |theta| > 2 pi, normalizing") + theta = rem (theta, 2*pi); + endif + + vv = vv * sin (theta / 2); + d = cos (theta / 2); + q = quaternion (d, vv(1), vv(2), vv(3)); + +endfunction \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2011-11-21 10:53:09
|
Revision: 9162 http://octave.svn.sourceforge.net/octave/?rev=9162&view=rev Author: paramaniac Date: 2011-11-21 10:53:02 +0000 (Mon, 21 Nov 2011) Log Message: ----------- quaternion_oo: add example to docstring Modified Paths: -------------- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/quaternion.m Added Paths: ----------- trunk/octave-forge/extra/quaternion_oo/devel/q_2x3.m Added: trunk/octave-forge/extra/quaternion_oo/devel/q_2x3.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/devel/q_2x3.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/devel/q_2x3.m 2011-11-21 10:53:02 UTC (rev 9162) @@ -0,0 +1,10 @@ +w = [2, 6, 10; 14, 18, 22]; + +x = [3, 7, 11; 15, 19, 23]; + +y = [4, 8, 12; 16, 20, 24]; + +z = [5, 9, 13; 17, 21, 25]; + +q = quaternion (w, x, y, z) + Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/quaternion.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/quaternion.m 2011-11-21 01:27:28 UTC (rev 9161) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/quaternion.m 2011-11-21 10:53:02 UTC (rev 9162) @@ -24,7 +24,51 @@ ## @end example ## ## Arguments @var{w}, @var{x}, @var{y} and @var{z} can be scalars or -## matrices, but they must be real and of equal size. +## matrices, but they must be real and of equal size. If scalar part +## @var{w} or components @var{x}, @var{y} and @var{z} of the vector +## part are not specified, zero matrices of appropriate size are +## assumed. +## +## @strong{Example} +## @example +## @group +## octave:1> q = quaternion (2) +## q = 2 + 0i + 0j + 0k +## +## octave:2> q = quaternion (3, 4, 5) +## q = 0 + 3i + 4j + 5k +## +## octave:3> q = quaternion (2, 3, 4, 5) +## q = 2 + 3i + 4j + 5k +## @end group +## @end example +## @example +## @group +## octave:4> w = [2, 6, 10; 14, 18, 22]; +## octave:5> x = [3, 7, 11; 15, 19, 23]; +## octave:6> y = [4, 8, 12; 16, 20, 24]; +## octave:7> z = [5, 9, 13; 17, 21, 25]; +## octave:8> q = quaternion (w, x, y, z) +## q.w = +## 2 6 10 +## 14 18 22 +## +## q.x = +## 3 7 11 +## 15 19 23 +## +## q.y = +## 4 8 12 +## 16 20 24 +## +## q.z = +## 5 9 13 +## 17 21 25 +## +## octave:9> +## @end group +## @end example +## ## @end deftypefn ## Author: Lukas Reichlin <luk...@gm...> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2011-12-02 05:10:38
|
Revision: 9242 http://octave.svn.sourceforge.net/octave/?rev=9242&view=rev Author: paramaniac Date: 2011-12-02 05:10:32 +0000 (Fri, 02 Dec 2011) Log Message: ----------- quaternion: deactivate subsasgn because of strange effects Added Paths: ----------- trunk/octave-forge/extra/quaternion_oo/devel/subsasgn.m Removed Paths: ------------- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/subsasgn.m Copied: trunk/octave-forge/extra/quaternion_oo/devel/subsasgn.m (from rev 9241, trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/subsasgn.m) =================================================================== --- trunk/octave-forge/extra/quaternion_oo/devel/subsasgn.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/devel/subsasgn.m 2011-12-02 05:10:32 UTC (rev 9242) @@ -0,0 +1,81 @@ +## Copyright (C) 2011 Lukas F. Reichlin +## +## 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 -*- +## Subscripted assignment for quaternions. +## Used by Octave for "q.key = value". + +## Author: Lukas Reichlin <luk...@gm...> +## Created: November 2011 +## Version: 0.1 + +function ret = subsasgn (q, idx, val) +idx, val + error ("quaternion: subsasgn: under construction"); + + switch (idx(1).type) + case "." + if (length (idx) == 1) + ret = set (q, idx.subs, val); + else + prop = idx(1).subs; + sys = set (q, prop, subsasgn (get (q, prop), idx(2:end), val)); + endif + + otherwise + error ("quaternion: subsasgn: invalid subscripted assignment type"); + + endswitch + + ## TODO: q.w = matrix + ## q.x(:, 1) = matrix + + ## TODO: q(1:2, 3) = quaternion + + switch (s(1).type) + case "." # q.w + switch (tolower (s(1).subs)) + case {"w", "s"} # scalar part + ## ret = subsref (q.w, s(2:end)); + ret = q.w; + case {"x", "i"} + ## ret = subsref (q.x, s(2:end)); + ret = q.x; + case {"y", "j"} + ## ret = subsref (q.y, s(2:end)); + ret = q.y; + case {"z", "k"} + ## ret = subsref (q.z, s(2:end)); + ret = q.z; + case "v" # vector part, scalar part set to zero + q.w = zeros (size (q.w), class (q.w)); + ## ret = subsref (q, s(2:end)); + ret = q; + otherwise + error ("quaternion: invalid subscript name"); + endswitch + + case "()" # q(...) + w = subsref (q.w, s); + x = subsref (q.x, s); + y = subsref (q.y, s); + z = subsref (q.z, s); + ret = quaternion (w, x, y, z); + + otherwise + error ("quaternion: invalid subscript type"); + endswitch + +endfunction Deleted: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/subsasgn.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/subsasgn.m 2011-12-01 21:58:07 UTC (rev 9241) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/subsasgn.m 2011-12-02 05:10:32 UTC (rev 9242) @@ -1,81 +0,0 @@ -## Copyright (C) 2011 Lukas F. Reichlin -## -## 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 -*- -## Subscripted assignment for quaternions. -## Used by Octave for "q.key = value". - -## Author: Lukas Reichlin <luk...@gm...> -## Created: November 2011 -## Version: 0.1 - -function ret = subsasgn (q, idx, val) - - error ("quaternion: subsasgn: under construction"); - - switch (idx(1).type) - case "." - if (length (idx) == 1) - ret = set (q, idx.subs, val); - else - prop = idx(1).subs; - sys = set (q, prop, subsasgn (get (q, prop), idx(2:end), val)); - endif - - otherwise - error ("quaternion: subsasgn: invalid subscripted assignment type"); - - endswitch - - ## TODO: q.w = matrix - ## q.x(:, 1) = matrix - - ## TODO: q(1:2, 3) = quaternion - - switch (s(1).type) - case "." # q.w - switch (tolower (s(1).subs)) - case {"w", "s"} # scalar part - ## ret = subsref (q.w, s(2:end)); - ret = q.w; - case {"x", "i"} - ## ret = subsref (q.x, s(2:end)); - ret = q.x; - case {"y", "j"} - ## ret = subsref (q.y, s(2:end)); - ret = q.y; - case {"z", "k"} - ## ret = subsref (q.z, s(2:end)); - ret = q.z; - case "v" # vector part, scalar part set to zero - q.w = zeros (size (q.w), class (q.w)); - ## ret = subsref (q, s(2:end)); - ret = q; - otherwise - error ("quaternion: invalid subscript name"); - endswitch - - case "()" # q(...) - w = subsref (q.w, s); - x = subsref (q.x, s); - y = subsref (q.y, s); - z = subsref (q.z, s); - ret = quaternion (w, x, y, z); - - otherwise - error ("quaternion: invalid subscript type"); - endswitch - -endfunction This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2011-12-02 05:26:09
|
Revision: 9243 http://octave.svn.sourceforge.net/octave/?rev=9243&view=rev Author: paramaniac Date: 2011-12-02 05:26:03 +0000 (Fri, 02 Dec 2011) Log Message: ----------- quaternion: add test Modified Paths: -------------- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/diag.m Added Paths: ----------- trunk/octave-forge/extra/quaternion_oo/devel/qbug.m trunk/octave-forge/extra/quaternion_oo/inst/test_quaternion.m Added: trunk/octave-forge/extra/quaternion_oo/devel/qbug.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/devel/qbug.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/devel/qbug.m 2011-12-02 05:26:03 UTC (rev 9243) @@ -0,0 +1,3 @@ +q = quaternion (2, 3, 4, 5) + +diag ([q, q, q]) \ No newline at end of file Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/diag.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/diag.m 2011-12-02 05:10:32 UTC (rev 9242) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/diag.m 2011-12-02 05:26:03 UTC (rev 9243) @@ -40,3 +40,14 @@ a.z = diag (a.z, b); endfunction + + +%!shared R, S +%! Q = quaternion (2, 3, 4, 5); +%! R = diag ([Q, Q, Q]); +%! W = diag ([2, 2, 2]); +%! X = diag ([3, 3, 3]); +%! Y = diag ([4, 4, 4]); +%! Z = diag ([5, 5, 5]); +%! S = quaternion (W, X, Y, Z); +%!assert (R, S); Added: trunk/octave-forge/extra/quaternion_oo/inst/test_quaternion.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/test_quaternion.m (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/inst/test_quaternion.m 2011-12-02 05:26:03 UTC (rev 9243) @@ -0,0 +1,2 @@ +test @quaternion/diag +test @quaternion/dot \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2011-12-02 06:19:21
|
Revision: 9245 http://octave.svn.sourceforge.net/octave/?rev=9245&view=rev Author: paramaniac Date: 2011-12-02 06:19:13 +0000 (Fri, 02 Dec 2011) Log Message: ----------- quaternion_oo: support n-dimensional arrays of quaternions Modified Paths: -------------- trunk/octave-forge/extra/quaternion_oo/devel/makefile_quaternion.m trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/quaternion.m trunk/octave-forge/extra/quaternion_oo/src/Makefile Added Paths: ----------- trunk/octave-forge/extra/quaternion_oo/src/is_real_array.cc Removed Paths: ------------- trunk/octave-forge/extra/quaternion_oo/src/is_real_matrice.cc Modified: trunk/octave-forge/extra/quaternion_oo/devel/makefile_quaternion.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/devel/makefile_quaternion.m 2011-12-02 05:59:39 UTC (rev 9244) +++ trunk/octave-forge/extra/quaternion_oo/devel/makefile_quaternion.m 2011-12-02 06:19:13 UTC (rev 9245) @@ -12,7 +12,7 @@ srcdir = [develdir, "/../src"]; cd (srcdir); -mkoctfile is_real_matrice.cc +mkoctfile is_real_array.cc system ("rm *.o"); cd (homedir); \ No newline at end of file Modified: trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/quaternion.m =================================================================== --- trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/quaternion.m 2011-12-02 05:59:39 UTC (rev 9244) +++ trunk/octave-forge/extra/quaternion_oo/inst/@quaternion/quaternion.m 2011-12-02 06:19:13 UTC (rev 9245) @@ -98,7 +98,7 @@ print_usage (); endswitch - if (! is_real_matrice (a, b, c, d)) + if (! is_real_array (a, b, c, d)) error ("quaternion: arguments must be real matrices"); endif Modified: trunk/octave-forge/extra/quaternion_oo/src/Makefile =================================================================== --- trunk/octave-forge/extra/quaternion_oo/src/Makefile 2011-12-02 05:59:39 UTC (rev 9244) +++ trunk/octave-forge/extra/quaternion_oo/src/Makefile 2011-12-02 06:19:13 UTC (rev 9245) @@ -1,8 +1,8 @@ -all: is_real_matrice.oct +all: is_real_array.oct # helper -is_real_matrice.oct: is_real_matrice.cc - mkoctfile is_real_matrice.cc +is_real_array.oct: is_real_array.cc + mkoctfile is_real_array.cc clean: rm *.o core octave-core *.oct *~ Copied: trunk/octave-forge/extra/quaternion_oo/src/is_real_array.cc (from rev 9244, trunk/octave-forge/extra/quaternion_oo/src/is_real_matrice.cc) =================================================================== --- trunk/octave-forge/extra/quaternion_oo/src/is_real_array.cc (rev 0) +++ trunk/octave-forge/extra/quaternion_oo/src/is_real_array.cc 2011-12-02 06:19:13 UTC (rev 9245) @@ -0,0 +1,60 @@ +/* + +Copyright (C) 2011 Lukas F. Reichlin + +This file is part of LTI Syncope. + +LTI Syncope 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. + +LTI Syncope 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 LTI Syncope. If not, see <http://www.gnu.org/licenses/>. + +Return true if argument is a real array. + +Author: Lukas Reichlin <luk...@gm...> +Created: November 2011 +Version: 0.2 + +*/ + +#include <octave/oct.h> + +DEFUN_DLD (is_real_array, args, nargout, + "-*- texinfo -*-\n\ +@deftypefn {Loadable Function} {} is_real_array (@var{a}, @dots{})\n\ +Return true if argument is a real array.\n\ +@var{[]} is a valid array.\n\ +Avoid nasty stuff like @code{true = isreal (\"a\")}.\n\ +@end deftypefn") +{ + octave_value retval = true; + int nargin = args.length (); + + if (nargin == 0) + { + print_usage (); + } + else + { + for (int i = 0; i < nargin; i++) + { + // args(i).ndims () should be always >= 2 + if (args(i).ndims () < 2 || ! args(i).is_numeric_type () + || ! args(i).is_real_type ()) + { + retval = false; + break; + } + } + } + + return retval; +} Deleted: trunk/octave-forge/extra/quaternion_oo/src/is_real_matrice.cc =================================================================== --- trunk/octave-forge/extra/quaternion_oo/src/is_real_matrice.cc 2011-12-02 05:59:39 UTC (rev 9244) +++ trunk/octave-forge/extra/quaternion_oo/src/is_real_matrice.cc 2011-12-02 06:19:13 UTC (rev 9245) @@ -1,61 +0,0 @@ -/* - -Copyright (C) 2010 Lukas F. Reichlin - -This file is part of LTI Syncope. - -LTI Syncope 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. - -LTI Syncope 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 LTI Syncope. If not, see <http://www.gnu.org/licenses/>. - -Return true if argument is a real matrix. - -Author: Lukas Reichlin <luk...@gm...> -Created: September 2010 -Version: 0.1 - -*/ - -#include <octave/oct.h> - -DEFUN_DLD (is_real_matrice, args, nargout, - "-*- texinfo -*-\n\ -@deftypefn {Loadable Function} {} is_real_matrice (@var{a}, @dots{})\n\ -Return true if argument is a real matrix.\n\ -@var{[]} is a valid matrix.\n\ -Avoid nasty stuff like @code{true = isreal (\"a\")}.\n\ -Renamed to is_real_matrice to avoid conflicts with \n\ -is_real_matrix from the control package.\n\ -@end deftypefn") -{ - octave_value retval = true; - int nargin = args.length (); - - if (nargin == 0) - { - print_usage (); - } - else - { - for (int i = 0; i < nargin; i++) - { - if (args(i).ndims () != 2 || ! args(i).is_numeric_type () - || ! args(i).is_real_type ()) - { - retval = false; - break; - } - } - } - - return retval; -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |