Pd-cvs February 2008

pd-cvs@lists.iem.at

10 participants
368 discussions

SF.net SVN: pure-data: [9447]
by eighthave＠users.sourceforge.net 18 Feb '08

18 Feb '08

Revision: 9447 http://pure-data.svn.sourceforge.net/pure-data/?rev=9447&view=rev Author: eighthave Date: 2008-02-17 16:50:52 -0800 (Sun, 17 Feb 2008) Log Message: ----------- Renamed "import" to "vendor" following the docs and this discussion: http://lists.puredata.info/pipermail/pd-dev/2008-02/010900.html Added Paths: ----------- vendor/ Removed Paths: ------------- import/ Copied: vendor (from rev 9446, import) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9446] trunk/externals/postlude
by postlude＠users.sourceforge.net 16 Feb '08

16 Feb '08

Revision: 9446 http://pure-data.svn.sourceforge.net/pure-data/?rev=9446&view=rev Author: postlude Date: 2008-02-16 03:22:24 -0800 (Sat, 16 Feb 2008) Log Message: ----------- [knn] by Fujinaga and MacMillan, initial commit Added Paths: ----------- trunk/externals/postlude/knn/ trunk/externals/postlude/knn/LICENSE trunk/externals/postlude/knn/README trunk/externals/postlude/knn/help-knn.pd trunk/externals/postlude/knn/knn.c trunk/externals/postlude/knn/makefile Added: trunk/externals/postlude/knn/LICENSE =================================================================== --- trunk/externals/postlude/knn/LICENSE (rev 0) +++ trunk/externals/postlude/knn/LICENSE 2008-02-16 11:22:24 UTC (rev 9446) @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 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. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. 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. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +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 Program or any portion +of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +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 Program, 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 Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) 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; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, 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 executable. However, as a +special exception, the source code 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. + +If distribution of executable or 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 counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program 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. + + 5. 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 Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program 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 to +this License. + + 7. 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 Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program 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 Program. + +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. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program 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. + + 9. The Free Software Foundation may publish revised and/or new versions +of the 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 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 Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, 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 + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. + + 12. 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 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. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +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 program's name and a brief idea of what it does.> + Copyright (C) 19yy <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 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 + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Added: trunk/externals/postlude/knn/README =================================================================== --- trunk/externals/postlude/knn/README (rev 0) +++ trunk/externals/postlude/knn/README 2008-02-16 11:22:24 UTC (rev 9446) @@ -0,0 +1,20 @@ +k-NN object for PD + +Introduction + +The k Nearest Neighbor algorithm is a simple and robust classification +algorithm. It compares an unknown feature vector to a database by +calculating distance and assigns the classification of the k closest +database entries to the unknown vector. This implementation for PD +takes inputs of PD lists for both learning and classification. +Currently the length of the feature vectors and maximum number of +classes is fixed at compile time. + +Feature Weighting + +This implementation also includes feature weighting to allow control +over the relative importance of each feature. This has been shown to +provide significant improvements to the performance of the k-NN +algorithm. + +Karl MacMillan <karlmac(a)peabody.jhu.edu> \ No newline at end of file Added: trunk/externals/postlude/knn/help-knn.pd =================================================================== --- trunk/externals/postlude/knn/help-knn.pd (rev 0) +++ trunk/externals/postlude/knn/help-knn.pd 2008-02-16 11:22:24 UTC (rev 9446) @@ -0,0 +1,23 @@ +#N canvas 552 184 590 372 10; +#X obj 73 247 knn; +#X msg 142 125 normal 0; +#X msg 142 145 normal 1; +#X msg 144 200 learn 0; +#X msg 143 179 learn 1 \$1; +#X msg 145 226 save databasename; +#X msg 145 247 read databasename; +#X msg 141 101 readweights weightfilename; +#X floatatom 73 281 4 0 0; +#X text 38 30 k-NN Object This is an implementation of the k Nearest Neighbor algorithm that can be used to classify objects by a feature vector.; +#X text 318 102 Read feature weight table; +#X text 217 134 Turn on and off normalization - normalization should be on when reading a file and off when training; +#X text 233 181 Turn learning mode on and off - the second argument to 'learn 1' is number of the class for the input.; +#X text 281 236 read and save the database as a textfile; +#X connect 0 0 8 0; +#X connect 1 0 0 0; +#X connect 2 0 0 0; +#X connect 3 0 0 0; +#X connect 4 0 0 0; +#X connect 5 0 0 0; +#X connect 6 0 0 0; +#X connect 7 0 0 0; Added: trunk/externals/postlude/knn/knn.c =================================================================== --- trunk/externals/postlude/knn/knn.c (rev 0) +++ trunk/externals/postlude/knn/knn.c 2008-02-16 11:22:24 UTC (rev 9446) @@ -0,0 +1,475 @@ +/* + * Copyright (C) 2000 Ichiro Fujinaga and Karl MacMillan + * + * Minor updates and maintenance (2008) Jamie Bullock <jamie(a)postlude.co.uk> + * + * + * 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. + */ + +/* This is a simple KNN object for PureData */ + +#include <stdio.h> +#include <math.h> +#include <stdlib.h> +#include <errno.h> +#include <string.h> +#include <assert.h> +#include <float.h> +#include "m_pd.h" + + +#undef N_FEATURES +#define N_FEATURES 40 /* FIXME - this really needs to be in the file somehow */ +#define MAX_N_CLASSES 100 /* number of instruments */ +#define TRUE 1 +#define FALSE 0 + +#define ABS(x) (((x) > 0) ? (x) : -(x)) + +typedef struct _nn { + int index; /* where in the feature db */ + float dist; /* distance from the unknown */ +} NN; + +typedef struct _feature { + unsigned long id; + unsigned long symbol_id; + float *feature; +} FEATURE; + +static t_class *knn_class; /* class pointer for PD */ + +typedef struct _knn { + t_object x_obj; /* object pointer for PD */ + t_outlet *out; /* this outputs the instrument class + * (a float) */ + t_outlet *loo; /* this is used for debugging - it outputs a + * feature vec */ + FEATURE *feature_db; /* the database of features */ + FEATURE unknown; + int db_size; /* size of the features db */ + float mean[N_FEATURES]; /* for normalization */ + float stdev[N_FEATURES]; /* for normalization */ + int k; /* number of k to use */ + NN *knn; /* array of nearest neighbors of length k */ + float wt[N_FEATURES]; /* the feature weight vector */ + int normalize; /* flag for normalization */ + int learn_mode; /* flag for learn (i.e. add) mode */ + int learn_symbol_id; /* the symbol id to add if in learn mode */ +} t_knn; + +static void *knn_new(t_floatarg f); +static int find_nn(t_knn * x, FEATURE * unknown, FEATURE * database, + int size, float *weights, int k); +static NN *k_nn_new(int k); +static int majority(t_knn * x); +static float k_nn(t_knn * x, int candidate, float dist); +static float calc_dist(FEATURE * unknown, FEATURE * known, float *weights, + float min_dist); +static void get_timbre_features(t_knn * x, char *fname); +static void normalize_database(t_knn * x, FEATURE * Features, int size); +static void normalize(t_knn * x, FEATURE * f); +static void add_feature(t_knn * x, float *features, int id); + +static void *knn_new(t_floatarg f) +{ + int i; + t_knn *x = (t_knn *) pd_new(knn_class); + x->out = outlet_new(&x->x_obj, &s_float); + x->loo = outlet_new(&x->x_obj, gensym("list")); + + /* create the NN for the correct size of k */ + if (f == 0) + x->k = 1; /* default */ + else + x->k = (int) f; + x->knn = k_nn_new(x->k); + + /* create space for the unknown feature */ + x->unknown.feature = (float *) calloc(sizeof(float), N_FEATURES); + + x->db_size = 0; + x->feature_db = NULL; + x->normalize = FALSE; + x->learn_mode = FALSE; + + for (i = 0; i < N_FEATURES; i++) { + x->wt[i] = 1; + x->mean[i] = 0; + x->stdev[i] = 1; + } + return (x); +} + +static void knn_free(t_knn * x) +{ + free(x->knn); + free(x->feature_db); +} + +static void knn_list(t_knn * x, t_symbol * s, int argc, t_atom * argv) +{ + int i; + int answer; + int id; + int add; + t_atom *a; + float f[N_FEATURES]; // Is this still used? 00/12/04 IF + + /* read in the features from the PD list */ + for (i = 0, a = argv; i < argc; i++, a++) { + if (a->a_type == A_FLOAT) + f[i] = x->unknown.feature[i] = a->a_w.w_float; + else { + f[i] = x->unknown.feature[i] = 0; + post("KNN: error - wrong type for list elem %d %d", i, + a->a_w.w_float); + if (isinf(x->unknown.feature[i])) + f[i] = x->unknown.feature[i] = 0; + } + } + + if (x->learn_mode == TRUE) { + add_feature(x, x->unknown.feature, x->learn_symbol_id); + } else if (x->feature_db != NULL) { + post("Looking for answer"); + if (x->normalize == TRUE) + normalize(x, &x->unknown); + answer = + find_nn(x, &x->unknown, x->feature_db, x->db_size, x->wt, 1); +post("ANSWER: %d", answer); + outlet_float(x->out, answer); + } else + post("No database loaded!"); +} + +static void add_feature(t_knn * x, float *features, int id) +{ + int i; + + if (x->feature_db == NULL) + x->feature_db = (FEATURE *) calloc(sizeof(FEATURE), 1); + else + x->feature_db = (FEATURE *) realloc(x->feature_db, sizeof(FEATURE) * + (x->db_size + 1)); + assert(x->feature_db != NULL); + + x->feature_db[x->db_size].feature = + (float *) calloc(sizeof(float), N_FEATURES); + x->feature_db[x->db_size].symbol_id = id; + for (i = 0; i < N_FEATURES; i++) + x->feature_db[x->db_size].feature[i] = features[i]; + x->db_size++; + if (x->learn_mode == TRUE) + post("Added entry for instrument %d - db now has %d entries.", + id, x->db_size); +} + +static void knn_loo(t_knn * x, float f) +{ + int i; + t_atom at[N_FEATURES]; + + if ((int) f >= 0 && (int) f <= x->db_size - 1) { + for (i = 0; i < N_FEATURES; i++) { + SETFLOAT(&at[i], x->feature_db[(int) f].feature[i]); + } + outlet_list(x->loo, 0, N_FEATURES, at); + outlet_float(x->out, x->feature_db[(int) f].symbol_id); + + post("KNN: output instrument %d", x->feature_db[(int) f].symbol_id); + } else + post("Index out of range"); +} + +static void knn_set_normal(t_knn * x, float f) +{ + if ((int) f == FALSE) + x->normalize = FALSE; + else if ((int) f == TRUE) + x->normalize = TRUE; + post("set normalize %d", x->normalize); +} + +static void knn_set_learn(t_knn * x, float mode, float symbol) +{ + if ((int) mode == TRUE) { + x->learn_mode = TRUE; + x->learn_symbol_id = (int) symbol; + post("Now in learn mode for instrument %d", (int) symbol); + } else { + x->learn_mode = FALSE; + post("Learn mode deactivated"); + } +} + +static void knn_free_db(t_knn * x) +{ + int i; + for (i = 0; i < x->db_size; i++) { + free(x->feature_db[i].feature); + } + free(x->feature_db); + x->db_size = 0; + x->feature_db = NULL; + post("Database cleared"); +} + +static void knn_save(t_knn * x, t_symbol * s) +{ + FILE *fp; + int i, j; + + fp = fopen(s->s_name, "w"); + if (fp == NULL) { + post("Error saving file %s", strerror(errno)); + return; + } + + for (i = 0; i < x->db_size; i++) { + fprintf(fp, "%i", (int) x->feature_db[i].symbol_id); + + for (j = 0; j < N_FEATURES; j++) { + fprintf(fp, " %g", x->feature_db[i].feature[j]); + } + fprintf(fp, "\n"); + } + fclose(fp); + post("File saved to %s", s->s_name); + +} + +static void knn_read(t_knn * x, t_symbol * s) +{ + if (x->feature_db != NULL) + knn_free_db(x); + get_timbre_features(x, s->s_name); +} + +static void knn_read_wt(t_knn * x, t_symbol * s) +{ + FILE *fp; + int ret, count = 0; + + fp = fopen(s->s_name, "r"); + if (fp == NULL) { + post("Error reading weights %s", strerror(errno)); + return; + } + printf("Reading weights from %s . . . ", s->s_name); + while (1) { + ret = fscanf(fp, "%g", &x->wt[count]); + if (ret != 1) + break; + count++; + if (count > N_FEATURES) { + post("too many weights!"); + return; + } + } + fclose(fp); /* JB-070505 - close the file handle */ + printf("done\n"); +} + +void knn_setup(void) +{ + knn_class = class_new(gensym("knn"), (t_newmethod) knn_new, + (t_method) knn_free, sizeof(t_knn), 0, A_DEFFLOAT, + 0); + class_addmethod(knn_class, (t_method) knn_loo, gensym("loo"), A_FLOAT, + 0); + class_addmethod(knn_class, (t_method) knn_set_normal, gensym("normal"), + A_FLOAT, 0); + class_addmethod(knn_class, (t_method) knn_set_learn, gensym("learn"), + A_FLOAT, A_DEFFLOAT, 0); + class_addmethod(knn_class, (t_method) knn_save, gensym("save"), + A_SYMBOL, 0); + class_addmethod(knn_class, (t_method) knn_read, gensym("read"), + A_SYMBOL, 0); + class_addmethod(knn_class, (t_method) knn_free_db, gensym("clear"), 0); + class_addmethod(knn_class, (t_method) knn_read_wt, + gensym("readweights"), A_SYMBOL, 0); + class_addlist(knn_class, knn_list); +} + +static int find_nn(t_knn * x, FEATURE * unknown, FEATURE * database, + int size, float *weights, int k) +{ + int i, min = 1; + float dist = 0, min_dist = 9e100; // A BIG number + + for (i = 0; i < x->k; i++) { + x->knn[i].index = 0; + x->knn[i].dist = 9e10; + } + + for (i = 0; i < x->db_size; i++) { + + dist = calc_dist(unknown, &database[i], weights, min_dist); + if (dist < min_dist) { + min_dist = dist; + min = i; + min_dist = k_nn(x, min, min_dist); + } + } + + min = majority(x); + + return min; +} + +static NN *k_nn_new(int k) +{ + int i; + NN *nn; + + nn = (NN *) malloc(sizeof(NN) * k); + assert(nn != NULL); + for (i = 0; i < k; i++) { + nn[i].index = -1; + nn[i].dist = FLT_MAX; + } + return (nn); +} + + +static int majority(t_knn * x) +{ +/* returns class number. NB: no tie breaker */ + int i, max_i = 0, max = 0; + int classes[MAX_N_CLASSES]; + + for (i = 0; i < MAX_N_CLASSES; i++) + classes[i] = 0; + + for (i = 0; i < x->k; i++) + classes[x->feature_db[x->knn[i].index].symbol_id] += 1; + + for (i = 0; i < MAX_N_CLASSES; i++) { + if (classes[i] > max) { + max = classes[i]; + max_i = i; + } + } + return (max_i); +} + +static float k_nn(t_knn * x, int candidate, float dist) +{ + int i, insert; + + for (i = 0; i < x->k; i++) { + if (dist < x->knn[i].dist) + break; + } + if (i < x->k) { + insert = i; + + for (i = x->k - 1; i > insert; i--) + x->knn[i] = x->knn[i - 1]; + + x->knn[insert].index = candidate; + x->knn[insert].dist = dist; + } + return (x->knn[x->k - 1].dist); +} + +static float calc_dist(FEATURE * unknown, FEATURE * known, float *weights, + float min_dist) +{ + float dist = 0; + int i; + + for (i = 0; i < N_FEATURES && dist < min_dist; i++) { + /* Euclidean w/o the sqrt */ + dist += (weights[i]) * + (unknown->feature[i] - known->feature[i]) * + (unknown->feature[i] - known->feature[i]); + + } + return ((float) dist); +} + +static void normalize_database(t_knn * x, FEATURE * Features, int size) +{ + + int i, k; + float sum, sum2; + + for (k = 0; k < N_FEATURES; k++) { + sum = 0; + sum2 = 0; + for (i = 0; i < size; i++) { + sum += Features[i].feature[k]; + sum2 += Features[i].feature[k] * Features[i].feature[k]; + } + x->mean[k] = sum / size; + x->stdev[k] = sqrt((size * sum2 - sum * sum) / (size * (size - 1))); + + if (x->stdev[k] < 0.00001) + x->stdev[k] = 0.00001; + if (x->normalize == TRUE) { + for (i = 0; i < size; i++) + Features[i].feature[k] = + (Features[i].feature[k] - x->mean[k]) / x->stdev[k]; + } + } +} + +static void normalize(t_knn * x, FEATURE * f) +{ + int i; + + for (i = 0; i < N_FEATURES; i++) + f->feature[i] = (f->feature[i] - x->mean[i]) / x->stdev[i]; +} + + +void get_timbre_features(t_knn * x, char *fname) +{ + FILE *fp; + int i, j, ret, instr = 0; + float val; + static char last_name[20], name[20]; + float features[N_FEATURES]; + int id = 0; + int lastpitch = 0; + + printf("Reading %s . . . ", fname); + + fp = fopen(fname, "r"); + if (fp == NULL) { + post("\nError opening file - %s", strerror(errno)); + return; + } + while (1) { + ret = fscanf(fp, "%d", &instr); + + if (ret != 1) + break; + + for (i = 0; i < N_FEATURES; i++) { + fscanf(fp, "%g ", &features[i]); + if (isinf(features[i])) + features[i] = 0.0; + } + + add_feature(x, features, instr); + } + printf("done.\nDatabase contains %d entries.\n", x->db_size); + fclose(fp); + normalize_database(x, x->feature_db, x->db_size); +} Added: trunk/externals/postlude/knn/makefile =================================================================== --- trunk/externals/postlude/knn/makefile (rev 0) +++ trunk/externals/postlude/knn/makefile 2008-02-16 11:22:24 UTC (rev 9446) @@ -0,0 +1,77 @@ +NAME=knn +CSYM=knn + +current: pd_linux + +# ----------------------- NT ----------------------- + +pd_nt: $(NAME).dll + +.SUFFIXES: .dll + +PDNTCFLAGS = /W3 /WX /DNT /DPD /nologo +VC="C:\Program Files\Microsoft Visual Studio\Vc98" + +PDNTINCLUDE = /I. /I\tcl\include /I\ftp\pd\src /I$(VC)\include + +PDNTLDIR = $(VC)\lib +PDNTLIB = $(PDNTLDIR)\libc.lib \ + $(PDNTLDIR)\oldnames.lib \ + $(PDNTLDIR)\kernel32.lib \ + \ftp\pd\bin\pd.lib + +.c.dll: + cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c $*.c + link /dll /export:$(CSYM)_setup $*.obj $(PDNTLIB) + +# ----------------------- IRIX 5.x ----------------------- + +pd_irix5: $(NAME).pd_irix5 + +.SUFFIXES: .pd_irix5 + +SGICFLAGS5 = -o32 -DPD -DUNIX -DIRIX -O2 + +SGIINCLUDE = -I../../src + +.c.pd_irix5: + cc $(SGICFLAGS5) $(SGIINCLUDE) -o $*.o -c $*.c + ld -elf -shared -rdata_shared -o $*.pd_irix5 $*.o + rm $*.o + +# ----------------------- IRIX 6.x ----------------------- + +pd_irix6: $(NAME).pd_irix6 + +.SUFFIXES: .pd_irix6 + +SGICFLAGS6 = -n32 -DPD -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \ + -OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \ + -Ofast=ip32 + +.c.pd_irix6: + cc $(SGICFLAGS6) $(SGIINCLUDE) -o $*.o -c $*.c + ld -n32 -shared -rdata_shared -o $*.pd_irix6 $*.o + rm $*.o + +# ----------------------- LINUX i386 ----------------------- + +pd_linux: $(NAME).pd_linux + +.SUFFIXES: .pd_linux + +LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer \ + -Wall -W -Wshadow -Wstrict-prototypes \ + -Wno-unused -Wno-parentheses -Wno-switch + +LINUXINCLUDE = -I/usr/lib/pd/include/ + +.c.pd_linux: + cc $(LINUXCFLAGS) $(LINUXINCLUDE) -g -o $*.o -c $*.c + ld -export_dynamic -shared -o $*.pd_linux $*.o -lc -lm + strip --strip-unneeded $*.pd_linux + rm $*.o + cp $*.pd_linux ../. + +clean: + rm -f *.o *.pd_* so_locations This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9445] trunk/scripts
by eighthave＠users.sourceforge.net 15 Feb '08

