You can subscribe to this list here.
2001 
_{Jan}

_{Feb}

_{Mar}

_{Apr}

_{May}

_{Jun}

_{Jul}
(10) 
_{Aug}
(5) 
_{Sep}
(3) 
_{Oct}
(41) 
_{Nov}
(41) 
_{Dec}
(33) 

2002 
_{Jan}
(75) 
_{Feb}
(10) 
_{Mar}
(170) 
_{Apr}
(174) 
_{May}
(66) 
_{Jun}
(11) 
_{Jul}
(10) 
_{Aug}
(44) 
_{Sep}
(73) 
_{Oct}
(28) 
_{Nov}
(139) 
_{Dec}
(52) 
2003 
_{Jan}
(35) 
_{Feb}
(93) 
_{Mar}
(62) 
_{Apr}
(10) 
_{May}
(55) 
_{Jun}
(70) 
_{Jul}
(37) 
_{Aug}
(16) 
_{Sep}
(56) 
_{Oct}
(31) 
_{Nov}
(57) 
_{Dec}
(83) 
2004 
_{Jan}
(85) 
_{Feb}
(67) 
_{Mar}
(27) 
_{Apr}
(37) 
_{May}
(75) 
_{Jun}
(85) 
_{Jul}
(160) 
_{Aug}
(68) 
_{Sep}
(104) 
_{Oct}
(25) 
_{Nov}
(39) 
_{Dec}
(23) 
2005 
_{Jan}
(10) 
_{Feb}
(45) 
_{Mar}
(43) 
_{Apr}
(19) 
_{May}
(108) 
_{Jun}
(31) 
_{Jul}
(41) 
_{Aug}
(23) 
_{Sep}
(65) 
_{Oct}
(58) 
_{Nov}
(44) 
_{Dec}
(54) 
2006 
_{Jan}
(96) 
_{Feb}
(27) 
_{Mar}
(69) 
_{Apr}
(59) 
_{May}
(67) 
_{Jun}
(35) 
_{Jul}
(13) 
_{Aug}
(461) 
_{Sep}
(160) 
_{Oct}
(399) 
_{Nov}
(32) 
_{Dec}
(72) 
2007 
_{Jan}
(316) 
_{Feb}
(305) 
_{Mar}
(318) 
_{Apr}
(54) 
_{May}
(194) 
_{Jun}
(173) 
_{Jul}
(282) 
_{Aug}
(91) 
_{Sep}
(227) 
_{Oct}
(365) 
_{Nov}
(168) 
_{Dec}
(18) 
2008 
_{Jan}
(71) 
_{Feb}
(111) 
_{Mar}
(155) 
_{Apr}
(173) 
_{May}
(70) 
_{Jun}
(67) 
_{Jul}
(55) 
_{Aug}
(83) 
_{Sep}
(32) 
_{Oct}
(68) 
_{Nov}
(80) 
_{Dec}
(29) 
2009 
_{Jan}
(46) 
_{Feb}
(18) 
_{Mar}
(95) 
_{Apr}
(76) 
_{May}
(140) 
_{Jun}
(98) 
_{Jul}
(84) 
_{Aug}
(123) 
_{Sep}
(94) 
_{Oct}
(131) 
_{Nov}
(142) 
_{Dec}
(125) 
2010 
_{Jan}
(128) 
_{Feb}
(158) 
_{Mar}
(172) 
_{Apr}
(134) 
_{May}
(94) 
_{Jun}
(84) 
_{Jul}
(32) 
_{Aug}
(127) 
_{Sep}
(167) 
_{Oct}
(109) 
_{Nov}
(69) 
_{Dec}
(78) 
2011 
_{Jan}
(39) 
_{Feb}
(58) 
_{Mar}
(52) 
_{Apr}
(47) 
_{May}
(56) 
_{Jun}
(76) 
_{Jul}
(55) 
_{Aug}
(54) 
_{Sep}
(165) 
_{Oct}
(255) 
_{Nov}
(328) 
_{Dec}
(263) 
2012 
_{Jan}
(82) 
_{Feb}
(147) 
_{Mar}
(400) 
_{Apr}
(216) 
_{May}
(209) 
_{Jun}
(160) 
_{Jul}
(86) 
_{Aug}
(141) 
_{Sep}
(156) 
_{Oct}
(6) 
_{Nov}

_{Dec}

S  M  T  W  T  F  S 







1
(2) 
2
(16) 
3
(3) 
4
(5) 
5
(4) 
6
(1) 
7
(15) 
8
(5) 
9
(6) 
10
(2) 
11
(1) 
12
(4) 
13
(5) 
14
(19) 
15
(8) 
16
(6) 
17
(3) 
18
(10) 
19
(6) 
20
(1) 
21
(10) 
22
(18) 
23
(5) 
24
(1) 
25

26

27

28

29

30







From: <jpicarbajal@us...>  20120922 22:03:08

Revision: 11086 http://octave.svn.sourceforge.net/octave/?rev=11086&view=rev Author: jpicarbajal Date: 20120922 22:03:02 +0000 (Sat, 22 Sep 2012) Log Message:  signal: fixing permission of file Property Changed:  trunk/octaveforge/main/signal/inst/clustersegment.m Property changes on: trunk/octaveforge/main/signal/inst/clustersegment.m ___________________________________________________________________ Deleted: svn:executable  * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <eandrius@us...>  20120922 19:55:15

Revision: 11085 http://octave.svn.sourceforge.net/octave/?rev=11085&view=rev Author: eandrius Date: 20120922 19:55:09 +0000 (Sat, 22 Sep 2012) Log Message:  instrumentcontrol: INDEX update Modified Paths:  trunk/octaveforge/main/instrumentcontrol/INDEX Modified: trunk/octaveforge/main/instrumentcontrol/INDEX ===================================================================  trunk/octaveforge/main/instrumentcontrol/INDEX 20120922 19:39:06 UTC (rev 11084) +++ trunk/octaveforge/main/instrumentcontrol/INDEX 20120922 19:55:09 UTC (rev 11085) @@ 1,12 +1,25 @@ instrumentcontrol >> Low level I/O functions  Serial serial srl_read srl_write + srl_baudrate + srl_bytesize + srl_flush + srl_parity + srl_stopbits + srl_timeout srl_close  I2C i2c + i2c_addr i2c_read i2c_write + i2c_close +Parallel + parallel + pp_datadir + pp_data + pp_ctrl + pp_stat + pp_close This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <eandrius@us...>  20120922 19:39:16

