*** empty log message ***

svn path=/trunk/externals/nusmuk/; revision=2768

3 files changed, 737 insertions, 236 deletions

diff --git a/msd/01_msdtest.pd b/msd/01_msdtest.pd
index 6991c3c..dbacaa3 100644
--- a/msd/01_msdtest.pd
+++ b/msd/01_msdtest.pd
@@ -32,16 +32,16 @@
 #X obj 45 576 cnv 15 300 200 empty empty empty 20 12 0 14 -261689 -66577
 0;
 #X obj 88 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689
--1 -1 7759 1;
+-1 -1 8218 1;
 #X obj 111 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689
--1 -1 5259 1;
+-1 -1 6270 1;
 #X obj 66 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689
 -1 -1 10160 1;
 #X msg 52 736 posX fix \$1;
 #X obj 156 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689
--1 -1 983 1;
+-1 -1 2445 1;
 #X obj 134 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689
--1 -1 2910 1;
+-1 -1 4345 1;
 #X text 199 638 MOVE FIRST SLIDER;
 #X text 182 662 TO MOVE THE FIXED MASS;
 #X msg 184 248 link souple \$1 \$2 10 0.5 0.5;
@@ -50,14 +50,14 @@
 #X msg 180 438 forceX mob -300;
 #X obj 167 55 t b b b b b b;
 #X text 205 34 RESET;
-#X obj 52 523 route massesPosL;
 #X msg 52 335 bang \, massesPosL;
 #X obj 52 545 unpack f f f f f;
+#X obj 52 523 route massesPosL;
 #X connect 0 0 38 0;
-#X connect 2 0 40 0;
+#X connect 2 0 42 0;
 #X connect 2 1 1 0;
 #X connect 3 0 6 0;
-#X connect 6 0 41 0;
+#X connect 6 0 40 0;
 #X connect 9 0 2 0;
 #X connect 10 0 38 0;
 #X connect 11 0 9 0;
@@ -84,11 +84,11 @@
 #X connect 38 3 15 0;
 #X connect 38 4 14 0;
 #X connect 38 5 11 0;
-#X connect 40 0 42 0;
-#X connect 40 1 1 0;
-#X connect 41 0 2 0;
-#X connect 42 0 28 0;
-#X connect 42 1 26 0;
-#X connect 42 2 27 0;
-#X connect 42 3 31 0;
-#X connect 42 4 30 0;
+#X connect 40 0 2 0;
+#X connect 41 0 28 0;
+#X connect 41 1 26 0;
+#X connect 41 2 27 0;
+#X connect 41 3 31 0;
+#X connect 41 4 30 0;
+#X connect 42 0 41 0;
+#X connect 42 1 1 0;
diff --git a/msd/license.txt b/msd/license.txt
new file mode 100644
index 0000000..b1e3f5a
--- /dev/null
+++ b/msd/license.txt
@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+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 this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. 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 not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+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
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the 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.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "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
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY 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
+LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/msd/main.cpp b/msd/main.cpp
index 324ab2d..b01bc5e 100755
--- a/msd/main.cpp
+++ b/msd/main.cpp
@@ -3,6 +3,7 @@
 /* 
  msd - mass spring damper model for Pure Data or Max/MSP
 
+ Copyright (C) 2005  Nicolas Montgermont
  Written by Nicolas Montgermont for a Master's train in Acoustic,
  Signal processing and Computing Applied to Music (ATIAM, Paris 6) 
  at La Kitchen supervised by Cyrille Henry.
@@ -15,31 +16,29 @@
  Contact : Nicolas Montgermont, montgermont@la-kitchen.fr
 	   Cyrille Henry, Cyrille.Henry@la-kitchen.fr
 
- 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 2               

- 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, write to the Free Software                  

- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
- Version 0.01, 12.04.2005
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
 
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ Version 0.02 -- 15.04.2005
 */
 
 // include flext header
 #include <flext.h>
-
 #include <math.h>
 
 // define constants
-#define MSD_VERSION  0.01
+#define MSD_VERSION  0.02
 #define nb_max_link   4000

 #define nb_max_mass   4000

 #define Id_length   20