15 Feb '08

Revision: 9445 http://pure-data.svn.sourceforge.net/pure-data/?rev=9445&view=rev Author: eighthave Date: 2008-02-14 15:50:37 -0800 (Thu, 14 Feb 2008) Log Message: ----------- update scripts to work with new pure-data SVN scripts. Gem and GemLibs are still using CVS. Modified Paths: -------------- trunk/scripts/checkout-developer-layout.sh trunk/scripts/update-developer-layout.sh Modified: trunk/scripts/checkout-developer-layout.sh =================================================================== --- trunk/scripts/checkout-developer-layout.sh 2008-02-14 23:28:28 UTC (rev 9444) +++ trunk/scripts/checkout-developer-layout.sh 2008-02-14 23:50:37 UTC (rev 9445) @@ -19,31 +19,23 @@ exit } +URL="https://pure-data.svn.sourceforge.net/svnroot/pure-data/trunk/" + if [ $# -eq 0 ]; then - export CVSROOT=":pserver:anonymous@pure-data.cvs.sourceforge.net:/cvsroot/pure-data" - echo "Checking out anonymously. Give your SourceForge ID as an argument otherwise." - echo "The anonymous password is: anoncvs" - cvs login + echo "Checking out anonymously. Give your SourceForge ID if you don't want that." + svn checkout $URL pure-data elif [ "$1" == "--help" ]; then print_usage elif [ "$1" == "-h" ]; then print_usage elif [ $# -eq 1 ]; then - export CVSROOT=":ext:${1}@pure-data.cvs.sourceforge.net:/cvsroot/pure-data" + svn checkout --username $1 $URL pure-data else print_usage fi -mkdir pure-data cd pure-data -for section in abstractions doc extensions externals packages scripts; do - cvs checkout $section -done - -# For Pd-extended, "pd" needs to be a specific version currently, not HEAD -cvs checkout -r stable_0_40 pd - # Gem is still separate echo -e "\n\n The password to the Gem anonymous CVS access is blank, so just press Enter\n" export CVSROOT=:pserver:anonymous@cvs.gem.iem.at:/cvsroot/pd-gem Modified: trunk/scripts/update-developer-layout.sh =================================================================== --- trunk/scripts/update-developer-layout.sh 2008-02-14 23:28:28 UTC (rev 9444) +++ trunk/scripts/update-developer-layout.sh 2008-02-14 23:50:37 UTC (rev 9445) @@ -13,8 +13,10 @@ cvs_root_dir=`echo $0 | sed 's|$.*$/.*$|\1|'`/.. cd $cvs_root_dir - -for section in abstractions doc extensions externals packages pd scripts Gem GemLibs; do +echo "Running svn update:" +svn update +echo "Running cvs update:" +for section in Gem GemLibs; do echo "$section" cd $section cvs up -Pd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9444] trunk/scripts/load_every_help.sh
by eighthave＠users.sourceforge.net 15 Feb '08