Revision: 11084 http://octave.svn.sourceforge.net/octave/?rev=11084&view=rev Author: eandrius Date: 20120922 19:39:06 +0000 (Sat, 22 Sep 2012) Log Message:  instrumentcontrol: change of license (LGPL > GPL) Modified Paths:  trunk/octaveforge/main/instrumentcontrol/COPYING trunk/octaveforge/main/instrumentcontrol/DESCRIPTION Modified: trunk/octaveforge/main/instrumentcontrol/COPYING ===================================================================  trunk/octaveforge/main/instrumentcontrol/COPYING 20120922 11:11:14 UTC (rev 11083) +++ trunk/octaveforge/main/instrumentcontrol/COPYING 20120922 19:39:06 UTC (rev 11084) @@ 1,165 +1,621 @@  GNU LESSER GENERAL PUBLIC LICENSE + 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  This version of the GNU Lesser General Public License incorporates the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. + The GNU General Public License is a free, copyleft license for +software and other kinds of works.  0. Additional Definitions. + 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 programto 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.  As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU General Public License. + 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.  "The Library" refers to a covered work governed by this License, other than an Application or a Combined Work as defined below. + 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.  An "Application" is any work that makes use of an interface provided by the Library, but which is not otherwise based on the Library. Defining a subclass of a class defined by the Library is deemed a mode of using an interface provided by the Library. + 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.  A "Combined Work" is a work produced by combining or linking an Application with the Library. The particular version of the Library with which the Combined Work was made is also called the "Linked Version". + 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.  The "Minimal Corresponding Source" for a Combined Work means the Corresponding Source for the Combined Work, excluding any source code for portions of the Combined Work that, considered in isolation, are based on the Application, and not on the Linked Version. + 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.  The "Corresponding Application Code" for a Combined Work means the object code and/or source code for the Application, including any data and utility programs needed for reproducing the Combined Work from the Application, but excluding the System Libraries of the Combined Work. + 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.  1. Exception to Section 3 of the GNU GPL. + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on generalpurpose 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 nonfree.  You may convey a covered work under sections 3 and 4 of this License without being bound by section 3 of the GNU GPL. + The precise terms and conditions for copying, distribution and +modification follow.  2. Conveying Modified Versions. + TERMS AND CONDITIONS  If you modify a copy of the Library, and, in your modifications, a facility refers to a function or data to be supplied by an Application that uses the facility (other than as an argument passed when the facility is invoked), then you may convey a copy of the modified version: + 0. Definitions.  a) under this License, provided that you make a good faith effort to  ensure that, in the event an Application does not supply the  function or data, the facility still operates, and performs  whatever part of its purpose remains meaningful, or + "This License" refers to version 3 of the GNU General Public License.  b) under the GNU GPL, with none of the additional permissions of  this License applicable to that copy. + "Copyright" also means copyrightlike laws that apply to other kinds of +works, such as semiconductor masks.  3. Object Code Incorporating Material from Library Header Files. + "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.  The object code form of an Application may incorporate material from a header file that is part of the Library. You may convey such object code under terms of your choice, provided that, if the incorporated material is not limited to numerical parameters, data structure layouts and accessors, or small macros, inline functions and templates (ten or fewer lines in length), you do both of the following: + 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) Give prominent notice with each copy of the object code that the  Library is used in it and that the Library and its use are  covered by this License. + A "covered work" means either the unmodified Program or a work based +on the Program.  b) Accompany the object code with a copy of the GNU GPL and this license  document. + 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.  4. Combined Works. + 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.  You may convey a Combined Work under terms of your choice that, taken together, effectively do not restrict modification of the portions of the Library contained in the Combined Work and reverse engineering for debugging such modifications, if you also do each of the following: + 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.  a) Give prominent notice with each copy of the Combined Work that  the Library is used in it and that the Library and its use are  covered by this License. + 1. Source Code.  b) Accompany the Combined Work with a copy of the GNU GPL and this license  document. + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any nonsource +form of a work.  c) For a Combined Work that displays copyright notices during  execution, include the copyright notice for the Library among  these notices, as well as a reference directing the user to the  copies of the GNU GPL and this license document. + 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.  d) Do one of the following: + 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.  0) Convey the Minimal Corresponding Source under the terms of this  License, and the Corresponding Application Code in a form  suitable for, and under terms that permit, the user to  recombine or relink the Application with a modified version of  the Linked Version to produce a modified Combined Work, in the  manner specified by section 6 of the GNU GPL for conveying  Corresponding Source. + 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 generalpurpose 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.  1) Use a suitable shared library mechanism for linking with the  Library. A suitable mechanism is one that (a) uses at run time  a copy of the Library already present on the user's computer  system, and (b) will operate properly with a modified version  of the Library that is interfacecompatible with the Linked  Version. + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source.  e) Provide Installation Information, but only if you would otherwise  be required to provide such information under section 6 of the  GNU GPL, and only to the extent that such information is  necessary to install and execute a modified version of the  Combined Work produced by recombining or relinking the  Application with a modified version of the Linked Version. (If  you use option 4d0, the Installation Information must accompany  the Minimal Corresponding Source and Corresponding Application  Code. If you use option 4d1, you must provide the Installation  Information in the manner specified by section 6 of the GNU GPL  for conveying Corresponding Source.) + The Corresponding Source for a work in source code form is that +same work.  5. Combined Libraries. + 2. Basic Permissions.  You may place library facilities that are a work based on the Library side by side in a single library together with other library facilities that are not Applications and are not covered by this License, and convey such a combined library under terms of your choice, if you do both of the following: + 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.  a) Accompany the combined library with a copy of the same work based  on the Library, uncombined with any other library facilities,  conveyed under the terms of this License. + 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.  b) Give prominent notice with the combined library that part of it  is a work based on the Library, and explaining where to find the  accompanying uncombined form of the same work. + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary.  6. Revised Versions of the GNU Lesser General Public License. + 3. Protecting Users' Legal Rights From AntiCircumvention Law.  The Free Software Foundation may publish revised and/or new versions of the GNU Lesser 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. + 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.  Each version is given a distinguishing version number. If the Library as you received it specifies that a certain numbered version of the GNU Lesser General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that published version or of any later version published by the Free Software Foundation. If the Library as you received it does not specify a version number of the GNU Lesser General Public License, you may choose any version of the GNU Lesser General Public License ever published by the Free Software Foundation. + 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.  If the Library as you received it specifies that a proxy can decide whether future versions of the GNU Lesser General Public License shall apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. + 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 +nonpermissive 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 NonSource 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 +machinereadable 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 peertopeer 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 nonconsumer 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 nonpermissive 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 nonpermissive, 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 peertopeer 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 crossclaim 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 nonexclusive, worldwide, royaltyfree +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 nonexercise 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 Modified: trunk/octaveforge/main/instrumentcontrol/DESCRIPTION ===================================================================  trunk/octaveforge/main/instrumentcontrol/DESCRIPTION 20120922 11:11:14 UTC (rev 11083) +++ trunk/octaveforge/main/instrumentcontrol/DESCRIPTION 20120922 19:39:06 UTC (rev 11084) @@ 8,4 +8,4 @@ Categories: instrumentcontrol Depends: octave (>= 3.2.0) Autoload: no License: LGPLv3+ +License: GPLv3+ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <paramaniac@us...>  20120922 11:11:20

Revision: 11083 http://octave.svn.sourceforge.net/octave/?rev=11083&view=rev Author: paramaniac Date: 20120922 11:11:14 +0000 (Sat, 22 Sep 2012) Log Message:  control: fix copypaste glitch Modified Paths:  trunk/octaveforge/main/control/inst/Anderson.m Modified: trunk/octaveforge/main/control/inst/Anderson.m ===================================================================  trunk/octaveforge/main/control/inst/Anderson.m 20120922 11:04:32 UTC (rev 11082) +++ trunk/octaveforge/main/control/inst/Anderson.m 20120922 11:11:14 UTC (rev 11083) @@ 68,4 +68,4 @@ T = cellfun (@(Kr) feedback (G*Kr), Kr, 'uniformoutput', false); figure (3) step (T{:}, 200) +step (T{:}, 300) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <paramaniac@us...>  20120922 11:04:38

Revision: 11082 http://octave.svn.sourceforge.net/octave/?rev=11082&view=rev Author: paramaniac Date: 20120922 11:04:32 +0000 (Sat, 22 Sep 2012) Log Message:  control: update news Modified Paths:  trunk/octaveforge/main/control/NEWS Modified: trunk/octaveforge/main/control/NEWS ===================================================================  trunk/octaveforge/main/control/NEWS 20120922 10:58:32 UTC (rev 11081) +++ trunk/octaveforge/main/control/NEWS 20120922 11:04:32 UTC (rev 11082) @@ 1,6 +1,22 @@ Summary of important uservisible changes for releases of the control package =============================================================================== +control2.4.0 Release Date: 201209xx Release Manager: Lukas Reichlin +=============================================================================== + +** Multiplot feature for timedomain plotting: + + impulse lsim + initial step + +** Anderson, Madievski, MDSSystem, optiPID + Updated example scripts to use new multiplot feature. + +** doc/control.pdf + Updated PDF manual. + + +=============================================================================== control2.3.54 Release Date: 20120915 Release Manager: Lukas Reichlin =============================================================================== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <paramaniac@us...>  20120922 10:58:38

Revision: 11081 http://octave.svn.sourceforge.net/octave/?rev=11081&view=rev Author: paramaniac Date: 20120922 10:58:32 +0000 (Sat, 22 Sep 2012) Log Message:  control: use multiplot step command (4) Modified Paths:  trunk/octaveforge/main/control/inst/Anderson.m Modified: trunk/octaveforge/main/control/inst/Anderson.m ===================================================================  trunk/octaveforge/main/control/inst/Anderson.m 20120922 10:45:18 UTC (rev 11080) +++ trunk/octaveforge/main/control/inst/Anderson.m 20120922 10:58:32 UTC (rev 11081) @@ 50,31 +50,22 @@ L = lqe (G, W, V) % Coprime Factorization using Balanced Truncation Approximation +Kr = arrayfun (@(k) cfconred (G, F, L, k), 8:1:2, 'uniformoutput', false); % 'method', 'bfsrbta' +T = cellfun (@(Kr) feedback (G*Kr), Kr, 'uniformoutput', false); + figure (1) for k = 8:1:2  Kr = cfconred (G, F, L, k); % 'method', 'bfsrbta'  T = feedback (G*Kr);  step (T, 200)  hold on endfor hold off +step (T{:}, 200) % Coprime Factorization using Singular Perturbation Approximation +Kr = arrayfun (@(k) cfconred (G, F, L, k, 'method', 'bfsrspa'), 8:1:2, 'uniformoutput', false); +T = cellfun (@(Kr) feedback (G*Kr), Kr, 'uniformoutput', false); + figure (2) for k = 8:1:2  Kr = cfconred (G, F, L, k, 'method', 'bfsrspa');  T = feedback (G*Kr);  step (T, 200)  hold on endfor hold off +step (T{:}, 200) % FrequencyWeighted Coprime Factorization using BTA +Kr = arrayfun (@(k) fwcfconred (G, F, L, k), 8:1:2, 'uniformoutput', false); +T = cellfun (@(Kr) feedback (G*Kr), Kr, 'uniformoutput', false); + figure (3) for k = 8:1:2  Kr = fwcfconred (G, F, L, k);  T = feedback (G*Kr);  step (T, 300)  hold on endfor hold off +step (T{:}, 200) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <paramaniac@us...>  20120922 10:45:23

Revision: 11080 http://octave.svn.sourceforge.net/octave/?rev=11080&view=rev Author: paramaniac Date: 20120922 10:45:18 +0000 (Sat, 22 Sep 2012) Log Message:  control: use multiplot step command (3) Modified Paths:  trunk/octaveforge/main/control/inst/Madievski.m Modified: trunk/octaveforge/main/control/inst/Madievski.m ===================================================================  trunk/octaveforge/main/control/inst/Madievski.m 20120922 10:42:26 UTC (rev 11079) +++ trunk/octaveforge/main/control/inst/Madievski.m 20120922 10:45:18 UTC (rev 11080) @@ 86,18 +86,11 @@ w = {1e2, 1e1}; % Bode Plot of Controller +figure (1) bode (K, Kr4, Kr2, w) legend ('K (8 states)', 'Kr (4 states)', 'Kr (2 states)', 'location', 'southwest') +legend ('K (8 states)', 'Kr (4 states)', 'Kr (2 states)', 'Location', 'SouthWest') % Step Response of Closed Loop [y, t] = step (T, 100); [yr4, tr4] = step (Tr4, 100); [yr2, tr2] = step (Tr2, 100);  figure (2) plot (t, y, tr4, yr4, tr2, yr2) grid ('on') title ('Step Response of Closed Loop') xlabel ('Time [s]') ylabel ('Output []') +step (T, Tr4, Tr2, 100) legend ('K (8 states)', 'Kr (4 states)', 'Kr (2 states)', 'Location', 'SouthEast') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <paramaniac@us...>  20120922 10:42:32