@@ -62,7 +61,6 @@ typedef struct _mass {
 	t_float posX2;

 	t_float forceX;
 	t_float out_forceX;
-	char Id_string[Id_length];

 } t_mass;

 

 typedef struct _link {

@@ -73,9 +71,10 @@ typedef struct _link {
 	t_float K1, D1, D2;
 	t_float longx, longueur;
 	t_float distance_old;
-	char Id_string[Id_length];

 } t_link;
 
+
+
 class msd:
 	public flext_base
 {
@@ -97,6 +96,8 @@ public:
 		AddOutAnything("control");		// outlet for bang
 	}
 
+
+
 protected:
 
 // ---------------------------------------------------------------  RESET 
@@ -112,7 +113,7 @@ protected:
 		for (i=0; i<nb_link; i++)	{
 			delete link[i];
 			}
-		ToOutAnything(1,gensym("Reset"),0,sortie);
+		ToOutAnything(1,S_Reset,0,sortie);
 		nb_link = 0;

 		nb_mass = 0;
 		id_mass = 0;
@@ -165,68 +166,56 @@ protected:
 	// Id, nbr, mobile, invM, speedX, posX, forceX

 	{
 		t_atom sortie[5], aux[2];
-		int M;
+		t_float M;
 
 		mass[nb_mass] = new t_mass;			// new pointer

-		mass[nb_mass]->Id = GetASymbol(argv[0]);	// ID
-		mass[nb_mass]->mobile = GetAInt(argv[1]);	// mobile
-		if (GetAInt(argv[2])==0)
+		mass[nb_mass]->Id = GetSymbol(argv[0]);	// ID
+		mass[nb_mass]->mobile = GetInt(argv[1]);	// mobile
+		if (GetFloat(argv[2])==0)
 			M=1;
-		else M = GetAInt(argv[2]);			
-		mass[nb_mass]->invM = 1/((float)M);		// invM
+		else M = GetFloat(argv[2]);			
+		mass[nb_mass]->invM = 1/(M);			// invM
 		mass[nb_mass]->speedX = 0;			// vx

-		mass[nb_mass]->posX = GetAInt(argv[3]);		// x
-		mass[nb_mass]->posX2 = GetAInt(argv[3]);		// x

+		mass[nb_mass]->posX = GetFloat(argv[3]);		// x
+		mass[nb_mass]->posX2 = GetFloat(argv[3]);		// x

 		mass[nb_mass]->forceX = 0;			// Fx
 		mass[nb_mass]->nbr = id_mass;			// id_nbr
-		SETSYMBOL(aux,GetASymbol(argv[0]));
-		atom_string(aux,mass[nb_mass]->Id_string,Id_length);
 		nb_mass++ ;
 		id_mass++;

 		nb_mass = min ( nb_max_mass -1, nb_mass );
-		SETFLOAT(&(sortie[0]),id_mass-1);
-		SETSYMBOL(&(sortie[1]),GetASymbol(argv[0]));
-		SETFLOAT(&(sortie[2]),mass[nb_mass-1]->mobile);
-		SETFLOAT(&(sortie[3]),M);
-		SETFLOAT(&(sortie[4]),mass[nb_mass-1]->posX);
-		ToOutAnything(1,gensym("Mass"),5,sortie);
+		SetFloat((sortie[0]),id_mass-1);
+		SetSymbol((sortie[1]),GetSymbol(argv[0]));
+		SetFloat((sortie[2]),mass[nb_mass-1]->mobile);
+		SetFloat((sortie[3]),M);
+		SetFloat((sortie[4]),mass[nb_mass-1]->posX);
+		ToOutAnything(1,S_Mass,5,sortie);
 	}
 
 	void m_forceX(int argc,t_atom *argv) 

 	{

 	// add a force to mass(es) named Id
-		t_int i,aux;
-		t_atom atom[2];
-		char buffer[Id_length];
+		t_int i;
+		const t_symbol *sym = GetSymbol(argv[0]);
 
-		SETSYMBOL(atom,GetASymbol(argv[0]));
-		atom_string(atom, buffer, Id_length);
 		for (i=0; i<nb_mass;i++)
 		{
-			aux = strcmp(buffer,mass[i]->Id_string);
-			if (aux == 0)
-				mass[i]->forceX += GetAFloat(argv[1]);
+			if (sym == mass[i]->Id)
+				mass[i]->forceX += GetFloat(argv[1]);
 		}
 	}
 
 	void m_posX(int argc,t_atom *argv) 
 	{

 	// displace mass(es) named Id to a certain position

-		t_int i,aux;
-		t_atom atom[2];
-		char buffer[Id_length];
+		t_int i;
+		const t_symbol *sym = GetSymbol(argv[0]);
 
-		if (GetAFloat(argv[1]) < Xmax && GetAFloat(argv[1]) > Xmin)
-		{
-			SETSYMBOL(atom,GetASymbol(argv[0]));
-			atom_string(atom, buffer, Id_length);
+		if (GetFloat(argv[1]) < Xmax && GetFloat(argv[1]) > Xmin)
 			for (i=0; i<nb_mass;i++)
 			{
-				aux = strcmp(buffer,mass[i]->Id_string);
-				if (aux == 0)
+				if (sym == mass[i]->Id)
 					mass[i]->posX = GetAFloat(argv[1]);
 			}
-		}
 	}
 
 	void m_set_mobile(int argc,t_atom *argv) 
@@ -234,7 +223,7 @@ protected:
 	// set mass No to mobile

 		t_int i,aux;
 		
-		aux = GetAInt(argv[0]);	
+		aux = GetInt(argv[0]);	
 		for (i=0; i<nb_mass;i++)
 			{
 				if (mass[i]->nbr == aux)
@@ -248,7 +237,7 @@ protected:
 	// set mass No to fixed

 		t_int i,aux;
 		
-		aux = GetAInt(argv[0]);	
+		aux = GetInt(argv[0]);	
 		for (i=0; i<nb_mass;i++)
 			{
 				if (mass[i]->nbr == aux)
@@ -265,7 +254,7 @@ protected:
 	
 	for (i=0; i<nb_link;i++)	{
 		if (link[i]->mass1->nbr == GetAInt(argv[0]) || link[i]->mass2->nbr == GetAInt(argv[0]))	{
-			SETFLOAT(&(aux[nb_link_delete]),link[i]->nbr);
+			SetFloat((aux[nb_link_delete]),link[i]->nbr);
 			nb_link_delete++;
 		}
 	}
@@ -275,15 +264,15 @@ protected:
 
 	for (i=0; i<nb_mass;i++)
 		if (mass[i]->nbr == GetAInt(argv[0]))	{
-			SETFLOAT(&(sortie[0]),mass[i]->nbr);
-			SETSYMBOL(&(sortie[1]),mass[i]->Id);
-			SETFLOAT(&(sortie[2]),mass[i]->mobile);
-			SETFLOAT(&(sortie[3]),1/mass[i]->invM);
-			SETFLOAT(&(sortie[4]),mass[i]->posX);
+			SetFloat((sortie[0]),mass[i]->nbr);
+			SetSymbol((sortie[1]),mass[i]->Id);
+			SetFloat((sortie[2]),mass[i]->mobile);
+			SetFloat((sortie[3]),1/mass[i]->invM);
+			SetFloat((sortie[4]),mass[i]->posX);
 			delete mass[i];
 			mass[i] = mass[nb_mass-1];
 			nb_mass--;
-			ToOutAnything(1,gensym("Mass deleted"),5,sortie);
+			ToOutAnything(1,S_Mass_deleted,5,sortie);
 			break;
 		}
 
@@ -293,13 +282,13 @@ protected:
 	void m_Xmax(int argc,t_atom *argv) 
 	{

 	// set damping of link(s) named Id
-	Xmax = GetAFloat(argv[0]);
+	Xmax = GetFloat(argv[0]);
 	}
 
 	void m_Xmin(int argc,t_atom *argv) 
 	{

 	// set damping of link(s) named Id
-	Xmin = GetAFloat(argv[0]);
+	Xmin = GetFloat(argv[0]);
 	}
 
 // --------------------------------------------------------------  LINKS 
@@ -312,32 +301,30 @@ protected:
 		t_int i;
 
 		link[nb_link] = new t_link;
-		link[nb_link]->Id = GetASymbol(argv[0]);
+		link[nb_link]->Id = GetSymbol(argv[0]);
 		for (i=0; i<nb_mass;i++)
 			if (mass[i]->nbr==GetAInt(argv[1]))
 				link[nb_link]->mass1 = mass[i];
 			else if(mass[i]->nbr==GetAInt(argv[2]))
 				link[nb_link]->mass2 = mass[i];
-		link[nb_link]->K1 = GetAFloat(argv[3]);

-		link[nb_link]->D1 = GetAFloat(argv[4]);
-		link[nb_link]->D2 = GetAFloat(argv[5]);
+		link[nb_link]->K1 = GetFloat(argv[3]);

+		link[nb_link]->D1 = GetFloat(argv[4]);
+		link[nb_link]->D2 = GetFloat(argv[5]);
 		link[nb_link]->longx = link[nb_link]->mass1->posX - link[nb_link]->mass2->posX;
 		link[nb_link]->longueur = link[nb_link]->longx ;
 		link[nb_link]->nbr = id_link;
 		link[nb_link]->distance_old = link[nb_link]->longueur;
-		SETSYMBOL(aux,GetASymbol(argv[0]));
-		atom_string(aux,(link[nb_link]->Id_string),Id_length);
 		nb_link++;
 		id_link++;

 		nb_link = min ( nb_max_link -1, nb_link );
-		SETFLOAT(&(sortie[0]),id_link-1);
-		SETSYMBOL(&(sortie[1]),link[nb_link-1]->Id);
-		SETFLOAT(&(sortie[2]),GetAInt(argv[1]));
-		SETFLOAT(&(sortie[3]),GetAInt(argv[2]));
-		SETFLOAT(&(sortie[4]),link[nb_link-1]->K1);
-		SETFLOAT(&(sortie[5]),link[nb_link-1]->D1);
-		SETFLOAT(&(sortie[6]),link[nb_link-1]->D2);
-		ToOutAnything(1,gensym("Link"),7,sortie);

+		SetFloat((sortie[0]),id_link-1);
+		SetSymbol((sortie[1]),link[nb_link-1]->Id);
+		SetFloat((sortie[2]),GetInt(argv[1]));
+		SetFloat((sortie[3]),GetInt(argv[2]));
+		SetFloat((sortie[4]),link[nb_link-1]->K1);
+		SetFloat((sortie[5]),link[nb_link-1]->D1);
+		SetFloat((sortie[6]),link[nb_link-1]->D2);
+		ToOutAnything(1,S_Link,7,sortie);

 	}
 
 	void m_ilink(int argc,t_atom *argv) 
@@ -345,23 +332,19 @@ protected:
 	// Id, nbr, Id masses1, Id masses2, K1, D1

 	{

 		t_atom aux[2], arglist[6];
-		t_int i,j, strvalue, strvalue2, imass1[nb_mass], nbmass1=0, imass2[nb_mass], nbmass2=0;
-		char buffer[Id_length], buffer2[Id_length];
+		t_int i,j, imass1[nb_mass], nbmass1=0, imass2[nb_mass], nbmass2=0;
+		t_symbol *Id1, *Id2;
 
-		ToOutAnything(1,gensym("iLink"),0,aux);
-		SETSYMBOL(aux,GetASymbol(argv[1]));
-		atom_string(aux, buffer, Id_length);
-		SETSYMBOL(aux,GetASymbol(argv[2]));
-		atom_string(aux, buffer2, Id_length);
+		Id1 = GetSymbol(argv[1]);
+		Id2 = GetSymbol(argv[2]);
+		ToOutAnything(1,S_iLink,0,aux);
 
 		for (i=0;i<nb_mass;i++)	{
-			strvalue=strcmp(buffer,mass[i]->Id_string);
-			strvalue2=strcmp(buffer2,mass[i]->Id_string);
-			if (strvalue ==0)	{
+			if (Id1 == mass[i]->Id)	{
 				imass1[nbmass1]=i;
 				nbmass1++;
 			}
-			if (strvalue2 ==0)	{
+			if (Id2 == mass[i]->Id)	{
 				imass2[nbmass2]=i;
 				nbmass2++;
 			}
@@ -370,12 +353,12 @@ protected:
 		for(i=0;i<nbmass1;i++)
 			for(j=0;j<nbmass2;j++)	
 				if (imass1[i] != imass2[j])	{
-					SETSYMBOL(&(arglist[0]),GetASymbol(argv[0]));
-					SETFLOAT(&(arglist[1]),mass[imass1[i]]->nbr);
-					SETFLOAT(&(arglist[2]),mass[imass2[j]]->nbr);
-					SETFLOAT(&(arglist[3]),GetAInt(argv[3]));
-					SETFLOAT(&(arglist[4]),GetAFloat(argv[4]));
-					SETFLOAT(&(arglist[5]),GetAFloat(argv[5]));
+					SetSymbol((arglist[0]),GetSymbol(argv[0]));
+					SetFloat((arglist[1]),mass[imass1[i]]->nbr);
+					SetFloat((arglist[2]),mass[imass2[j]]->nbr);
+					SetFloat((arglist[3]),GetInt(argv[3]));
+					SetFloat((arglist[4]),GetFloat(argv[4]));
+					SetFloat((arglist[5]),GetFloat(argv[5]));
 					m_link(6,arglist);
 				}
 	}
@@ -383,51 +366,39 @@ protected:
 	void m_setK(int argc,t_atom *argv) 
 	{

 	// set rigidity of link(s) named Id
-		t_int i,aux;
-		t_atom atom[2];
-		char buffer[Id_length];
+		t_int i;
+		const t_symbol *sym = GetSymbol(argv[0]);
 
-		SETSYMBOL(atom,GetASymbol(argv[0]));
-		atom_string(atom, buffer, Id_length);
 		for (i=0; i<nb_link;i++)
 		{
-			aux = strcmp(buffer,link[i]->Id_string);
-			if (aux == 0)
-				link[i]->K1 = GetAFloat(argv[1]);
+			if (sym == link[i]->Id)
+				link[i]->K1 = GetFloat(argv[1]);
 		}
 	}
 
 	void m_setD(int argc,t_atom *argv) 
 	{

 	// set damping of link(s) named Id
-		t_int i,aux;
-		t_atom atom[2];
-		char buffer[Id_length];
+		t_int i;
+		const t_symbol *sym = GetSymbol(argv[0]);
 
-		SETSYMBOL(atom,GetASymbol(argv[0]));
-		atom_string(atom, buffer, Id_length);
 		for (i=0; i<nb_link;i++)
 		{
-			aux = strcmp(buffer,link[i]->Id_string);
-			if (aux == 0)
-				link[i]->D1 = GetAFloat(argv[1]);
+			if (sym == link[i]->Id)
+				link[i]->D1 = GetFloat(argv[1]);
 		}
 	}
 
 	void m_setD2(int argc,t_atom *argv) 
 	{

 	// set damping of link(s) named Id
-		t_int i,aux;
-		t_atom atom[2];
-		char buffer[Id_length];
+		t_int i;
+		const t_symbol *sym = GetSymbol(argv[0]);
 
-		SETSYMBOL(atom,GetASymbol(argv[0]));
-		atom_string(atom, buffer, Id_length);
 		for (i=0; i<nb_link;i++)
 		{
-			aux = strcmp(buffer,link[i]->Id_string);
-			if (aux == 0)
-				link[i]->D2 = GetAFloat(argv[1]);
+			if (sym == link[i]->Id)
+				link[i]->D2 = GetFloat(argv[1]);
 		}
 	}
 
@@ -438,18 +409,18 @@ protected:
 	t_atom sortie[7];
 
 	for (i=0; i<nb_link;i++)
-		if (link[i]->nbr == GetAInt(argv[0]))	{
-			SETFLOAT(&(sortie[0]),link[i]->nbr);
-			SETSYMBOL(&(sortie[1]),link[i]->Id);
-			SETFLOAT(&(sortie[2]),link[i]->mass1->nbr);
-			SETFLOAT(&(sortie[3]),link[i]->mass2->nbr);
-			SETFLOAT(&(sortie[4]),link[i]->K1);
-			SETFLOAT(&(sortie[5]),link[i]->D1);
-			SETFLOAT(&(sortie[6]),link[i]->D2);
+		if (link[i]->nbr == GetInt(argv[0]))	{
+			SetFloat((sortie[0]),link[i]->nbr);
+			SetSymbol((sortie[1]),link[i]->Id);
+			SetFloat((sortie[2]),link[i]->mass1->nbr);
+			SetFloat((sortie[3]),link[i]->mass2->nbr);
+			SetFloat((sortie[4]),link[i]->K1);
+			SetFloat((sortie[5]),link[i]->D1);
+			SetFloat((sortie[6]),link[i]->D2);
 			delete link[i];
 			link[i]=link[nb_link-1];
 			nb_link--;
-			ToOutAnything(1,gensym("Link deleted"),7,sortie);
+			ToOutAnything(1,S_Link_deleted,7,sortie);
 			break;
 		}
 	}
@@ -460,135 +431,120 @@ protected:
 	void m_get(int argc,t_atom *argv)
 	// get attributes
 	{
-		t_int i,j, auxstring1, auxstring2, auxstring3, aux;
-		t_symbol *auxarg;
-		t_atom sortie[4],atom[2];
-		char buffer[Id_length],masses[]="massesPos",buffer2[Id_length], forces[] = "massesForces", links[] = "linksPos";
-
-		SETSYMBOL(atom,GetASymbol(argv[0]));
-		atom_string(atom, buffer, 20);
-		auxstring1 = strcmp(buffer,masses);	//auxstring1 : 0 masses, 1 else
-		auxstring2 = strcmp(buffer,forces);	//auxstring2 : 0 forces, 1 else
-		auxstring3 = strcmp(buffer,links);	//auxstring2 : 0 links, 1 else
+		t_int i,j;
+		t_symbol *auxarg,*auxarg2, *auxtype;
+		t_atom sortie[4];
+		auxtype = GetSymbol(argv[0]);
 		auxarg = GetASymbol(argv[1]);		//auxarg : & symbol, 0 else
 		if (argc == 1)
 		{
-			if (auxstring1 == 0)// get all masses positions
+			if (auxtype == S_massesPos)// get all masses positions
 				for (i=0; i<nb_mass; i++)
-				{		atom_string(atom, buffer, Id_length);
-					SETFLOAT(&sortie[0],mass[i]->posX);
-					ToOutAnything(0,gensym("massesPos"),1,sortie);
+				{		
+					SetFloat(sortie[0],mass[i]->posX);
+					ToOutAnything(0,S_massesPos,1,sortie);
 				}
-			else if (auxstring2 == 0)// get all masses forces
+			else if (auxtype == S_massesForces)// get all masses forces
 				for (i=0; i<nb_mass; i++)
 				{
-					SETFLOAT(&sortie[0],mass[i]->out_forceX);
-					ToOutAnything(0,gensym("massesForces"),1,sortie);
+					SetFloat(sortie[0],mass[i]->out_forceX);
+					ToOutAnything(0,S_massesForces,1,sortie);
 				}
-			else if (auxstring3 == 0)// get all links positions
+			else if (auxtype == S_linksPos)// get all links positions
 				for (i=0; i<nb_link; i++)
 				{
-					SETFLOAT(&sortie[0],link[i]->mass1->posX);
-					SETFLOAT(&sortie[2],link[i]->mass2->posX);
-					ToOutAnything(0,gensym("linksPos"),2,sortie);
+					SetFloat(sortie[0],link[i]->mass1->posX);
+					SetFloat(sortie[1],link[i]->mass2->posX);
+					ToOutAnything(0,S_linksPos,2,sortie);
 				}
 			else 		// get all masses speeds
 				for (i=0; i<nb_mass; i++)
 				{
-					SETFLOAT(&sortie[0],mass[i]->speedX);
-					ToOutAnything(0,gensym("massesSpeeds"),1,sortie);
+					SetFloat(sortie[0],mass[i]->speedX);
+					ToOutAnything(0,S_massesSpeeds,1,sortie);
 				}
 		}
-		else if (auxstring1 == 0) // get mass positions
+		else if (auxtype == S_massesPos) // get mass positions
 		{
 			if (auxarg == 0) // No
 			{
 				for (j = 1; j<argc; j++)
 					for (i=0;i<nb_mass;i++)
-						if (mass[i]->nbr==GetAInt(argv[j]))
+						if (mass[i]->nbr==GetInt(argv[j]))
 						{
-							SETFLOAT(&sortie[0],mass[i]->posX);
-							ToOutAnything(0,gensym("massesPosNo"),1,sortie);
+							SetFloat(sortie[0],mass[i]->posX);
+							ToOutAnything(0,S_massesPosNo,1,sortie);
 						}
 			}
-			else 		//strin		FLEXT_CADDMETHOD_(c,0,"Xmin",m_Xmin);g
+			else 		//symbol
 			{
 				for (j = 1; j<argc; j++)
 				{
-					SETSYMBOL(&atom[1],GetASymbol(argv[j]));
-					atom_string(&atom[1], buffer2, Id_length);
+					auxarg2 = GetSymbol(argv[j]);
 					for (i=0;i<nb_mass;i++)	
 					{
-						
-						aux = strcmp(buffer2,mass[i]->Id_string);
-						if (aux==0)
+						if (auxarg2==mass[i]->Id)
 						{
-							SETFLOAT(&sortie[0],mass[i]->posX);
-							ToOutAnything(0,gensym("massesPosId"),1,sortie);
+							SetFloat(sortie[0],mass[i]->posX);
+							ToOutAnything(0,S_massesPosId,1,sortie);
 						}
 					}
 				}
 			}
 		}
-		else if (auxstring2 == 0)			 // get mass forces
+		else if (auxtype == S_massesForces)			 // get mass forces
 		{
 			if (auxarg == 0) // No
 			{
 				for (j = 1; j<argc; j++)
 					for (i=0;i<nb_mass;i++)
-						if (mass[i]->nbr==GetAInt(argv[j]))
+						if (mass[i]->nbr==GetInt(argv[j]))
 						{
-							SETFLOAT(&sortie[0],mass[i]->out_forceX);
-							ToOutAnything(0,gensym("massesForcesNo"),1,sortie);
+							SetFloat(sortie[0],mass[i]->out_forceX);
+							ToOutAnything(0,S_massesForcesNo,1,sortie);
 						}
 			}
 			else 		//string
 			{
 				for (j = 1; j<argc; j++)
 				{
-					SETSYMBOL(&atom[1],GetASymbol(argv[j]));
-					atom_string(&atom[1], buffer2, Id_length);
+					auxarg2 = GetSymbol(argv[j]);
 					for (i=0;i<nb_mass;i++)	
 					{
-		
-						aux = strcmp(buffer2,mass[i]->Id_string);
-						if (aux==0)
+						if (auxarg2==mass[i]->Id)
 						{
-							SETFLOAT(&sortie[0],mass[i]->out_forceX);
-							ToOutAnything(0,gensym("massesForcesId"),1,sortie);
-						}
+							SetFloat(sortie[0],mass[i]->out_forceX);
+							ToOutAnything(0,S_massesForcesId,1,sortie);
+						}	
 					}
 				}
 			}
 		}
-		else if (auxstring3 == 0)			 // get links positions
+		else if (auxtype == S_linksPos)			 // get links positions
 		{
 			if (auxarg == 0) // No
 			{
 				for (j = 1; j<argc; j++)
 					for (i=0;i<nb_link;i++)
-						if (link[i]->nbr==GetAInt(argv[j]))
+						if (link[i]->nbr==GetInt(argv[j]))
 						{
-							SETFLOAT(&sortie[0],link[i]->mass1->posX);
-							SETFLOAT(&sortie[2],link[i]->mass2->posX);
-							ToOutAnything(0,gensym("linksPosNo"),2,sortie);
+							SetFloat(sortie[0],link[i]->mass1->posX);
+							SetFloat(sortie[1],link[i]->mass2->posX);
+							ToOutAnything(0,S_linksPosNo,2,sortie);
 						}
 			}
-			else 		//string
+			else 		//symbol
 			{
 				for (j = 1; j<argc; j++)
 				{
-					SETSYMBOL(&atom[1],GetASymbol(argv[j]));
-					atom_string(&atom[1], buffer2, Id_length);
+					auxarg2 = GetSymbol(argv[j]);
 					for (i=0;i<nb_link;i++)	
 					{
-		
-						aux = strcmp(buffer2,link[i]->Id_string);
-						if (aux==0)
+						if (auxarg2==link[i]->Id)
 						{
-							SETFLOAT(&sortie[0],link[i]->mass1->posX);
-							SETFLOAT(&sortie[2],link[i]->mass2->posX);
-							ToOutAnything(0,gensym("linksPosId"),2,sortie);
+							SetFloat(sortie[0],link[i]->mass1->posX);
+							SetFloat(sortie[1],link[i]->mass2->posX);
+							ToOutAnything(0,S_linksPosId,2,sortie);
 						}
 					}
 				}
@@ -600,26 +556,23 @@ protected:
 			{
 				for (j = 1; j<argc; j++)
 					for (i=0;i<nb_mass;i++)
-						if (mass[i]->nbr==GetAInt(argv[j]))
+						if (mass[i]->nbr==GetInt(argv[j]))
 						{
-							SETFLOAT(&sortie[0],mass[i]->speedX);
-							ToOutAnything(0,gensym("massesSpeedsNo"),1,sortie);
+							SetFloat(sortie[0],mass[i]->speedX);
+							ToOutAnything(0,S_massesSpeedsNo,1,sortie);
 						}
 			}
-			else 		//string
+			else 		//symbol
 			{
 				for (j = 1; j<argc; j++)
 				{
-					SETSYMBOL(&atom[1],GetASymbol(argv[j]));
-					atom_string(&atom[1], buffer2, Id_length);
+					auxarg2 = GetSymbol(argv[j]);
 					for (i=0;i<nb_mass;i++)	
 					{
-		
-						aux = strcmp(buffer2,mass[i]->Id_string);
-						if (aux==0)
+						if (auxarg2==mass[i]->Id)
 						{
 							SETFLOAT(&sortie[0],mass[i]->speedX);
-							ToOutAnything(0,gensym("massesSpeedsId"),1,sortie);
+							ToOutAnything(0,S_massesSpeedsId,1,sortie);
 						}
 					}
 				}
@@ -636,9 +589,9 @@ protected:
 		t_int i;
 	
 		for (i=0; i<nb_mass; i++)	{
-			SETFLOAT(&(sortie[i]),mass[i]->posX);
+			SetFloat((sortie[i]),mass[i]->posX);
 		}
-		ToOutAnything(0, gensym("massesPosL"), nb_mass, sortie);
+		ToOutAnything(0, S_massesPosL, nb_mass, sortie);
 	}
 
 	void m_force_dumpl()
@@ -648,9 +601,9 @@ protected:
 		t_int i;
 	
 		for (i=0; i<nb_mass; i++)	{
-			SETFLOAT(&(sortie[i]),mass[i]->out_forceX);
+			SetFloat((sortie[i]),mass[i]->out_forceX);
 		}
-		ToOutAnything(0, gensym("massesForcesL"), nb_mass, sortie);
+		ToOutAnything(0, S_massesForcesL, nb_mass, sortie);
 	}
 
 	void m_info_dumpl()
@@ -660,29 +613,29 @@ protected:
 		t_int i;
 	
 		for (i=0; i<nb_mass; i++)	{
-			SETFLOAT(&(sortie[0]),mass[i]->nbr);
-			SETSYMBOL(&(sortie[1]),mass[i]->Id);
-			SETFLOAT(&(sortie[2]),mass[i]->mobile);
-			SETFLOAT(&(sortie[3]),1/mass[i]->invM);
-			SETFLOAT(&(sortie[4]),mass[i]->posX);
-		ToOutAnything(1, gensym("Mass"), 5, sortie);
+			SetFloat((sortie[0]),mass[i]->nbr);
+			SetSymbol((sortie[1]),mass[i]->Id);
+			SetFloat((sortie[2]),mass[i]->mobile);
+			SetFloat((sortie[3]),1/mass[i]->invM);
+			SetFloat((sortie[4]),mass[i]->posX);
+		ToOutAnything(1, S_Mass, 5, sortie);
 		}
 
 		for (i=0; i<nb_link; i++)	{
-			SETFLOAT(&(sortie[0]),link[i]->nbr);
-			SETSYMBOL(&(sortie[1]),link[i]->Id);
-			SETFLOAT(&(sortie[2]),link[i]->mass1->nbr);
-			SETFLOAT(&(sortie[3]),link[i]->mass2->nbr);
-			SETFLOAT(&(sortie[4]),link[i]->K1);
-			SETFLOAT(&(sortie[5]),link[i]->D1);
-			SETFLOAT(&(sortie[6]),link[i]->D2);
-		ToOutAnything(1, gensym("Link"), 7, sortie);
+			SetFloat((sortie[0]),link[i]->nbr);
+			SetSymbol((sortie[1]),link[i]->Id);
+			SetFloat((sortie[2]),link[i]->mass1->nbr);
+			SetFloat((sortie[3]),link[i]->mass2->nbr);
+			SetFloat((sortie[4]),link[i]->K1);
+			SetFloat((sortie[5]),link[i]->D1);
+			SetFloat((sortie[6]),link[i]->D2);
+		ToOutAnything(1, S_Link, 7, sortie);
 		}
 
 	}
 
 
-// --------------------------------------------------------------  GLOBAL VARIABLES 
+// --------------------------------------------------------------  PROTECTED VARIABLES 
 
 	t_link * link[nb_max_link];

 	t_mass * mass[nb_max_mass];
@@ -693,9 +646,31 @@ protected:
 
 private:
 
-	static void setup(t_classid c)
+	const static t_symbol *S_Reset;
+	const static t_symbol *S_Mass;
+	const static t_symbol *S_Link;
+	const static t_symbol *S_iLink;
+	const static t_symbol *S_Mass_deleted;
+	const static t_symbol *S_Link_deleted;
+	const static t_symbol *S_massesPos;
+	const static t_symbol *S_massesPosNo;
+	const static t_symbol *S_massesPosId;
+	const static t_symbol *S_linksPos;
+	const static t_symbol *S_linksPosNo;
+	const static t_symbol *S_linksPosId;
+	const static t_symbol *S_massesForces;
+	const static t_symbol *S_massesForcesNo;
+	const static t_symbol *S_massesForcesId;
+	const static t_symbol *S_massesSpeeds;
+	const static t_symbol *S_massesSpeedsNo;
+	const static t_symbol *S_massesSpeedsId;
+	const static t_symbol *S_massesPosL;
+	const static t_symbol *S_massesForcesL;
+
+	void static setup(t_classid c)
 	{
-		// --- set up meth(i=0; i<nb_link;i++)ods (class scope) ---
+
+		// --- set up methods (class scope) ---
 
 		// register a bang method to the default inlet (0)
 		FLEXT_CADDBANG(c,0,m_bang);
@@ -747,6 +722,28 @@ private:
 	FLEXT_CALLBACK_V(m_delete_mass)
 };
 
+
+	const t_symbol *msd::S_Reset = MakeSymbol("Reset");
+	const t_symbol *msd::S_Mass = MakeSymbol("Mass");
+	const t_symbol *msd::S_Link = MakeSymbol("Link");
+	const t_symbol *msd::S_iLink = MakeSymbol("iLink");
+	const t_symbol *msd::S_Mass_deleted = MakeSymbol("Mass deleted");
+	const t_symbol *msd::S_Link_deleted = MakeSymbol("Link deleted");
+	const t_symbol *msd::S_massesPos = MakeSymbol("massesPos");
+	const t_symbol *msd::S_massesPosNo = MakeSymbol("massesPosNo");
+	const t_symbol *msd::S_massesPosId = MakeSymbol("massesPosId");
+	const t_symbol *msd::S_linksPos = MakeSymbol("linksPos");
+	const t_symbol *msd::S_linksPosNo = MakeSymbol("linksPosNo");
+	const t_symbol *msd::S_linksPosId = MakeSymbol("linksPosId");
+	const t_symbol *msd::S_massesForces = MakeSymbol("massesForces");
+	const t_symbol *msd::S_massesForcesNo = MakeSymbol("massesForcesNo");
+	const t_symbol *msd::S_massesForcesId = MakeSymbol("massesForcesId");
+	const t_symbol *msd::S_massesSpeeds = MakeSymbol("massesSpeeds");
+	const t_symbol *msd::S_massesSpeedsNo = MakeSymbol("massesSpeedsNo");
+	const t_symbol *msd::S_massesSpeedsId = MakeSymbol("massesSpeedsId");
+	const t_symbol *msd::S_massesPosL = MakeSymbol("massesPosL");
+	const t_symbol *msd::S_massesForcesL = MakeSymbol("massesForcesL");
+
 // instantiate the class (constructor has a variable argument list)
 FLEXT_NEW_V("msd",msd)