15 Feb '08

Revision: 9444 http://pure-data.svn.sourceforge.net/pure-data/?rev=9444&view=rev Author: eighthave Date: 2008-02-14 15:28:28 -0800 (Thu, 14 Feb 2008) Log Message: ----------- A couple of minor tweaks from a long time ago Modified Paths: -------------- trunk/scripts/load_every_help.sh Modified: trunk/scripts/load_every_help.sh =================================================================== --- trunk/scripts/load_every_help.sh 2008-02-14 23:16:41 UTC (rev 9443) +++ trunk/scripts/load_every_help.sh 2008-02-14 23:28:28 UTC (rev 9444) @@ -10,7 +10,7 @@ make_netreceive_patch () { - rm $1 + test -f $1 && rm $1 touch $1 echo '#N canvas 222 130 454 304 10;' >> $1 echo "#X obj 111 83 netreceive $PORT_NUMBER 0 old;" >> $1 @@ -18,14 +18,16 @@ open_patch () { + echo "^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" >> $LOG_FILE echo "OPENING: $1 $2" >> $LOG_FILE echo "; pd open $1 $2;" | ${bindir}/pdsend $PORT_NUMBER localhost tcp } close_patch () { - echo "CLOSING: $1" >> $LOG_FILE +# echo "CLOSING: $1" >> $LOG_FILE echo "; pd-$1 menuclose;" | ${bindir}/pdsend $PORT_NUMBER localhost tcp + echo "________________________________________________________________________________" >> $LOG_FILE } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9443] trunk/scripts/auto-build/pure-data-rsync
by eighthave＠users.sourceforge.net 15 Feb '08