Revision: 11079 http://octave.svn.sourceforge.net/octave/?rev=11079&view=rev Author: paramaniac Date: 20120922 10:42:26 +0000 (Sat, 22 Sep 2012) Log Message:  control: use multiplot step command (2) Modified Paths:  trunk/octaveforge/main/control/inst/MDSSystem.m Modified: trunk/octaveforge/main/control/inst/MDSSystem.m ===================================================================  trunk/octaveforge/main/control/inst/MDSSystem.m 20120922 10:39:31 UTC (rev 11078) +++ trunk/octaveforge/main/control/inst/MDSSystem.m 20120922 10:42:26 UTC (rev 11079) @@ 145,16 +145,17 @@ L_ncf = G * K_ncf; % open loop T_ncf = feedback (L_ncf); % closed loop + % =============================================================================== +% Plot Results +% =============================================================================== % Plotting +% Bode Plot figure (2) bode (K_mix, K_ncf) % bode plot +bode (K_mix, K_ncf) +% Step Response figure (3) step (T_mix, 10) % step response for 10 seconds +step (T_mix, T_ncf, 10) % step response for 10 seconds figure (4) step (T_ncf, 10) % step response for 10 seconds  % =============================================================================== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <paramaniac@us...>  20120922 10:39:37

Revision: 11078 http://octave.svn.sourceforge.net/octave/?rev=11078&view=rev Author: paramaniac Date: 20120922 10:39:31 +0000 (Sat, 22 Sep 2012) Log Message:  control: use multiplot step command Modified Paths:  trunk/octaveforge/main/control/inst/optiPID.m Modified: trunk/octaveforge/main/control/inst/optiPID.m ===================================================================  trunk/octaveforge/main/control/inst/optiPID.m 20120922 10:30:58 UTC (rev 11077) +++ trunk/octaveforge/main/control/inst/optiPID.m 20120922 10:39:31 UTC (rev 11078) @@ 88,15 +88,8 @@ [gamma_opt, phi_opt] = margin (L_opt) % Plot Step Response [y_AH, t_AH] = step (T_AH, t); [y_opt, t_opt] = step (T_opt, t);  figure (1) plot (t_AH, y_AH, 'b', t_opt, y_opt, 'r') grid ('on') title ('Step Response') xlabel ('Time [s]') ylabel ('Output []') legend ('A/H', 'Optimized', 'Location', 'SouthEast') +step (T_AH, 'b', T_opt, 'r', t) +legend ('Astroem/Haegglund PID', 'Optimized PID', 'Location', 'SouthEast') % =============================================================================== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <paramaniac@us...>  20120922 10:31:04

Revision: 11077 http://octave.svn.sourceforge.net/octave/?rev=11077&view=rev Author: paramaniac Date: 20120922 10:30:58 +0000 (Sat, 22 Sep 2012) Log Message:  control: finish multiplot initial and impulse functions Modified Paths:  trunk/octaveforge/main/control/inst/impulse.m trunk/octaveforge/main/control/inst/initial.m Modified: trunk/octaveforge/main/control/inst/impulse.m ===================================================================  trunk/octaveforge/main/control/inst/impulse.m 20120922 10:26:10 UTC (rev 11076) +++ trunk/octaveforge/main/control/inst/impulse.m 20120922 10:30:58 UTC (rev 11077) @@ 1,4 +1,4 @@ ## Copyright (C) 2009 Lukas F. Reichlin +## Copyright (C) 2009, 2012 Lukas F. Reichlin ## ## This file is part of LTI Syncope. ## @@ 54,22 +54,35 @@ ## Author: Lukas Reichlin <lukas.reichlin@...> ## Created: October 2009 ## Version: 0.1 +## Version: 0.2 function [y_r, t_r, x_r] = impulse (sys, tfinal = [], dt = []) +function [y_r, t_r, x_r] = impulse (varargin)  ## TODO: multiplot feature: impulse (sys1, "b", sys2, "r", ...)   if (nargin == 0  nargin > 3) + if (nargin == 0) print_usage (); endif + + if (nargout) + sysname = {}; + else + sys_idx = find (cellfun (@isa, varargin, {"lti"})); + len = length (sys_idx); + sysname = cell (len, 1); + for k = 1 : len + try + sysname{k} = inputname(sys_idx(k)); + catch + sysname{k} = ""; + end_try_catch + endfor + endif  [y, t, x] = __time_response__ (sys, "impulse", ! nargout, tfinal, dt, [], inputname (1)); + [y, t, x] = __time_response__ ("impulse", varargin, sysname, ! nargout); if (nargout)  y_r = y;  t_r = t;  x_r = x; + y_r = y{1}; + t_r = t{1}; + x_r = x{1}; endif endfunction Modified: trunk/octaveforge/main/control/inst/initial.m ===================================================================  trunk/octaveforge/main/control/inst/initial.m 20120922 10:26:10 UTC (rev 11076) +++ trunk/octaveforge/main/control/inst/initial.m 20120922 10:30:58 UTC (rev 11077) @@ 1,4 +1,4 @@ ## Copyright (C) 2009 Lukas F. Reichlin +## Copyright (C) 2009, 2012 Lukas F. Reichlin ## ## This file is part of LTI Syncope. ## @@ 66,22 +66,35 @@ ## Author: Lukas Reichlin <lukas.reichlin@...> ## Created: October 2009 ## Version: 0.1 +## Version: 0.2 function [y_r, t_r, x_r] = initial (sys, x0, tfinal = [], dt = []) +function [y_r, t_r, x_r] = initial (varargin)  ## TODO: multiplot feature: initial (sys1, "b", sys2, "r", ..., x0, ...)   if (nargin < 2  nargin > 4) + if (nargin < 2) print_usage (); endif  [y, t, x] = __time_response__ (sys, "initial", ! nargout, tfinal, dt, x0, inputname (1)); + if (nargout) + sysname = {}; + else + sys_idx = find (cellfun (@isa, varargin, {"lti"})); + len = length (sys_idx); + sysname = cell (len, 1); + for k = 1 : len + try + sysname{k} = inputname(sys_idx(k)); + catch + sysname{k} = ""; + end_try_catch + endfor + endif + [y, t, x] = __time_response__ ("initial", varargin, sysname, ! nargout); + if (nargout)  y_r = y;  t_r = t;  x_r = x; + y_r = y{1}; + t_r = t{1}; + x_r = x{1}; endif endfunction This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <paramaniac@us...>  20120922 10:26:16

Revision: 11076 http://octave.svn.sourceforge.net/octave/?rev=11076&view=rev Author: paramaniac Date: 20120922 10:26:10 +0000 (Sat, 22 Sep 2012) Log Message:  control: fix function names Modified Paths:  trunk/octaveforge/main/control/inst/step.m Modified: trunk/octaveforge/main/control/inst/step.m ===================================================================  trunk/octaveforge/main/control/inst/step.m 20120922 10:25:04 UTC (rev 11075) +++ trunk/octaveforge/main/control/inst/step.m 20120922 10:26:10 UTC (rev 11076) @@ 56,7 +56,7 @@ ## Created: October 2009 ## Version: 0.2 function [y_r, t_r, x_r] = step2 (varargin) +function [y_r, t_r, x_r] = step (varargin) if (nargin == 0) print_usage (); @@ 77,7 +77,7 @@ endfor endif  [y, t, x] = __time_response_2__ ("step", varargin, sysname, ! nargout); + [y, t, x] = __time_response__ ("step", varargin, sysname, ! nargout); if (nargout) y_r = y{1}; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <paramaniac@us...>  20120922 10:25:14

Revision: 11075 http://octave.svn.sourceforge.net/octave/?rev=11075&view=rev Author: paramaniac Date: 20120922 10:25:04 +0000 (Sat, 22 Sep 2012) Log Message:  control: remove cruft Modified Paths:  trunk/octaveforge/main/control/devel/multiplot3.m Removed Paths:  trunk/octaveforge/main/control/devel/__time_response_2__.m trunk/octaveforge/main/control/devel/step2.m Deleted: trunk/octaveforge/main/control/devel/__time_response_2__.m ===================================================================  trunk/octaveforge/main/control/devel/__time_response_2__.m 20120922 10:23:23 UTC (rev 11074) +++ trunk/octaveforge/main/control/devel/__time_response_2__.m 20120922 10:25:04 UTC (rev 11075) @@ 1,414 +0,0 @@ ## Copyright (C) 2009, 2010, 2012 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/>;.  ## * texinfo * ## Common code for the time response functions step, impulse and initial.  ## Author: Lukas Reichlin <lukas.reichlin@...> ## Created: October 2009 ## Version: 0.3  % function [y, t, x_arr] = __time_response_2__ (sys, response, plotflag, tfinal, dt, x0, sysname) function [y, t, x] = __time_response_2__ (response, args, sysname, plotflag)   sys_idx = find (cellfun (@isa, args, {"lti"})); # look for LTI models, 'find' needed for plot styles  sys_cell = cellfun (@ss, args(sys_idx), "uniformoutput", false); # convert to statespace   if (! size_equal (sys_cell{:}))  error ("%s: models must have equal sizes", response);  endif   vec_idx = find (cellfun (@is_real_matrix, args)); # indices of vector arguments  n_vec = length (vec_idx); # number of vector arguments  n_sys = length (sys_cell); # number of LTI systems   tfinal = [];  dt = [];  x0 = [];   ## extract tfinal/t, dt, x0 from args  if (strcmpi (response, "initial"))  if (n_vec < 1)  error ("initial: require initial state vector 'x0'");  else # initial state vector x0 specified  arg = args{vec_idx(1)};  if (is_real_vector (arg))  x0 = arg;  else  error ("initial: initial state vector 'x0' must be a vector of real values");  endif  if (n_vec > 1) # tfinal or time vector t specified  arg = args{vec_idx(2)};  if (issample (arg))  tfinal = arg;  elseif (isempty (arg))  ## tfinal = []; # nothing to do here  elseif (is_real_vector (arg))  dt = abs (arg(2)  arg(1)); # assume that t is regularly spaced  tfinal = arg(end);  else  warning ("initial: argument number %d ignored", vec_idx(2));  endif  if (n_vec > 2) # sampling time dt specified  arg = args{vec_idx(3)};  if (issample (arg))  dt = arg;  else  warning ("initial: argument number %d ignored", vec_idx(3));  endif  if (n_vec > 3)  warning ("initial: ignored");  endif  endif  endif  endif  else # step or impulse response  if (n_vec > 0) # tfinal or time vector t specified  arg = args{vec_idx(1)};  if (issample (arg))  tfinal = arg;  elseif (isempty (arg))  ## tfinal = []; # nothing to do here  elseif (is_real_vector (arg))  dt = abs (arg(2)  arg(1)); # assume that t is regularly spaced  tfinal = arg(end);  else  warning ("%s: argument number %d ignored", response, vec_idx(1));  endif  if (n_vec > 1) # sampling time dt specified  arg = args{vec_idx(2)};  if (issample (arg))  dt = arg;  else  warning ("%s: argument number %d ignored", response, vec_idx(2));  endif  if (n_vec > 2)  warning ("%s: ignored", response);  endif  endif  endif  endif  ## TODO: share common code between initial and step/impulse   [tfinal, dt] = cellfun (@__sim_horizon__, sys_cell, {tfinal}, {dt}, "uniformoutput", false);  tfinal = max ([tfinal{:}]);   ct_idx = cellfun (@isct, sys_cell);  sys_dt_cell = sys_cell;  tmp = cellfun (@c2d, sys_cell(ct_idx), dt(ct_idx), {"zoh"}, "uniformoutput", false);  sys_dt_cell(ct_idx) = tmp;   ## time vector  t = @cellfun (@(dt) reshape (0 : dt : tfinal, [], 1), dt, "uniformoutput", false);   ## function [y, x_arr] = __initial_response__ (sys, sys_dt, t, x0)  ## function [y, x_arr] = __step_response__ (sys_dt, t)  ## function [y, x_arr] = __impulse_response__ (sys, sys_dt, t)   switch (response)  case "initial"  [y, x] = cellfun (@__initial_response__, sys_dt_cell, t, {x0}, "uniformoutput", false);  case "step"  [y, x] = cellfun (@__step_response__, sys_dt_cell, t, "uniformoutput", false);  case "impulse"  [y, x] = cellfun (@__impulse_response__, sys_cell, sys_dt_cell, t, "uniformoutput", false);  otherwise  error ("time_response: invalid response type");  endswitch    if (plotflag) # display plot  [p, m] = size (sys_cell{1});  switch (response)  case "initial"  str = "Response to Initial Conditions";  cols = 1;  ## yfinal = zeros (p, 1);  case "step"  str = "Step Response";  cols = m;  ## yfinal = dcgain (sys_cell{1});  case "impulse"  str = "Impulse Response";  cols = m;  ## yfinal = zeros (p, m);  otherwise  error ("time_response: invalid response type");  endswitch   style_idx = find (cellfun (@ischar, args));  outname = get (sys_cell{end}, "outname");  outname = __labels__ (outname, "y");  colororder = get (gca, "colororder");  rc = rows (colororder);   for k = 1 : n_sys # for every system  if (k == n_sys)  lim = numel (args);  else  lim = sys_idx(k+1);  endif  style = args(style_idx(style_idx > sys_idx(k) & style_idx <= lim));  if (isempty (style))  color = colororder(1+rem (k1, rc), :);  style = {"color", color};  endif  discrete = ! ct_idx(k);  if (discrete) # discretetime system  for i = 1 : p # for every output  for j = 1 : cols # for every input (except for initial where cols=1)  subplot (p, cols, (i1)*cols+j);  stairs (t{k}, y{k}(:, i, j), style{:});  hold on;  grid on;  if (k == n_sys)  axis tight;  ylim (__axis_margin__ (ylim))  if (j == 1)  ylabel (outname{i});  if (i == 1)  title (str);  endif  endif  endif  endfor  endfor  else # continuoustime system  for i = 1 : p # for every output  for j = 1 : cols # for every input (except for initial where cols=1)  subplot (p, cols, (i1)*cols+j);  ##if (n_sys == 1 && isstable (sys_cell{1}))  ## plot (t{k}, y{k}(:, i, j), style{:}, [t{k}(1), t{k}(end)], repmat (yfinal(i,j), 1, 2));  ## ## TODO: plot final value first such that its line doesn't overprint the response  ##else  plot (t{k}, y{k}(:, i, j), style{:});  ##endif  hold on;  grid on;  if (k == n_sys)  axis tight  ylim (__axis_margin__ (ylim))  if (j == 1)  ylabel (outname{i});  if (i == 1)  title (str);  endif  endif  endif  endfor  endfor  endif  endfor  xlabel ("Time [s]");  if (p == 1 && m == 1)  legend (sysname)  endif  hold off;  endif  endfunction   function [y, x_arr] = __initial_response__ (sys_dt, t, x0)   [F, G, C, D] = ssdata (sys_dt); # system must be proper   n = rows (F); # number of states  m = columns (G); # number of inputs  p = rows (C); # number of outputs  l_t = length (t);   ## preallocate memory  y = zeros (l_t, p);  x_arr = zeros (l_t, n);   ## initial conditions  x = reshape (x0, [], 1); # make sure that x is a column vector   if (n != length (x0)  ! is_real_vector (x0))  error ("initial: x0 must be a real vector with %d elements", n);  endif   ## simulation  for k = 1 : l_t  y(k, :) = C * x;  x_arr(k, :) = x;  x = F * x;  endfor  endfunction   function [y, x_arr] = __step_response__ (sys_dt, t)   [F, G, C, D] = ssdata (sys_dt); # system must be proper   n = rows (F); # number of states  m = columns (G); # number of inputs  p = rows (C); # number of outputs  l_t = length (t);   ## preallocate memory  y = zeros (l_t, p, m);  x_arr = zeros (l_t, n, m);   for j = 1 : m # for every input channel  ## initial conditions  x = zeros (n, 1);  u = zeros (m, 1);  u(j) = 1;   ## simulation  for k = 1 : l_t  y(k, :, j) = C * x + D * u;  x_arr(k, :, j) = x;  x = F * x + G * u;  endfor  endfor  endfunction   function [y, x_arr] = __impulse_response__ (sys, sys_dt, t)   [~, B] = ssdata (sys);  [F, G, C, D, dt] = ssdata (sys_dt); # system must be proper  dt = abs (dt); # use 1 second if tsam is unspecified (1)  discrete = ! isct (sys);   n = rows (F); # number of states  m = columns (G); # number of inputs  p = rows (C); # number of outputs  l_t = length (t);   ## preallocate memory  y = zeros (l_t, p, m);  x_arr = zeros (l_t, n, m);   for j = 1 : m # for every input channel  ## initial conditions  u = zeros (m, 1);  u(j) = 1;   if (discrete)  x = zeros (n, 1); # zero by definition  y(1, :, j) = D * u / dt;  x_arr(1, :, j) = x;  x = G * u / dt;  else  x = B * u; # B, not G!  y(1, :, j) = C * x;  x_arr(1, :, j) = x;  x = F * x;  endif   ## simulation  for k = 2 : l_t  y (k, :, j) = C * x;  x_arr(k, :, j) = x;  x = F * x;  endfor  endfor   if (discrete)  y *= dt;  x_arr *= dt;  endif  endfunction   function [tfinal, dt] = __sim_horizon__ (sys, tfinal, Ts)   ## code based on __stepimp__.m of Kai P. Mueller and A. Scottedward Hodel   TOL = 1.0e10; # values below TOL are assumed to be zero  N_MIN = 50; # min number of points  N_MAX = 2000; # max number of points  N_DEF = 1000; # default number of points  T_DEF = 10; # default simulation time   ev = pole (sys);  n = length (ev); # number of states/poles  continuous = isct (sys);  discrete = ! continuous;   if (discrete)  dt = Ts = abs (get (sys, "tsam"));  ## perform bilinear transformation on poles in z  for k = 1 : n  pol = ev(k);  if (abs (pol + 1) < TOL)  ev(k) = 0;  else  ev(k) = 2 / Ts * (pol  1) / (pol + 1);  endif  endfor  endif   ## remove poles near zero from eigenvalue array ev  nk = n;  for k = 1 : n  if (abs (real (ev(k))) < TOL)  ev(k) = 0;  nk = 1;  endif  endfor   if (nk == 0)  if (isempty (tfinal))  tfinal = T_DEF;  endif   if (continuous)  dt = tfinal / N_DEF;  endif  else  ev = ev(find (ev));  ev_max = max (abs (ev));   if (continuous)  dt = 0.2 * pi / ev_max;  endif   if (isempty (tfinal))  ev_min = min (abs (real (ev)));  tfinal = 5.0 / ev_min;   ## round up  yy = 10^(ceil (log10 (tfinal))  1);  tfinal = yy * ceil (tfinal / yy);  endif   if (continuous)  N = tfinal / dt;   if (N < N_MIN)  dt = tfinal / N_MIN;  endif   if (N > N_MAX)  dt = tfinal / N_MAX;  endif  endif  endif   if (continuous && ! isempty (Ts)) # catch case cont. system with dt specified  dt = Ts;  endif  endfunction Modified: trunk/octaveforge/main/control/devel/multiplot3.m ===================================================================  trunk/octaveforge/main/control/devel/multiplot3.m 20120922 10:23:23 UTC (rev 11074) +++ trunk/octaveforge/main/control/devel/multiplot3.m 20120922 10:25:04 UTC (rev 11075) @@ 1,10 +1,10 @@ load tfs.dat figure (1) step2 (T_AH, T_opt) +step (T_AH, T_opt) figure (2) step2 (T_AH, '.r', T_opt, 'b') +step (T_AH, '.r', T_opt, 'b') figure (3) step2 (T_AH, c2d (T_opt, 1)) +step (T_AH, c2d (T_opt, 1)) Deleted: trunk/octaveforge/main/control/devel/step2.m ===================================================================  trunk/octaveforge/main/control/devel/step2.m 20120922 10:23:23 UTC (rev 11074) +++ trunk/octaveforge/main/control/devel/step2.m 20120922 10:25:04 UTC (rev 11075) @@ 1,89 +0,0 @@ ## Copyright (C) 2009, 2012 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/>;.  ## * texinfo * ## @deftypefn{Function File} {[@var{y}, @var{t}, @var{x}] =} step (@var{sys}) ## @deftypefnx{Function File} {[@var{y}, @var{t}, @var{x}] =} step (@var{sys}, @var{t}) ## @deftypefnx{Function File} {[@var{y}, @var{t}, @var{x}] =} step (@var{sys}, @var{tfinal}) ## @deftypefnx{Function File} {[@var{y}, @var{t}, @var{x}] =} step (@var{sys}, @var{tfinal}, @var{dt}) ## Step response of LTI system. ## If no output arguments are given, the response is printed on the screen. ## ## @strong{Inputs} ## @table @var ## @item sys ## LTI model. ## @item t ## Time vector. Should be evenly spaced. If not specified, it is calculated by ## the poles of the system to reflect adequately the response transients. ## @item tfinal ## Optional simulation horizon. If not specified, it is calculated by ## the poles of the system to reflect adequately the response transients. ## @item dt ## Optional sampling time. Be sure to choose it small enough to capture transient ## phenomena. If not specified, it is calculated by the poles of the system. ## @end table ## ## @strong{Outputs} ## @table @var ## @item y ## Output response array. Has as many rows as time samples (length of t) ## and as many columns as outputs. ## @item t ## Time row vector. ## @item x ## State trajectories array. Has @code{length (t)} rows and as many columns as states. ## @end table ## ## @seealso{impulse, initial, lsim} ## @end deftypefn  ## Author: Lukas Reichlin <lukas.reichlin@...> ## Created: October 2009 ## Version: 0.2  % function [y_r, t_r, x_r] = step2 (sys, tfinal = [], dt = []) function [y_r, t_r, x_r] = step2 (varargin)   if (nargin == 0)  print_usage ();  endif   if (nargout)  sysname = {};  else  sys_idx = find (cellfun (@isa, varargin, {"lti"}));  len = length (sys_idx);  sysname = cell (len, 1);  for k = 1 : len  try  sysname{k} = inputname(sys_idx(k));  catch  sysname{k} = "";  end_try_catch  endfor  endif   [y, t, x] = __time_response_2__ ("step", varargin, sysname, ! nargout);   if (nargout)  y_r = y{1};  t_r = t{1};  x_r = x{1};  endif  endfunction This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <paramaniac@us...>  20120922 10:23:30