15 Feb '08

Revision: 9443 http://pure-data.svn.sourceforge.net/pure-data/?rev=9443&view=rev Author: eighthave Date: 2008-02-14 15:16:41 -0800 (Thu, 14 Feb 2008) Log Message: ----------- updated to rsync the new pure-data SVN repository Modified Paths: -------------- trunk/scripts/auto-build/pure-data-rsync Modified: trunk/scripts/auto-build/pure-data-rsync =================================================================== --- trunk/scripts/auto-build/pure-data-rsync 2008-02-14 23:15:34 UTC (rev 9442) +++ trunk/scripts/auto-build/pure-data-rsync 2008-02-14 23:16:41 UTC (rev 9443) @@ -17,7 +17,7 @@ echo "rsync pure-data" >> $LOGFILE 2>&1 echo "----------------------------------------------------------------------" >> $LOGFILE 2>&1 -(/usr/bin/rsync -ax $VERBOSE_FLAGS --delete rsync://pure-data.cvs.sourceforge.net/cvsroot/p/pu/pure-data/ /home/pd/cvsroot/pure-data/ || /usr/bin/logger -i -p local6.warning -t "$0" "rsync pure-data CVS FAILED") >> $LOGFILE 2>&1 +(/usr/bin/rsync -ax $VERBOSE_FLAGS --delete pure-data.svn.sourceforge.net::svn/pure-data/ /home/pd/svnroot/pure-data/ || /usr/bin/logger -i -p local6.warning -t "$0" "rsync pure-data SVN FAILED") >> $LOGFILE 2>&1 echo "rsync pd-gem" >> $LOGFILE 2>&1 echo "----------------------------------------------------------------------" >> $LOGFILE 2>&1 @@ -27,4 +27,8 @@ echo "----------------------------------------------------------------------" >> $LOGFILE 2>&1 chown -R pd.pd /home/pd/cvsroot >> $LOGFILE 2>&1 +echo "chown -R pd.pd /home/pd/svnroot" >> $LOGFILE 2>&1 +echo "----------------------------------------------------------------------" >> $LOGFILE 2>&1 +chown -R pd.pd /home/pd/svnroot >> $LOGFILE 2>&1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9442] trunk/scripts/auto-build
by eighthave＠users.sourceforge.net 15 Feb '08