Revision: 11074 http://octave.svn.sourceforge.net/octave/?rev=11074&view=rev Author: paramaniac Date: 20120922 10:23:23 +0000 (Sat, 22 Sep 2012) Log Message:  control: move multiplot time response into place Modified Paths:  trunk/octaveforge/main/control/inst/__time_response__.m trunk/octaveforge/main/control/inst/step.m Modified: trunk/octaveforge/main/control/inst/__time_response__.m ===================================================================  trunk/octaveforge/main/control/inst/__time_response__.m 20120922 10:14:12 UTC (rev 11073) +++ trunk/octaveforge/main/control/inst/__time_response__.m 20120922 10:23:23 UTC (rev 11074) @@ 1,4 +1,4 @@ ## Copyright (C) 2009, 2010 Lukas F. Reichlin +## Copyright (C) 2009, 2010, 2012 Lukas F. Reichlin ## ## This file is part of LTI Syncope. ## @@ 20,241 +20,350 @@ ## Author: Lukas Reichlin <lukas.reichlin@...> ## Created: October 2009 ## Version: 0.2 +## Version: 0.3 function [y, t, x_arr] = __time_response__ (sys, resptype, plotflag, tfinal, dt, x0, sysname) +function [y, t, x] = __time_response__ (response, args, sysname, plotflag)  if (! isa (sys, "ss"))  sys = ss (sys); # sys must be proper  endif + sys_idx = find (cellfun (@isa, args, {"lti"})); # look for LTI models, 'find' needed for plot styles + sys_cell = cellfun (@ss, args(sys_idx), "uniformoutput", false); # convert to statespace  if (is_real_vector (tfinal) && length (tfinal) > 1) # time vector t passed  dt = tfinal(2)  tfinal(1); # assume that t is regularly spaced  tfinal = tfinal(end); + if (! size_equal (sys_cell{:})) + error ("%s: models must have equal sizes", response); endif  [A, B, C, D, tsam] = ssdata (sys); + vec_idx = find (cellfun (@is_real_matrix, args)); # indices of vector arguments + n_vec = length (vec_idx); # number of vector arguments + n_sys = length (sys_cell); # number of LTI systems  discrete = ! isct (sys); # static gains are treated as analog systems  tsam = abs (tsam); # use 1 second if tsam is unspecified (1) + tfinal = []; + dt = []; + x0 = [];  if (discrete)  if (! isempty (dt))  warning ("time_response: argument dt has no effect on sampling time of discrete system"); + ## extract tfinal/t, dt, x0 from args + if (strcmpi (response, "initial")) + if (n_vec < 1) + error ("initial: require initial state vector 'x0'"); + else # initial state vector x0 specified + arg = args{vec_idx(1)}; + if (is_real_vector (arg)) + x0 = arg; + else + error ("initial: initial state vector 'x0' must be a vector of real values"); + endif + if (n_vec > 1) # tfinal or time vector t specified + arg = args{vec_idx(2)}; + if (issample (arg)) + tfinal = arg; + elseif (isempty (arg)) + ## tfinal = []; # nothing to do here + elseif (is_real_vector (arg)) + dt = abs (arg(2)  arg(1)); # assume that t is regularly spaced + tfinal = arg(end); + else + warning ("initial: argument number %d ignored", vec_idx(2)); + endif + if (n_vec > 2) # sampling time dt specified + arg = args{vec_idx(3)}; + if (issample (arg)) + dt = arg; + else + warning ("initial: argument number %d ignored", vec_idx(3)); + endif + if (n_vec > 3) + warning ("initial: ignored"); + endif + endif + endif + endif + else # step or impulse response + if (n_vec > 0) # tfinal or time vector t specified + arg = args{vec_idx(1)}; + if (issample (arg)) + tfinal = arg; + elseif (isempty (arg)) + ## tfinal = []; # nothing to do here + elseif (is_real_vector (arg)) + dt = abs (arg(2)  arg(1)); # assume that t is regularly spaced + tfinal = arg(end); + else + warning ("%s: argument number %d ignored", response, vec_idx(1)); + endif + if (n_vec > 1) # sampling time dt specified + arg = args{vec_idx(2)}; + if (issample (arg)) + dt = arg; + else + warning ("%s: argument number %d ignored", response, vec_idx(2)); + endif + if (n_vec > 2) + warning ("%s: ignored", response); + endif + endif endif   dt = tsam; endif + ## TODO: share common code between initial and step/impulse  [tfinal, dt] = __sim_horizon__ (A, discrete, tfinal, dt); + [tfinal, dt] = cellfun (@__sim_horizon__, sys_cell, {tfinal}, {dt}, "uniformoutput", false); + tfinal = max ([tfinal{:}]);  if (! discrete)  sys = c2d (sys, dt, "zoh");  endif + ct_idx = cellfun (@isct, sys_cell); + sys_dt_cell = sys_cell; + tmp = cellfun (@c2d, sys_cell(ct_idx), dt(ct_idx), {"zoh"}, "uniformoutput", false); + sys_dt_cell(ct_idx) = tmp;  [F, G] = ssdata (sys); # matrices C and D don't change + ## time vector + t = @cellfun (@(dt) reshape (0 : dt : tfinal, [], 1), dt, "uniformoutput", false);  n = rows (F); # number of states  m = columns (G); # number of inputs  p = rows (C); # number of outputs + ## function [y, x_arr] = __initial_response__ (sys, sys_dt, t, x0) + ## function [y, x_arr] = __step_response__ (sys_dt, t) + ## function [y, x_arr] = __impulse_response__ (sys, sys_dt, t)  ## time vector  t = reshape (0 : dt : tfinal, [], 1);  l_t = length (t);   switch (resptype) + switch (response) case "initial"  str = ["Response of ", sysname, " to Initial Conditions"];  yfinal = zeros (p, 1); + [y, x] = cellfun (@__initial_response__, sys_dt_cell, t, {x0}, "uniformoutput", false); + case "step" + [y, x] = cellfun (@__step_response__, sys_dt_cell, t, "uniformoutput", false); + case "impulse" + [y, x] = cellfun (@__impulse_response__, sys_cell, sys_dt_cell, t, "uniformoutput", false); + otherwise + error ("time_response: invalid response type"); + endswitch  ## preallocate memory  y = zeros (l_t, p);  x_arr = zeros (l_t, n);  ## initial conditions  x = reshape (x0, [], 1); # make sure that x is a column vector   if (n != length (x0)  ! is_real_vector (x0))  error ("initial: x0 must be a real vector with %d elements", n); + if (plotflag) # display plot + [p, m] = size (sys_cell{1}); + switch (response) + case "initial" + str = "Response to Initial Conditions"; + cols = 1; + ## yfinal = zeros (p, 1); + case "step" + str = "Step Response"; + cols = m; + ## yfinal = dcgain (sys_cell{1}); + case "impulse" + str = "Impulse Response"; + cols = m; + ## yfinal = zeros (p, m); + otherwise + error ("time_response: invalid response type"); + endswitch + + style_idx = find (cellfun (@ischar, args)); + outname = get (sys_cell{end}, "outname"); + outname = __labels__ (outname, "y"); + colororder = get (gca, "colororder"); + rc = rows (colororder); + + for k = 1 : n_sys # for every system + if (k == n_sys) + lim = numel (args); + else + lim = sys_idx(k+1); endif + style = args(style_idx(style_idx > sys_idx(k) & style_idx <= lim)); + if (isempty (style)) + color = colororder(1+rem (k1, rc), :); + style = {"color", color}; + endif + discrete = ! ct_idx(k); + if (discrete) # discretetime system + for i = 1 : p # for every output + for j = 1 : cols # for every input (except for initial where cols=1) + subplot (p, cols, (i1)*cols+j); + stairs (t{k}, y{k}(:, i, j), style{:}); + hold on; + grid on; + if (k == n_sys) + axis tight; + ylim (__axis_margin__ (ylim)) + if (j == 1) + ylabel (outname{i}); + if (i == 1) + title (str); + endif + endif + endif + endfor + endfor + else # continuoustime system + for i = 1 : p # for every output + for j = 1 : cols # for every input (except for initial where cols=1) + subplot (p, cols, (i1)*cols+j); + ##if (n_sys == 1 && isstable (sys_cell{1})) + ## plot (t{k}, y{k}(:, i, j), style{:}, [t{k}(1), t{k}(end)], repmat (yfinal(i,j), 1, 2)); + ## ## TODO: plot final value first such that its line doesn't overprint the response + ##else + plot (t{k}, y{k}(:, i, j), style{:}); + ##endif + hold on; + grid on; + if (k == n_sys) + axis tight + ylim (__axis_margin__ (ylim)) + if (j == 1) + ylabel (outname{i}); + if (i == 1) + title (str); + endif + endif + endif + endfor + endfor + endif + endfor + xlabel ("Time [s]"); + if (p == 1 && m == 1) + legend (sysname) + endif + hold off; + endif  ## simulation  for k = 1 : l_t  y(k, :) = C * x;  x_arr(k, :) = x;  x = F * x;  endfor +endfunction  case "step"  str = ["Step Response of ", sysname];  yfinal = dcgain (sys);  ## preallocate memory  y = zeros (l_t, p, m);  x_arr = zeros (l_t, n, m); +function [y, x_arr] = __initial_response__ (sys_dt, t, x0)  for j = 1 : m # for every input channel  ## initial conditions  x = zeros (n, 1);  u = zeros (m, 1);  u(j) = 1; + [F, G, C, D] = ssdata (sys_dt); # system must be proper  ## simulation  for k = 1 : l_t  y(k, :, j) = C * x + D * u;  x_arr(k, :, j) = x;  x = F * x + G * u;  endfor  endfor + n = rows (F); # number of states + m = columns (G); # number of inputs + p = rows (C); # number of outputs + l_t = length (t);  case "impulse"  str = ["Impulse Response of ", sysname];  yfinal = zeros (p, m); + ## preallocate memory + y = zeros (l_t, p); + x_arr = zeros (l_t, n);  ## preallocate memory  y = zeros (l_t, p, m);  x_arr = zeros (l_t, n, m); + ## initial conditions + x = reshape (x0, [], 1); # make sure that x is a column vector  for j = 1 : m # for every input channel  ## initial conditions  u = zeros (m, 1);  u(j) = 1; + if (n != length (x0)  ! is_real_vector (x0)) + error ("initial: x0 must be a real vector with %d elements", n); + endif  if (discrete)  x = zeros (n, 1); # zero by definition  y(1, :, j) = D * u / dt;  x_arr(1, :, j) = x;  x = G * u / dt;  else  x = B * u; # B, not G!  y(1, :, j) = C * x;  x_arr(1, :, j) = x;  x = F * x;  endif + ## simulation + for k = 1 : l_t + y(k, :) = C * x; + x_arr(k, :) = x; + x = F * x; + endfor  ## simulation  for k = 2 : l_t  y (k, :, j) = C * x;  x_arr(k, :, j) = x;  x = F * x;  endfor  endfor   if (discrete)  y *= dt;  x_arr *= dt;  endif   otherwise  error ("time_response: invalid response type");   endswitch  +endfunction  if (plotflag) # display plot  ## TODO: Set correct titles, especially for multiinput systems +function [y, x_arr] = __step_response__ (sys_dt, t)  stable = isstable (sys);  outname = get (sys, "outname");  outname = __labels__ (outname, "y_"); + [F, G, C, D] = ssdata (sys_dt); # system must be proper  if (strcmp (resptype, "initial"))  cols = 1;  else  cols = m;  endif + n = rows (F); # number of states + m = columns (G); # number of inputs + p = rows (C); # number of outputs + l_t = length (t);  if (discrete) # discrete system  for k = 1 : p  for j = 1 : cols + ## preallocate memory + y = zeros (l_t, p, m); + x_arr = zeros (l_t, n, m);  subplot (p, cols, (k1)*cols+j); + for j = 1 : m # for every input channel + ## initial conditions + x = zeros (n, 1); + u = zeros (m, 1); + u(j) = 1;  if (stable)  stairs (t, [y(:, k, j), yfinal(k, j) * ones(l_t, 1)]);  else  stairs (t, y(:, k, j));  endif + ## simulation + for k = 1 : l_t + y(k, :, j) = C * x + D * u; + x_arr(k, :, j) = x; + x = F * x + G * u; + endfor + endfor  grid ("on"); +endfunction  if (k == 1 && j == 1)  title (str);  endif  if (j == 1)  ylabel (sprintf ("Amplitude %s", outname{k}));  endif +function [y, x_arr] = __impulse_response__ (sys, sys_dt, t)  endfor  endfor + [~, B] = ssdata (sys); + [F, G, C, D, dt] = ssdata (sys_dt); # system must be proper + dt = abs (dt); # use 1 second if tsam is unspecified (1) + discrete = ! isct (sys);  xlabel ("Time [s]"); + n = rows (F); # number of states + m = columns (G); # number of inputs + p = rows (C); # number of outputs + l_t = length (t);  else # continuous system  for k = 1 : p  for j = 1 : cols + ## preallocate memory + y = zeros (l_t, p, m); + x_arr = zeros (l_t, n, m);  subplot (p, cols, (k1)*cols+j); + for j = 1 : m # for every input channel + ## initial conditions + u = zeros (m, 1); + u(j) = 1;  if (stable)  plot (t, [y(:, k, j), yfinal(k, j) * ones(l_t, 1)]);  else  plot (t, y(:, k, j));  endif + if (discrete) + x = zeros (n, 1); # zero by definition + y(1, :, j) = D * u / dt; + x_arr(1, :, j) = x; + x = G * u / dt; + else + x = B * u; # B, not G! + y(1, :, j) = C * x; + x_arr(1, :, j) = x; + x = F * x; + endif  grid ("on"); + ## simulation + for k = 2 : l_t + y (k, :, j) = C * x; + x_arr(k, :, j) = x; + x = F * x; + endfor + endfor  if (k == 1 && j == 1)  title (str);  endif   if (j == 1)  ylabel (sprintf ("Amplitude %s", outname{k}));  endif   endfor  endfor   xlabel ("Time [s]");   endif + if (discrete) + y *= dt; + x_arr *= dt; endif endfunction function [tfinal, dt] = __sim_horizon__ (A, discrete, tfinal, Ts) +function [tfinal, dt] = __sim_horizon__ (sys, tfinal, Ts) ## code based on __stepimp__.m of Kai P. Mueller and A. Scottedward Hodel  TOL = 1.0e10; # values below TOL are assumed to be zero  N_MIN = 50; # min number of points  N_MAX = 2000; # max number of points  N_DEF = 1000; # default number of points  T_DEF = 10; # default simulation time + TOL = 1.0e10; # values below TOL are assumed to be zero + N_MIN = 50; # min number of points + N_MAX = 2000; # max number of points + N_DEF = 1000; # default number of points + T_DEF = 10; # default simulation time  n = rows (A);  eigw = eig (A); + ev = pole (sys); + n = length (ev); # number of states/poles + continuous = isct (sys); + discrete = ! continuous; if (discrete) + dt = Ts = abs (get (sys, "tsam")); ## perform bilinear transformation on poles in z for k = 1 : n  pol = eigw(k); + pol = ev(k); if (abs (pol + 1) < TOL)  eigw(k) = 0; + ev(k) = 0; else  eigw(k) = 2 / Ts * (pol  1) / (pol + 1); + ev(k) = 2 / Ts * (pol  1) / (pol + 1); endif endfor endif  ## remove poles near zero from eigenvalue array eigw + ## remove poles near zero from eigenvalue array ev nk = n; for k = 1 : n  if (abs (real (eigw(k))) < TOL)  eigw(k) = 0; + if (abs (real (ev(k))) < TOL) + ev(k) = 0; nk = 1; endif endfor @@ 264,27 +373,27 @@ tfinal = T_DEF; endif  if (! discrete) + if (continuous) dt = tfinal / N_DEF; endif else  eigw = eigw(find (eigw));  eigw_max = max (abs (eigw)); + ev = ev(find (ev)); + ev_max = max (abs (ev));  if (! discrete)  dt = 0.2 * pi / eigw_max; + if (continuous) + dt = 0.2 * pi / ev_max; endif if (isempty (tfinal))  eigw_min = min (abs (real (eigw)));  tfinal = 5.0 / eigw_min; + ev_min = min (abs (real (ev))); + tfinal = 5.0 / ev_min; ## round up yy = 10^(ceil (log10 (tfinal))  1); tfinal = yy * ceil (tfinal / yy); endif  if (! discrete) + if (continuous) N = tfinal / dt; if (N < N_MIN) @@ 297,7 +406,7 @@ endif endif  if (! isempty (Ts)) # catch case cont. system with dt specified + if (continuous && ! isempty (Ts)) # catch case cont. system with dt specified dt = Ts; endif Modified: trunk/octaveforge/main/control/inst/step.m ===================================================================  trunk/octaveforge/main/control/inst/step.m 20120922 10:14:12 UTC (rev 11073) +++ trunk/octaveforge/main/control/inst/step.m 20120922 10:23:23 UTC (rev 11074) @@ 1,4 +1,4 @@ ## Copyright (C) 2009 Lukas F. Reichlin +## Copyright (C) 2009, 2012 Lukas F. Reichlin ## ## This file is part of LTI Syncope. ## @@ 54,22 +54,35 @@ ## Author: Lukas Reichlin <lukas.reichlin@...> ## Created: October 2009 ## Version: 0.1 +## Version: 0.2 function [y_r, t_r, x_r] = step (sys, tfinal = [], dt = []) +function [y_r, t_r, x_r] = step2 (varargin)  ## TODO: multiplot feature: step (sys1, "b", sys2, "r", ...)   if (nargin == 0  nargin > 3) + if (nargin == 0) print_usage (); endif  [y, t, x] = __time_response__ (sys, "step", ! nargout, tfinal, dt, [], inputname (1)); + if (nargout) + sysname = {}; + else + sys_idx = find (cellfun (@isa, varargin, {"lti"})); + len = length (sys_idx); + sysname = cell (len, 1); + for k = 1 : len + try + sysname{k} = inputname(sys_idx(k)); + catch + sysname{k} = ""; + end_try_catch + endfor + endif + [y, t, x] = __time_response_2__ ("step", varargin, sysname, ! nargout); + if (nargout)  y_r = y;  t_r = t;  x_r = x; + y_r = y{1}; + t_r = t{1}; + x_r = x{1}; endif endfunction This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <paramaniac@us...>  20120922 10:14:18

Revision: 11073 http://octave.svn.sourceforge.net/octave/?rev=11073&view=rev Author: paramaniac Date: 20120922 10:14:12 +0000 (Sat, 22 Sep 2012) Log Message:  control: minor bug fix (stairs doesn't like the "" style argument) Modified Paths:  trunk/octaveforge/main/control/devel/__time_response_2__.m Modified: trunk/octaveforge/main/control/devel/__time_response_2__.m ===================================================================  trunk/octaveforge/main/control/devel/__time_response_2__.m 20120922 10:10:53 UTC (rev 11072) +++ trunk/octaveforge/main/control/devel/__time_response_2__.m 20120922 10:14:12 UTC (rev 11073) @@ 106,7 +106,7 @@ [tfinal, dt] = cellfun (@__sim_horizon__, sys_cell, {tfinal}, {dt}, "uniformoutput", false); tfinal = max ([tfinal{:}]); dt + ct_idx = cellfun (@isct, sys_cell); sys_dt_cell = sys_cell; tmp = cellfun (@c2d, sys_cell(ct_idx), dt(ct_idx), {"zoh"}, "uniformoutput", false); @@ 165,7 +165,7 @@ style = args(style_idx(style_idx > sys_idx(k) & style_idx <= lim)); if (isempty (style)) color = colororder(1+rem (k1, rc), :);  style = {"", "color", color}; + style = {"color", color}; endif discrete = ! ct_idx(k); if (discrete) # discretetime system This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <paramaniac@us...>  20120922 10:10:59