15 Feb '08

Revision: 9442 http://pure-data.svn.sourceforge.net/pure-data/?rev=9442&view=rev Author: eighthave Date: 2008-02-14 15:15:34 -0800 (Thu, 14 Feb 2008) Log Message: ----------- renamed files since they also work with SVN in addition to CVS Added Paths: ----------- trunk/scripts/auto-build/pure-data-rsync trunk/scripts/auto-build/pure-data-rsync-checkout Removed Paths: ------------- trunk/scripts/auto-build/pure-data-cvs-rsync trunk/scripts/auto-build/pure-data-cvs-rsync-checkout Deleted: trunk/scripts/auto-build/pure-data-cvs-rsync =================================================================== --- trunk/scripts/auto-build/pure-data-cvs-rsync 2008-02-14 21:35:48 UTC (rev 9441) +++ trunk/scripts/auto-build/pure-data-cvs-rsync 2008-02-14 23:15:34 UTC (rev 9442) @@ -1,30 +0,0 @@ -#!/bin/sh -# rsync the CVS source files from SourceForge to make a local copy - -# the source dir where this script is -SCRIPT_DIR=`echo $0 | sed 's|$.*$/.*$|\1|'` -. $SCRIPT_DIR/auto-build-common - -# the name of this script -SCRIPT=`echo $0| sed 's|.*/$.*$|\1|g'` - -LOGFILE=/home/pd/logs/${DATE}_${TIME}_-_${SCRIPT}_-_${SYSTEM}.txt - -VERBOSE_FLAGS=-v -#VERBOSE_FLAGS="-v --progress" - -touch $LOGFILE - -echo "rsync pure-data" >> $LOGFILE 2>&1 -echo "----------------------------------------------------------------------" >> $LOGFILE 2>&1 -(/usr/bin/rsync -ax $VERBOSE_FLAGS --delete rsync://pure-data.cvs.sourceforge.net/cvsroot/p/pu/pure-data/ /home/pd/cvsroot/pure-data/ || /usr/bin/logger -i -p local6.warning -t "$0" "rsync pure-data CVS FAILED") >> $LOGFILE 2>&1 - -echo "rsync pd-gem" >> $LOGFILE 2>&1 -echo "----------------------------------------------------------------------" >> $LOGFILE 2>&1 -(/usr/bin/rsync -ax $VERBOSE_FLAGS --delete rsync://pd-gem.cvs.sourceforge.net/cvsroot/p/pd/pd-gem/ /home/pd/cvsroot/pd-gem || /usr/bin/logger -i -p local6.warning -t "$0" "rsync pd-gem CVS FAILED") >> $LOGFILE 2>&1 - -echo "chown -R pd.pd /home/pd/cvsroot" >> $LOGFILE 2>&1 -echo "----------------------------------------------------------------------" >> $LOGFILE 2>&1 -chown -R pd.pd /home/pd/cvsroot >> $LOGFILE 2>&1 - - Deleted: trunk/scripts/auto-build/pure-data-cvs-rsync-checkout =================================================================== --- trunk/scripts/auto-build/pure-data-cvs-rsync-checkout 2008-02-14 21:35:48 UTC (rev 9441) +++ trunk/scripts/auto-build/pure-data-cvs-rsync-checkout 2008-02-14 23:15:34 UTC (rev 9442) @@ -1,31 +0,0 @@ -#!/bin/sh -# update from the local CVS repository - -# the source dir where this script is -SCRIPT_DIR=`echo $0 | sed 's|$.*$/.*$|\1|'` -. $SCRIPT_DIR/auto-build-common - -# the name of this script -SCRIPT=`echo $0| sed 's|.*/$.*$|\1|g'` -LOGFILE=/home/pd/logs/${DATE}_${TIME}_-_${SCRIPT}_-_${SYSTEM}.txt - -update_distro () -{ - distro=$1 - echo "------------------------------------------------------------" >> $LOGFILE 2>&1 - echo "$distro" >> $LOGFILE 2>&1 - echo "------------------------------------------------------------" >> $LOGFILE 2>&1 - /home/pd/rsync/$distro/scripts/update-developer-layout.sh >> $LOGFILE 2>&1 -} - -touch $LOGFILE - -for dir in /home/pd/rsync/*; do - dirname=`echo $dir | sed 's|.*/$.*$|\1|'` - test -e $dir/scripts/update-developer-layout.sh && \ - update_distro $dirname -done - -# since the above test can cause this script to exit with an error, force it -# to be happy to prevent getting automated error emails to root -true Copied: trunk/scripts/auto-build/pure-data-rsync (from rev 9441, trunk/scripts/auto-build/pure-data-cvs-rsync) =================================================================== --- trunk/scripts/auto-build/pure-data-rsync (rev 0) +++ trunk/scripts/auto-build/pure-data-rsync 2008-02-14 23:15:34 UTC (rev 9442) @@ -0,0 +1,30 @@ +#!/bin/sh +# rsync the CVS source files from SourceForge to make a local copy + +# the source dir where this script is +SCRIPT_DIR=`echo $0 | sed 's|$.*$/.*$|\1|'` +. $SCRIPT_DIR/auto-build-common + +# the name of this script +SCRIPT=`echo $0| sed 's|.*/$.*$|\1|g'` + +LOGFILE=/home/pd/logs/${DATE}_${TIME}_-_${SCRIPT}_-_${SYSTEM}.txt + +VERBOSE_FLAGS=-v +#VERBOSE_FLAGS="-v --progress" + +touch $LOGFILE + +echo "rsync pure-data" >> $LOGFILE 2>&1 +echo "----------------------------------------------------------------------" >> $LOGFILE 2>&1 +(/usr/bin/rsync -ax $VERBOSE_FLAGS --delete rsync://pure-data.cvs.sourceforge.net/cvsroot/p/pu/pure-data/ /home/pd/cvsroot/pure-data/ || /usr/bin/logger -i -p local6.warning -t "$0" "rsync pure-data CVS FAILED") >> $LOGFILE 2>&1 + +echo "rsync pd-gem" >> $LOGFILE 2>&1 +echo "----------------------------------------------------------------------" >> $LOGFILE 2>&1 +(/usr/bin/rsync -ax $VERBOSE_FLAGS --delete rsync://pd-gem.cvs.sourceforge.net/cvsroot/p/pd/pd-gem/ /home/pd/cvsroot/pd-gem || /usr/bin/logger -i -p local6.warning -t "$0" "rsync pd-gem CVS FAILED") >> $LOGFILE 2>&1 + +echo "chown -R pd.pd /home/pd/cvsroot" >> $LOGFILE 2>&1 +echo "----------------------------------------------------------------------" >> $LOGFILE 2>&1 +chown -R pd.pd /home/pd/cvsroot >> $LOGFILE 2>&1 + + Copied: trunk/scripts/auto-build/pure-data-rsync-checkout (from rev 9440, trunk/scripts/auto-build/pure-data-cvs-rsync-checkout) =================================================================== --- trunk/scripts/auto-build/pure-data-rsync-checkout (rev 0) +++ trunk/scripts/auto-build/pure-data-rsync-checkout 2008-02-14 23:15:34 UTC (rev 9442) @@ -0,0 +1,31 @@ +#!/bin/sh +# update from the local CVS repository + +# the source dir where this script is +SCRIPT_DIR=`echo $0 | sed 's|$.*$/.*$|\1|'` +. $SCRIPT_DIR/auto-build-common + +# the name of this script +SCRIPT=`echo $0| sed 's|.*/$.*$|\1|g'` +LOGFILE=/home/pd/logs/${DATE}_${TIME}_-_${SCRIPT}_-_${SYSTEM}.txt + +update_distro () +{ + distro=$1 + echo "------------------------------------------------------------" >> $LOGFILE 2>&1 + echo "$distro" >> $LOGFILE 2>&1 + echo "------------------------------------------------------------" >> $LOGFILE 2>&1 + /home/pd/rsync/$distro/scripts/update-developer-layout.sh >> $LOGFILE 2>&1 +} + +touch $LOGFILE + +for dir in /home/pd/rsync/*; do + dirname=`echo $dir | sed 's|.*/$.*$|\1|'` + test -e $dir/scripts/update-developer-layout.sh && \ + update_distro $dirname +done + +# since the above test can cause this script to exit with an error, force it +# to be happy to prevent getting automated error emails to root +true This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9441] trunk/abstractions
by eighthave＠users.sourceforge.net 14 Feb '08

14 Feb '08

Revision: 9441 http://pure-data.svn.sourceforge.net/pure-data/?rev=9441&view=rev Author: eighthave Date: 2008-02-14 13:35:48 -0800 (Thu, 14 Feb 2008) Log Message: ----------- Removed ancient cruft leftover from defunct Mac OS X packages. (first svn committ for me, woo hooo!) Removed Paths: ------------- trunk/abstractions/TODO trunk/abstractions/Welcome.html trunk/abstractions/pd-abstractions.info Deleted: trunk/abstractions/TODO =================================================================== --- trunk/abstractions/TODO 2008-02-14 02:13:29 UTC (rev 9440) +++ trunk/abstractions/TODO 2008-02-14 21:35:48 UTC (rev 9441) @@ -1,6 +0,0 @@ - -- fix up Makefile to use auto _install and _clean target generation, like in - externals/Makefile - -- make a library for bw limited oscs written in Pd - Deleted: trunk/abstractions/Welcome.html =================================================================== --- trunk/abstractions/Welcome.html 2008-02-14 02:13:29 UTC (rev 9440) +++ trunk/abstractions/Welcome.html 2008-02-14 21:35:48 UTC (rev 9441) @@ -1,11 +0,0 @@ -<HTML> -<BODY> - -<H2>Abstractions from CVS</H2> - -<P> -This is a collection of a number of abtractions from a couple different authors. -</P> - -</BODY> -</HTML> \ No newline at end of file Deleted: trunk/abstractions/pd-abstractions.info =================================================================== --- trunk/abstractions/pd-abstractions.info 2008-02-14 02:13:29 UTC (rev 9440) +++ trunk/abstractions/pd-abstractions.info 2008-02-14 21:35:48 UTC (rev 9441) @@ -1,16 +0,0 @@ -Title Pure Data Abstractions -Version MSP standard paths -Description A collection of patches from the SourceForge CVS. -DefaultLocation /usr/local/lib/pd/doc/ -DeleteWarning Say Bye Bye! - -### Package Flags - -NeedsAuthorization YES -Required NO -Relocatable YES -RequiresReboot NO -UseUserMask YES -OverwritePermissions NO -InstallFat NO -RootVolumeOnly NO This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9440] trunk/desiredata/src/poe.tcl
by matju＠users.sourceforge.net 14 Feb '08