Revision: 11072 http://octave.svn.sourceforge.net/octave/?rev=11072&view=rev Author: paramaniac Date: 20120922 10:10:53 +0000 (Sat, 22 Sep 2012) Log Message:  control: handle vector arguments in multiplot time responses Modified Paths:  trunk/octaveforge/main/control/devel/__time_response_2__.m Modified: trunk/octaveforge/main/control/devel/__time_response_2__.m ===================================================================  trunk/octaveforge/main/control/devel/__time_response_2__.m 20120922 10:03:17 UTC (rev 11071) +++ trunk/octaveforge/main/control/devel/__time_response_2__.m 20120922 10:10:53 UTC (rev 11072) @@ 22,93 +22,104 @@ ## Created: October 2009 ## Version: 0.3 % function [y, t, x_arr] = __time_response_2__ (sys, resptype, plotflag, tfinal, dt, x0, sysname) function [y, t, x] = __time_response_2__ (resptype, args, sysname, plotflag) +% function [y, t, x_arr] = __time_response_2__ (sys, response, plotflag, tfinal, dt, x0, sysname) +function [y, t, x] = __time_response_2__ (response, args, sysname, plotflag) sys_idx = find (cellfun (@isa, args, {"lti"})); # look for LTI models, 'find' needed for plot styles sys_cell = cellfun (@ss, args(sys_idx), "uniformoutput", false); # convert to statespace if (! size_equal (sys_cell{:}))  error ("%s: models must have equal sizes", resptype); + error ("%s: models must have equal sizes", response); endif  vec_idx = find (cellfun (@is_real_matrix, args)); # indices of vector arguments  n_vec = length (vec_idx); # number of vector arguments  n_sys = length (sys_cell); # number of LTI systems   %if (n_vec >= 1)  % arg = args{vec_idx(1)};  %  %endif + vec_idx = find (cellfun (@is_real_matrix, args)); # indices of vector arguments + n_vec = length (vec_idx); # number of vector arguments + n_sys = length (sys_cell); # number of LTI systems  ## extract tfinal/t, dt, x0  tfinal = [];  dt = {[]}; + dt = []; + x0 = [];  %[tfinal, dt] = cellfun (@__sim_horizon__, sys_cell, {tfinal}, dt, "uniformoutput", false); + ## extract tfinal/t, dt, x0 from args + if (strcmpi (response, "initial")) + if (n_vec < 1) + error ("initial: require initial state vector 'x0'"); + else # initial state vector x0 specified + arg = args{vec_idx(1)}; + if (is_real_vector (arg)) + x0 = arg; + else + error ("initial: initial state vector 'x0' must be a vector of real values"); + endif + if (n_vec > 1) # tfinal or time vector t specified + arg = args{vec_idx(2)}; + if (issample (arg)) + tfinal = arg; + elseif (isempty (arg)) + ## tfinal = []; # nothing to do here + elseif (is_real_vector (arg)) + dt = abs (arg(2)  arg(1)); # assume that t is regularly spaced + tfinal = arg(end); + else + warning ("initial: argument number %d ignored", vec_idx(2)); + endif + if (n_vec > 2) # sampling time dt specified + arg = args{vec_idx(3)}; + if (issample (arg)) + dt = arg; + else + warning ("initial: argument number %d ignored", vec_idx(3)); + endif + if (n_vec > 3) + warning ("initial: ignored"); + endif + endif + endif + endif + else # step or impulse response + if (n_vec > 0) # tfinal or time vector t specified + arg = args{vec_idx(1)}; + if (issample (arg)) + tfinal = arg; + elseif (isempty (arg)) + ## tfinal = []; # nothing to do here + elseif (is_real_vector (arg)) + dt = abs (arg(2)  arg(1)); # assume that t is regularly spaced + tfinal = arg(end); + else + warning ("%s: argument number %d ignored", response, vec_idx(1)); + endif + if (n_vec > 1) # sampling time dt specified + arg = args{vec_idx(2)}; + if (issample (arg)) + dt = arg; + else + warning ("%s: argument number %d ignored", response, vec_idx(2)); + endif + if (n_vec > 2) + warning ("%s: ignored", response); + endif + endif + endif + endif + ## TODO: share common code between initial and step/impulse  [tfinal, dt] = cellfun (@__sim_horizon__, sys_cell, {tfinal}, "uniformoutput", false);  + [tfinal, dt] = cellfun (@__sim_horizon__, sys_cell, {tfinal}, {dt}, "uniformoutput", false); tfinal = max ([tfinal{:}]);  dt   +dt ct_idx = cellfun (@isct, sys_cell); sys_dt_cell = sys_cell;  tmp = cellfun (@c2d, sys_cell(ct_idx), dt, {"zoh"}, "uniformoutput", false); + tmp = cellfun (@c2d, sys_cell(ct_idx), dt(ct_idx), {"zoh"}, "uniformoutput", false); sys_dt_cell(ct_idx) = tmp; %{  if (! isa (sys, "ss"))  sys = ss (sys); # sys must be proper  endif   if (is_real_vector (tfinal) && length (tfinal) > 1) # time vector t passed  dt = tfinal(2)  tfinal(1); # assume that t is regularly spaced  tfinal = tfinal(end);  endif   [A, B, C, D, tsam] = ssdata (sys);   discrete = ! isct (sys); # static gains are treated as analog systems  tsam = abs (tsam); # use 1 second if tsam is unspecified (1)   if (discrete)  if (! isempty (dt))  warning ("time_response: argument dt has no effect on sampling time of discrete system");  endif   dt = tsam;  endif   [tfinal, dt] = __sim_horizon__ (A, discrete, tfinal, dt);   if (! discrete)  sys = c2d (sys, dt, "zoh");  endif   [F, G] = ssdata (sys); # matrices C and D don't change   n = rows (F); # number of states  m = columns (G); # number of inputs  p = rows (C); # number of outputs  ## time vector  t = reshape (0 : dt : tfinal, [], 1);  l_t = length (t); %}    ## time vector t = @cellfun (@(dt) reshape (0 : dt : tfinal, [], 1), dt, "uniformoutput", false); ## function [y, x_arr] = __initial_response__ (sys, sys_dt, t, x0) ## function [y, x_arr] = __step_response__ (sys_dt, t) ## function [y, x_arr] = __impulse_response__ (sys, sys_dt, t)  switch (resptype) + switch (response) case "initial" [y, x] = cellfun (@__initial_response__, sys_dt_cell, t, {x0}, "uniformoutput", false); case "step" @@ 122,7 +133,7 @@ if (plotflag) # display plot [p, m] = size (sys_cell{1});  switch (resptype) + switch (response) case "initial" str = "Response to Initial Conditions"; cols = 1; @@ 146,7 +157,6 @@ rc = rows (colororder); for k = 1 : n_sys # for every system  color = colororder(1+rem (k1, rc), :); if (k == n_sys) lim = numel (args); else @@ 154,9 +164,9 @@ endif style = args(style_idx(style_idx > sys_idx(k) & style_idx <= lim)); if (isempty (style)) + color = colororder(1+rem (k1, rc), :); style = {"", "color", color}; endif  style discrete = ! ct_idx(k); if (discrete) # discretetime system for i = 1 : p # for every output @@ 213,8 +223,6 @@ endfunction   function [y, x_arr] = __initial_response__ (sys_dt, t, x0) [F, G, C, D] = ssdata (sys_dt); # system must be proper @@ 279,6 +287,7 @@ [~, B] = ssdata (sys); [F, G, C, D, dt] = ssdata (sys_dt); # system must be proper + dt = abs (dt); # use 1 second if tsam is unspecified (1) discrete = ! isct (sys); n = rows (F); # number of states @@ 323,8 +332,6 @@ endfunction  % function [tfinal, dt] = __sim_horizon__ (A, discrete, tfinal, Ts) function [tfinal, dt] = __sim_horizon__ (sys, tfinal, Ts) ## code based on __stepimp__.m of Kai P. Mueller and A. Scottedward Hodel @@ 339,9 +346,9 @@ n = length (ev); # number of states/poles continuous = isct (sys); discrete = ! continuous;  Ts = get (sys, "tsam"); if (discrete) + dt = Ts = abs (get (sys, "tsam")); ## perform bilinear transformation on poles in z for k = 1 : n pol = ev(k); @@ 400,8 +407,8 @@ endif endif  %if (! isempty (Ts)) # catch case cont. system with dt specified  % dt = Ts;  %endif + if (continuous && ! isempty (Ts)) # catch case cont. system with dt specified + dt = Ts; + endif endfunction This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <jpicarbajal@us...>  20120922 10:03:27

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