14 Feb '08

Revision: 9440 http://pure-data.svn.sourceforge.net/pure-data/?rev=9440&view=rev Author: matju Date: 2008-02-13 18:13:29 -0800 (Wed, 13 Feb 2008) Log Message: ----------- speedup for recent Tcl 8.5 that doesn't have {expand} anymore Modified Paths: -------------- trunk/desiredata/src/poe.tcl Modified: trunk/desiredata/src/poe.tcl =================================================================== --- trunk/desiredata/src/poe.tcl 2008-02-13 23:59:11 UTC (rev 9439) +++ trunk/desiredata/src/poe.tcl 2008-02-14 02:13:29 UTC (rev 9440) @@ -2,7 +2,7 @@ #----------------------------------------------------------------# # POETCL # -# Copyright (c) 2005,2006 by Mathieu Bouchard +# Copyright (c) 2005,2006,2007,2008 by Mathieu Bouchard # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -133,7 +133,7 @@ set dispatch { set i 0; set class $::_($self:_class) if {[catch {set methods $::__($class:$selector)}]} {set methods [cache_method $class $selector]} - eval [concat [list [lindex $methods 0] $self] $args] + [lindex $methods 0] $self {*}$args } } proc setup_dispatcher {self} { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9439] trunk/desiredata/src
by matju＠users.sourceforge.net 14 Feb '08

14 Feb '08

Revision: 9439 http://pure-data.svn.sourceforge.net/pure-data/?rev=9439&view=rev Author: matju Date: 2008-02-13 15:59:11 -0800 (Wed, 13 Feb 2008) Log Message: ----------- require Tcl/Tk 8.5 Modified Paths: -------------- trunk/desiredata/src/desire.tk trunk/desiredata/src/poe.tcl Removed Paths: ------------- trunk/desiredata/src/pre8.5.tcl Modified: trunk/desiredata/src/desire.tk =================================================================== --- trunk/desiredata/src/desire.tk 2008-02-13 21:44:17 UTC (rev 9438) +++ trunk/desiredata/src/desire.tk 2008-02-13 23:59:11 UTC (rev 9439) @@ -32,6 +32,8 @@ set debug 0 ;# DON'T TOUCH THIS, make yourself a debug.tcl instead! +if {$tcl_version < 8.5} {puts "Please upgrade to Tcl/Tk 8.5... Thank You.\n(your version is $tcl_version)"; exit 84} + if {[catch {winfo children .}]} {set tk 0} {set tk 1} set argh0 [file normalize [file join [pwd] $argv0]] Modified: trunk/desiredata/src/poe.tcl =================================================================== --- trunk/desiredata/src/poe.tcl 2008-02-13 21:44:17 UTC (rev 9438) +++ trunk/desiredata/src/poe.tcl 2008-02-13 23:59:11 UTC (rev 9439) @@ -31,7 +31,6 @@ package provide poe 0.1 -if {$tcl_version < 8.5} {package require pre8.5} set nextid 0 set _(Class:_class) Class set _(Class:_super) {Thing} Deleted: trunk/desiredata/src/pre8.5.tcl =================================================================== --- trunk/desiredata/src/pre8.5.tcl 2008-02-13 21:44:17 UTC (rev 9438) +++ trunk/desiredata/src/pre8.5.tcl 2008-02-13 23:59:11 UTC (rev 9439) @@ -1,209 +0,0 @@ -package provide pre8.5 8.4 - -proc lremove {args} { - array set opts {-all 0 pattern -exact} - while {[string match -* [lindex $args 0]]} { - switch -glob -- [lindex $args 0] { - -a* { set opts(-all) 1 } - -g* { set opts(pattern) -glob } - -r* { set opts(pattern) -regexp } - -- { set args [lreplace $args 0 0]; break } - default {return -code error "unknown option \"[lindex $args 0]\""} - } - set args [lreplace $args 0 0] - } - set l [lindex $args 0] - foreach i [join [lreplace $args 0 0]] { - if {[set ix [lsearch $opts(pattern) $l $i]] == -1} continue - set l [lreplace $l $ix $ix] - if {$opts(-all)} { - while {[set ix [lsearch $opts(pattern) $l $i]] != -1} { - set l [lreplace $l $ix $ix] - } - } - } - return $l -} -if {![llength [info commands dict]]} { - proc lassign {list args} { - foreach elem $list varName $args { - upvar 1 $varName var - set var $elem - } - } - proc dict {cmd args} { - uplevel 1 [linsert $args 0 _dict_$cmd] - } - proc _dict_get {dv args} { - if {![llength $args]} {return $dv} else { - array set dvx $dv - set key [lindex $args 0] - set dv $dvx($key) - set args [lrange $args 1 end] - return [eval [linsert $args 0 _dict_get $dv]] - } - } - proc _dict_exists {dv key args} { - array set dvx $dv - set r [info exists dvx($key)] - if {!$r} {return 0} - if {[llength $args]} { - return [eval [linsert $args 0 _dict_exists $dvx($key) ]] - } else {return 1} - } - proc _dict_set {dvar key value args } { - upvar 1 $dvar dv - if {![info exists dv]} {set dv [list]} - array set dvx $dv - if {![llength $args]} { - set dvx($key) $value - } else { - eval [linsert $args 0 _dict_set dvx($key) $value] - } - set dv [array get dvx] - } - proc _dict_unset {dvar key args} { - upvar 1 $dvar mydvar - if {![info exists mydvar]} {return} - array set dv $mydvar - if {![llength $args]} { - if {[info exists dv($key)]} { - unset dv($key) - } - } else { - eval [linsert $args 0 _dict_unset dv($key) ] - } - set mydvar [array get dv] - return {} - } - proc _dict_keys {dv {pat *}} { - array set dvx $dv - return [array names dvx $pat] - } - proc _dict_append {dvar key {args}} { - upvar 1 $dvar dv - if {![info exists dv]} {set dv [list]} - array set dvx $dv - eval [linsert $args 0 append dvx($key) ] - set dv [array get dvx] - } - proc _dict_create {args} { - return $args - } - proc _dict_filter {dv ftype args} { - set r [list] - foreach {globpattern} $args {break} - foreach {varlist script} $args {break} - - switch $ftype { - key { - foreach {key value} $dv { - if {[string match $globpattern $key]} { - lappend r $key $value - } - } - } - value { - foreach {key value} $dv { - if {[string match $globpattern $value]} { - lappend r $key $value - } - } - } - script { - foreach {Pkey Pval} $varlist {break} - upvar 1 $Pkey key $Pval value - foreach {key value} $dv { - if {[uplevel 1 $script]} { - lappend r $key $value - } - } - } - default { - error "Wrong filter type" - } - } - return $r - } - proc _dict_for {kv dict body} { - uplevel 1 [list foreach $kv $dict $body] - } - proc _dict_incr {dvar key {incr 1}} { - upvar 1 $dvar dv - if {![info exists dv]} {set dv [list]} - array set dvx $dv - if {![info exists dvx($key)]} {set dvx($key) 0} - incr dvx($key) $incr - set dv [array get dvx] - } - proc _dict_info {dv} { - return "Dictionary is represented as plain list" - } - proc _dict_lappend {dvar key args} { - upvar 1 $dvar dv - if {![info exists dv]} {set dv [list]} - array set dvx $dv - eval [linsert $args 0 lappend dvx($key)] - set dv [array get dvx] - } - proc _dict_merge {args} { - foreach dv $args { - array set dvx $dv - } - array get dvx - } - proc _dict_replace {dv args} { - foreach {k v} $args { - _dict_set dv $k $v - } - return $dv - } - proc _dict_remove {dv args} { - foreach k $args { - _dict_unset dv $k - } - return $dv - } - proc _dict_size {dv} { - return [expr {[llength $dv]/2}] - } - proc _dict_values {dv {gp *}} { - set r [list] - foreach {k v} $dv { - if {[string match $gp $v]} { - lappend r $v - } - } - return $r - } - proc _dict_update {dvar args} { - set name [string map {: {} ( {} ) {}} $dvar] - upvar 1 $dvar dv - upvar 1 _my_dict_array$name local - - array set local $dv - foreach {k v} [lrange $args 0 end-1] { - if {[info exists local($k)]} { - if {![uplevel 1 [list info exists $v]]} { - uplevel 1 [list upvar 0 _my_dict_array${name}($k) $v] - } else { - uplevel 1 [list set $v $local($k)] - } - } - } - set code [catch {uplevel 1 [lindex $args end]} res] - - foreach {k v} [lrange $args 0 end-1] { - if {[uplevel 1 [list info exists $v]]} { - set local($k) [uplevel 1 [list set $v]] - } else { - unset -nocomplain local($k) - } - } - set dv [array get local] - unset local - - return -code $code $res - } - -} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9438] trunk/desiredata/src/locale
by matju＠users.sourceforge.net 13 Feb '08

13 Feb '08

Revision: 9438 http://pure-data.svn.sourceforge.net/pure-data/?rev=9438&view=rev Author: matju Date: 2008-02-13 13:44:17 -0800 (Wed, 13 Feb 2008) Log Message: ----------- . Modified Paths: -------------- trunk/desiredata/src/locale/brasiliano.tcl trunk/desiredata/src/locale/english.tcl Modified: trunk/desiredata/src/locale/brasiliano.tcl =================================================================== --- trunk/desiredata/src/locale/brasiliano.tcl 2008-02-13 21:43:37 UTC (rev 9437) +++ trunk/desiredata/src/locale/brasiliano.tcl 2008-02-13 21:44:17 UTC (rev 9438) @@ -1,7 +1,7 @@ #!/usr/bin/env tclsh # Portuguese translations for DesireData -# $Id: brasiliano.tcl,v 1.1.2.1 2007-10-05 23:15:45 matju Exp $ -# Author: chgp(a)riseup.net revision 0.4 +# $Id: brasiliano.tcl,v 1.1.2.1 2007/10/05 23:15:45 matju Exp $ +# Author: Carlos Paulino <chgp(a)riseup.net> revision 0.4 ### Menus Modified: trunk/desiredata/src/locale/english.tcl =================================================================== --- trunk/desiredata/src/locale/english.tcl 2008-02-13 21:43:37 UTC (rev 9437) +++ trunk/desiredata/src/locale/english.tcl 2008-02-13 21:44:17 UTC (rev 9438) @@ -1,6 +1,6 @@ #!/usr/bin/env tclsh # English translations for PureData -# $Id: english.tcl,v 1.1.2.34.2.22 2007-09-04 11:24:02 chunlee Exp $ +# $Id: english.tcl,v 1.1.2.34.2.22 2007/09/04 11:24:02 chunlee Exp $ ### Menus @@ -570,4 +570,4 @@ say keyboarddialogfont "virtual keyboard font" say keyboard_view "Virtual keyboard" say log_height "Log Height" - +say visual_diff "Visual diff" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs February 2008