Revision: 11070 http://octave.svn.sourceforge.net/octave/?rev=11070&view=rev Author: jpicarbajal Date: 20120922 08:40:14 +0000 (Sat, 22 Sep 2012) Log Message:  general: Fixing error in documentation when passing function handles to inputParser. Modified Paths:  trunk/octaveforge/main/general/inst/@inputParser/inputParser.m Modified: trunk/octaveforge/main/general/inst/@inputParser/inputParser.m ===================================================================  trunk/octaveforge/main/general/inst/@inputParser/inputParser.m 20120922 08:15:06 UTC (rev 11069) +++ trunk/octaveforge/main/general/inst/@inputParser/inputParser.m 20120922 08:40:14 UTC (rev 11070) @@ 75,7 +75,7 @@ ## ## ## one can create a function handle to anonymous functions for validators ## val_mat = @@(x)isvector(x) && all( x <= 1) && all(x >= 0); ## p = p.addOptional ("mat", [0 0], @@val_mat); +## p = p.addOptional ("mat", [0 0], val_mat); ## ## ## create two ParamValue type of arguments ## val_type = @@(x) ischar(x) && any(strcmp(x, @{"linear", "quadratic"@}); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
From: <paramaniac@us...>  20120922 08:15:12

Revision: 11069 http://octave.svn.sourceforge.net/octave/?rev=11069&view=rev Author: paramaniac Date: 20120922 08:15:06 +0000 (Sat, 22 Sep 2012) Log Message:  control: support custom plot styles Modified Paths:  trunk/octaveforge/main/control/devel/__time_response_2__.m trunk/octaveforge/main/control/devel/multiplot3.m Modified: trunk/octaveforge/main/control/devel/__time_response_2__.m ===================================================================  trunk/octaveforge/main/control/devel/__time_response_2__.m 20120921 18:32:16 UTC (rev 11068) +++ trunk/octaveforge/main/control/devel/__time_response_2__.m 20120922 08:15:06 UTC (rev 11069) @@ 25,17 +25,16 @@ % function [y, t, x_arr] = __time_response_2__ (sys, resptype, plotflag, tfinal, dt, x0, sysname) function [y, t, x] = __time_response_2__ (resptype, args, sysname, plotflag)  sys_idx = cellfun (@isa, args, {"lti"}); # look for LTI models + sys_idx = find (cellfun (@isa, args, {"lti"})); # look for LTI models, 'find' needed for plot styles sys_cell = cellfun (@ss, args(sys_idx), "uniformoutput", false); # convert to statespace if (! size_equal (sys_cell{:})) error ("%s: models must have equal sizes", resptype); endif  tmp = cellfun (@is_real_matrix, args);  vec_idx = find (tmp);  n_vec = length (vec_idx);  n_sys = length (sys_cell); + vec_idx = find (cellfun (@is_real_matrix, args)); # indices of vector arguments + n_vec = length (vec_idx); # number of vector arguments + n_sys = length (sys_cell); # number of LTI systems %if (n_vec >= 1) % arg = args{vec_idx(1)}; @@ 140,6 +139,7 @@ error ("time_response: invalid response type"); endswitch + style_idx = find (cellfun (@ischar, args)); outname = get (sys_cell{end}, "outname"); outname = __labels__ (outname, "y"); colororder = get (gca, "colororder"); @@ 147,7 +147,16 @@ for k = 1 : n_sys # for every system color = colororder(1+rem (k1, rc), :);  style = {"", "color", color}; + if (k == n_sys) + lim = numel (args); + else + lim = sys_idx(k+1); + endif + style = args(style_idx(style_idx > sys_idx(k) & style_idx <= lim)); + if (isempty (style)) + style = {"", "color", color}; + endif + style discrete = ! ct_idx(k); if (discrete) # discretetime system for i = 1 : p # for every output Modified: trunk/octaveforge/main/control/devel/multiplot3.m ===================================================================  trunk/octaveforge/main/control/devel/multiplot3.m 20120921 18:32:16 UTC (rev 11068) +++ trunk/octaveforge/main/control/devel/multiplot3.m 20120922 08:15:06 UTC (rev 11069) @@ 3,6 +3,8 @@ figure (1) step2 (T_AH, T_opt) +figure (2) +step2 (T_AH, '.r', T_opt, 'b') figure (2) +figure (3) step2 (T_AH, c2d (T_opt, 1)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 