Pd-cvs January 2007

pd-cvs@lists.iem.at

21 participants
539 discussions

pd/src desire.h,1.1.2.49.2.25,1.1.2.49.2.26
by Mathieu Bouchard 16 Jan '07

16 Jan '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14624 Modified Files: Tag: desiredata desire.h Log Message: added pd_free_zombie Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.49.2.25 retrieving revision 1.1.2.49.2.26 diff -C2 -d -r1.1.2.49.2.25 -r1.1.2.49.2.26 *** desire.h 4 Jan 2007 19:24:51 -0000 1.1.2.49.2.25 --- desire.h 15 Jan 2007 23:43:29 -0000 1.1.2.49.2.26 *************** *** 315,318 **** --- 315,319 ---- void class_set_extern_dir(t_symbol *s); void glob_update_class_info (t_pd *bogus, t_symbol *s, t_symbol *cb_recv, t_symbol *cb_sel); + void pd_free_zombie(t_pd *x); #if defined(_LANGUAGE_C_PLUS_PLUS) || defined(__cplusplus)

1 0

pd/src desire.c,1.1.2.217.2.130,1.1.2.217.2.131
by Mathieu Bouchard 16 Jan '07

16 Jan '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12280 Modified Files: Tag: desiredata desire.c Log Message: forbid making operation on zombie Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.130 retrieving revision 1.1.2.217.2.131 diff -C2 -d -r1.1.2.217.2.130 -r1.1.2.217.2.131 *** desire.c 15 Jan 2007 23:35:53 -0000 1.1.2.217.2.130 --- desire.c 15 Jan 2007 23:38:03 -0000 1.1.2.217.2.131 *************** *** 6059,6063 **** t_text *o; if (sscanf(s->name,"x%lx",(long*)&o)<1) {error("expected object-id"); return 0;} ! if (!hash_exists(object_table,o)) { error("%s target is not a currently valid pointer",s->name); return 0; --- 6059,6063 ---- t_text *o; if (sscanf(s->name,"x%lx",(long*)&o)<1) {error("expected object-id"); return 0;} ! if (!hash_exists(object_table,o) || !(long)hash_get(object_table,o)&1) { error("%s target is not a currently valid pointer",s->name); return 0;

1 0

pd/src desire.c,1.1.2.217.2.129,1.1.2.217.2.130
by Mathieu Bouchard 16 Jan '07

16 Jan '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11516 Modified Files: Tag: desiredata desire.c Log Message: pd_upload records that an object has been uploaded; skip zombies in object_table. Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.129 retrieving revision 1.1.2.217.2.130 diff -C2 -d -r1.1.2.217.2.129 -r1.1.2.217.2.130 *** desire.c 15 Jan 2007 23:11:04 -0000 1.1.2.217.2.129 --- desire.c 15 Jan 2007 23:35:53 -0000 1.1.2.217.2.130 *************** *** 6390,6394 **** } appendix_save(self,b); - binbuf_gettext(b,&s,&n); if (s[n-1]=='\n') n--; --- 6390,6393 ---- *************** *** 6423,6426 **** --- 6422,6428 ---- } } + if (hash_exists(object_table,self)) { + hash_set(object_table,self,(void *)((long)hash_get(object_table,self)|2)); /* has been uploaded */ + } else post("object_table is broken"); } *************** *** 7677,7685 **** t_symbol *s_inlet = gensym("inlet"); t_symbol *s___list = gensym("__list"); ! int inlets=0, lists=0; hashkey k; hashvalue v; post("object_table = {"); hash_foreach(k,v,object_table) { t_pd *x = (t_pd *)k; //post(" %p %ld %s",k,(long)v,x->_class->name->name); if (x->_class->name == s_inlet) {inlets++; continue;} --- 7679,7688 ---- t_symbol *s_inlet = gensym("inlet"); t_symbol *s___list = gensym("__list"); ! size_t inlets=0, lists=0, zombies=0; hashkey k; hashvalue v; post("object_table = {"); hash_foreach(k,v,object_table) { t_pd *x = (t_pd *)k; + if (!(long)v&1) {zombies++; continue;} /* skip zombies */ //post(" %p %ld %s",k,(long)v,x->_class->name->name); if (x->_class->name == s_inlet) {inlets++; continue;} *************** *** 7693,7698 **** } else post(" %p %ld (%dobs) %s",k,(long)v,nobs,x->_class->name->name); } ! post("} (%d non-omitted objects, plus %d [inlet], plus %d [__list])", ! hash_size(object_table)-inlets-lists,inlets,lists); } --- 7696,7701 ---- } else post(" %p %ld (%dobs) %s",k,(long)v,nobs,x->_class->name->name); } ! post("} (%ld non-omitted objects, plus %ld [inlet], plus %ld [__list], plus %ld zombies)", ! hash_size(object_table)-inlets-lists-zombies,inlets,lists,zombies); }

1 0

pd/src kernel.c,1.1.2.39,1.1.2.40
by Mathieu Bouchard 16 Jan '07

16 Jan '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2365 Modified Files: Tag: desiredata kernel.c Log Message: added pd_free_zombie Index: kernel.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/kernel.c,v retrieving revision 1.1.2.39 retrieving revision 1.1.2.40 diff -C2 -d -r1.1.2.39 -r1.1.2.40 *** kernel.c 10 Jan 2007 03:15:29 -0000 1.1.2.39 --- kernel.c 15 Jan 2007 23:12:01 -0000 1.1.2.40 *************** *** 125,129 **** self->i = 0; self->tab = (t_hashentry **)malloc(capa*sizeof(void*)); - // fprintf(stderr,"hash_set %d\n",capa); for (long i=0; i<capa; i++) self->tab[i]=0; return self; --- 125,128 ---- *************** *** 299,303 **** t_pd *x = (t_pd *)getbytes(c->size); x->_class = c; ! hash_set(object_table,x,(void*)0); if (c->gobj) ((t_gobj *)x)->g_adix = appendix_new((t_gobj *)x); if (c->patchable) { --- 298,302 ---- t_pd *x = (t_pd *)getbytes(c->size); x->_class = c; ! hash_set(object_table,x,(void*)1); if (c->gobj) ((t_gobj *)x)->g_adix = appendix_new((t_gobj *)x); if (c->patchable) { *************** *** 308,316 **** } void pd_free(t_pd *x) { t_class *c = x->_class; if (c->freemethod) ((t_gotfn)(c->freemethod))(x); - if (c->gobj) appendix_free((t_gobj *)x); - hash_delete(object_table,x); if (c->patchable) { t_object *y = (t_object *)x; --- 307,319 ---- } + extern "C" void pd_free_zombie(t_pd *x) { + t_class *c = x->_class; + if (c->gobj) appendix_free((t_gobj *)x); + if (c->size) free(x); + } + void pd_free(t_pd *x) { t_class *c = x->_class; if (c->freemethod) ((t_gotfn)(c->freemethod))(x); if (c->patchable) { t_object *y = (t_object *)x; *************** *** 319,323 **** if (y->ob_binbuf) binbuf_free(y->ob_binbuf); } ! if (c->size) free(x); } --- 322,327 ---- if (y->ob_binbuf) binbuf_free(y->ob_binbuf); } ! /* schedule for deletion if need to keep the allocation around */ ! if (c->gobj && 0 /*is in the client*/) hash_set(object_table,x,0); else pd_free_zombie(x); } *************** *** 1343,1349 **** /* this routine is called when a new "object" is requested whose class Pd doesn't know. Pd tries to load it as an extern, then as an abstraction. */ ! void new_anything(void *dummy, t_symbol *s, int argc, t_atom *argv) ! { ! t_pd *current; int fd; char dirbuf[MAXPDSTRING], *nameptr; --- 1347,1351 ---- /* this routine is called when a new "object" is requested whose class Pd doesn't know. Pd tries to load it as an extern, then as an abstraction. */ ! void new_anything(void *dummy, t_symbol *s, int argc, t_atom *argv) { int fd; char dirbuf[MAXPDSTRING], *nameptr; *************** *** 1351,1356 **** newest = 0; class_loadsym = s; ! if (sys_load_lib(canvas_getcurrent(), s->name)) ! { tryingalready = 1; typedmess((t_pd *)dummy, s, argc, argv); --- 1353,1357 ---- newest = 0; class_loadsym = s; ! if (sys_load_lib(canvas_getcurrent(), s->name)) { tryingalready = 1; typedmess((t_pd *)dummy, s, argc, argv); *************** *** 1359,1363 **** } class_loadsym = 0; ! current = s__X.thing; if ((fd = canvas_open(canvas_getcurrent(), s->name, ".pd", dirbuf, &nameptr, MAXPDSTRING, 0)) >= 0 || (fd = canvas_open(canvas_getcurrent(), s->name, ".pat", dirbuf, &nameptr, MAXPDSTRING, 0)) >= 0) { --- 1360,1364 ---- } class_loadsym = 0; ! t_pd *current = s__X.thing; if ((fd = canvas_open(canvas_getcurrent(), s->name, ".pd", dirbuf, &nameptr, MAXPDSTRING, 0)) >= 0 || (fd = canvas_open(canvas_getcurrent(), s->name, ".pat", dirbuf, &nameptr, MAXPDSTRING, 0)) >= 0) { *************** *** 1366,1371 **** canvas_setargs(argc, argv); /* bug fix by Krzysztof Czaja */ binbuf_evalfile(gensym(nameptr), gensym(dirbuf)); ! if (s__X.thing != current) ! canvas_popabstraction((t_canvas *)(s__X.thing)); canvas_setargs(0, 0); } --- 1367,1371 ---- canvas_setargs(argc, argv); /* bug fix by Krzysztof Czaja */ binbuf_evalfile(gensym(nameptr), gensym(dirbuf)); ! if (s__X.thing != current) canvas_popabstraction((t_canvas *)s__X.thing); canvas_setargs(0, 0); } *************** *** 1805,1812 **** } ! /* convert a binbuf to text with null termination and malloc. */ char *binbuf_gettext2(t_binbuf *x) { ! char *buf = (char *)malloc(MAXPDSTRING); ! int n; binbuf_gettext(x,&buf,&n); buf[n] = 0; --- 1805,1811 ---- } ! /* convert a binbuf to text with null termination, as return value */ char *binbuf_gettext2(t_binbuf *x) { ! char *buf; int n; binbuf_gettext(x,&buf,&n); buf[n] = 0; *************** *** 1897,1901 **** int newsize = x->n + argc, i; t_atom *ap; ! ap = (t_atom *)realloc(x->v,newsize*sizeof(*x->v)); if (!ap) { error("binbuf_addmessage: out of space"); --- 1896,1900 ---- int newsize = x->n + argc, i; t_atom *ap; ! ap = (t_atom *)realloc(x->v,(newsize+1)*sizeof(*x->v)); if (!ap) { error("binbuf_addmessage: out of space"); *************** *** 2069,2073 **** if (!sscanf(s->name,".x%lx",(long*)&target)) target=0; if (target) { ! if (!hash_exists(object_table,target)) { error("%s target is not a currently valid pointer",s->name); return; --- 2068,2072 ---- if (!sscanf(s->name,".x%lx",(long*)&target)) target=0; if (target) { ! if (!hash_exists(object_table,target) || !hash_get(object_table,target)) { error("%s target is not a currently valid pointer",s->name); return;

1 0

pd/src desire.c,1.1.2.217.2.128,1.1.2.217.2.129
by Mathieu Bouchard 16 Jan '07

16 Jan '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1965 Modified Files: Tag: desiredata desire.c Log Message: added dummy functions to make -lib gridflow happy Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.128 retrieving revision 1.1.2.217.2.129 diff -C2 -d -r1.1.2.217.2.128 -r1.1.2.217.2.129 *** desire.c 13 Jan 2007 18:24:47 -0000 1.1.2.217.2.128 --- desire.c 15 Jan 2007 23:11:04 -0000 1.1.2.217.2.129 *************** *** 7914,7915 **** --- 7914,7928 ---- }; + // and just to make some externs happy: + extern "C" void glist_grab(void) {} + extern "C" void glist_xtopixels(void) {} + extern "C" void glist_ytopixels(void) {} + extern "C" void *glist_findrtext(void) {return 0;} + extern "C" void canvas_fixlinesfor(void) {} + extern "C" void class_setpropertiesfn(void) {} + extern "C" void glist_eraseiofor(void) {} + extern "C" void glist_getcanvas(void) {} + extern "C" void rtext_gettag(void) {} + extern "C" void class_setwidget(void) {} + extern "C" void glist_isvisible(void) {} + extern "C" void gobj_vis(void) {}

1 0

pd/src ChangeLog, 1.1.4.11.2.14, 1.1.4.11.2.15 TODO, 1.1.2.28.2.33, 1.1.2.28.2.34
by Mathieu Bouchard 15 Jan '07

15 Jan '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1411 Modified Files: Tag: desiredata ChangeLog TODO Log Message: . Index: TODO =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/TODO,v retrieving revision 1.1.2.28.2.33 retrieving revision 1.1.2.28.2.34 diff -C2 -d -r1.1.2.28.2.33 -r1.1.2.28.2.34 *** TODO 11 Jan 2007 15:05:26 -0000 1.1.2.28.2.33 --- TODO 15 Jan 2007 21:45:08 -0000 1.1.2.28.2.34 *************** *** 2,8 **** ---------------------------------------------------------------- 0.40.pre6 [ ] get rid of stderr in server [ ] slider val has to change back to centipixels but as a float. ! [ ] <matju> chun: this is a feature called "loading", which is in pd but not in dd. [ ] prevent hidden subpatches/abstraction-instances from being loaded in the client all of the time. [ ] -lib in .ddrc crashes server: http://pastebin.ca/286300 --- 2,17 ---- ---------------------------------------------------------------- 0.40.pre6 + <chun> 1. fix double delete [pd] + <chun> 2. new way to do View get_canvas + + [ ] switch iemguis to using only t_atoms + [ ] GOP problems are back due to recent changes in canvas_map and canvas_vis + [ ] [route] should accept mixed types (float, symbol) + [ ] [select] should accept mixed types (float, symbol, pointer) + [ ] server-side slider outputs wrong value + [ ] remove MAXPDSTRING [ ] get rid of stderr in server [ ] slider val has to change back to centipixels but as a float. ! [x] <matju> chun: this is a feature called "loading", which is in pd but not in dd. [ ] prevent hidden subpatches/abstraction-instances from being loaded in the client all of the time. [ ] -lib in .ddrc crashes server: http://pastebin.ca/286300 *************** *** 11,14 **** --- 20,24 ---- -> change x8068058 x8067c50 {#X obj 335 166 nbx 8 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 256;} [x] fix {\;} {\$1} in TextBox, loads fine, but there is bug in redraw + [ ] <tim168> matju: in a message box in dd a "," gets replaced by "(\,)" [ ] fix gop [ ] reimplement View get_canvas so that it does not rely on [focus] *************** *** 40,43 **** --- 50,54 ---- [x] after ctrl+1 focus gets lost if click on the ObjectBox [x] ctrl+c brok for GUI objects + [ ] note that Marius Schebella is interested in benchmarks [ ] PureUnity *************** *** 120,124 **** [ ] implement a mark-and-sweep in order to find leaks... (?) [ ] rewrite [image], [display], [knob], [grid], [popup], ... ! [ ] make a statistical profiler for Tcl, if possible [ ] try to use profiler.tcl (tcllib) in a sensible way --- 131,135 ---- [ ] implement a mark-and-sweep in order to find leaks... (?) [ ] rewrite [image], [display], [knob], [grid], [popup], ... ! [ ] this seems fishy but might have good ideas -> http://www.rebelscience.org/Cosas/Reliability.htm [ ] make a statistical profiler for Tcl, if possible [ ] try to use profiler.tcl (tcllib) in a sensible way *************** *** 131,134 **** --- 142,153 ---- [ ] prospect + [ ] if you are reconsidering properties panels, I strongly encourage all y'all to make them Pd patches. + This is how Max/MSP does it and I think it would work very well for Pd as well. Sounds like this + is a good opportunity to make the switch. -- hcs + + <chun> 1. a keyboard operated cursor, a bit like Active, but one can use it like the mouse pointer + <chun> 2. snap to grid feature, or similiar + <chun> 3. prefix keybindings, like M-x in emacs + Iohannes said about redirecting stdout/stderr: #!/bin/sh *************** *** 151,156 **** [ ] http://www.w3.org/DesignIssues/Diff [ ] solve printing problems with GDB. use a pty (pseudo-teletype) ---> http://wiki.tcl.tk/3916 - [ ] PureUnity test suite should help ensuring all branches of pd are - in sync with each other and with previous versions of themselves [ ] try TkZinc [ ] try Tcl/Gtk (Gnocl) with emulation layer --- 170,173 ---- Index: ChangeLog =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/ChangeLog,v retrieving revision 1.1.4.11.2.14 retrieving revision 1.1.4.11.2.15 diff -C2 -d -r1.1.4.11.2.14 -r1.1.4.11.2.15 *** ChangeLog 11 Jan 2007 13:34:25 -0000 1.1.4.11.2.14 --- ChangeLog 15 Jan 2007 21:45:08 -0000 1.1.4.11.2.15 *************** *** 1,5 **** $Id$ ! Desire 0.40.pre6 (2006.01.06) (-r desiredata; ./configure && make) : * merged new loader from Miller's pd 0.40-2 --- 1,5 ---- $Id$ ! Desire 0.40.pre6 (2006.01.12) (-r desiredata; ./configure && make) : * merged new loader from Miller's pd 0.40-2 *************** *** 14,18 **** run also on Miller's 0.40). * IEMGUI can now by controled with keyboard ! Desire 0.40.pre5 (2006.12.19) (-r desiredata; ./configure && make) : --- 14,30 ---- run also on Miller's 0.40). * IEMGUI can now by controled with keyboard ! * merged t_alist and t_binbuf together and aliased them to t_list ! * delay uploading until #X restore or #X pop ! * don't upload all abstractions instances to client (much faster) ! * PureUnity has type suffixes for some class families; for each $1 in ! f,~,# (float,signal,grid) there is [inlet.$1] [outlet.$1] [taa.$1] ! [op2.$1] [rand.$1] [norm.$1] [swap.$1] [packunpack3.$1] ! * Other PureUnity classes: [^] [rtimer] [commutator] [associator] ! [invertor] [distributor] [tree] [protocols-tree] [glue-test] ! [comparators-test] [arith-test] ! [operator1-rule] [operator1-test] ! [operator2-rule] [operator2-test] ! ... ! Desire 0.40.pre5 (2006.12.19) (-r desiredata; ./configure && make) :

1 0

externals/iem/iemmatrix/src iemmatrix_utility.c, 1.1, 1.2 mtx_inverse.c, 1.8, 1.9 mtx_mul.c, 1.5, 1.6 mtx_transpose.c, 1.5, 1.6
by Georg Holzmann 15 Jan '07

15 Jan '07

Update of /cvsroot/pure-data/externals/iem/iemmatrix/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29751 Modified Files: iemmatrix_utility.c mtx_inverse.c mtx_mul.c mtx_transpose.c Log Message: small fix Index: mtx_transpose.c =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/src/mtx_transpose.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mtx_transpose.c 29 Mar 2006 12:07:52 -0000 1.5 --- mtx_transpose.c 15 Jan 2007 20:06:42 -0000 1.6 *************** *** 17,34 **** static t_class *mtx_transpose_class; - t_matrixfloat*mtx_doTranspose(t_matrixfloat*transposee, int row, int col){ - int r,c; - t_matrixfloat*transposed=0; - if(!transposee||!row||!col)return 0; - transposed=(t_matrixfloat*)getbytes(sizeof(t_matrixfloat)*row*col); - r=row; - while(r--){ - c=col; - while(c--) - transposed[c*row+r]=transposee[r*col+c]; - } - return transposed; - } - static void mtx_transpose_matrix(t_matrix *x, t_symbol *s, int argc, t_atom *argv) { --- 17,20 ---- Index: mtx_inverse.c =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/src/mtx_inverse.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mtx_inverse.c 12 Nov 2006 12:56:06 -0000 1.8 --- mtx_inverse.c 15 Jan 2007 20:06:42 -0000 1.9 *************** *** 17,86 **** static t_class *mtx_inverse_class; - - t_matrixfloat* mtx_doInvert(t_matrixfloat*input, int rowcol, int*err){ - /* - * row==col==rowclo - * input=t_matrixfloat[row*col] - * output=t_matrixfloat[row*col] - */ - int i, k; - t_matrixfloat *a1, *b1, *a2, *b2; - - int ok=0; /* error counter */ - - int col=rowcol, row=rowcol, row2=row*col; - t_matrixfloat *original=input; - t_matrixfloat *inverted = 0; - - if(input==0)return 0; - - /* 1a reserve space for the inverted matrix */ - inverted=(t_matrixfloat *)getbytes(sizeof(t_matrixfloat)*row2); - if(inverted==0)return 0; - - /* 1b make an eye-shaped float-buf for B */ - i=row2; - b1=inverted; - while(i--)*b1++=0; - i=row; - b1=inverted; - while(i--)b1[i*(row+1)]=1; - - /* 2. do the Gauss-Jordan */ - for (k=0;k<row;k++) { - /* adjust current row */ - t_matrixfloat diagel = original[k*(col+1)]; - t_matrixfloat i_diagel = diagel?1./diagel:0; - if (!diagel)ok++; - - /* normalize current row (set the diagonal-element to 1 */ - a2=original+k*col; - b2=inverted+k*col; - i=row; - while(i--){ - *a2++*=i_diagel; - *b2++*=i_diagel; - } - - /* eliminate the k-th element in each row by adding the weighted normalized row */ - a2=original+k*row; - b2=inverted+k*row; - for(i=0;i<row;i++) - if (i-k) { - t_matrixfloat f=-*(original+i*row+k); - int j = row; - a1=original+i*row; - b1=inverted+i*row; - while (j--) { - *(a1+j)+=f**(a2+j); - *(b1+j)+=f**(b2+j); - } - } - } - if(err!=0)*err=ok; - - return inverted; - } - static void mtx_inverse_matrix(t_matrix *x, t_symbol *s, int argc, t_atom *argv) { --- 17,20 ---- Index: mtx_mul.c =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/src/mtx_mul.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mtx_mul.c 25 Jul 2006 14:15:22 -0000 1.5 --- mtx_mul.c 15 Jan 2007 20:06:42 -0000 1.6 *************** *** 24,44 **** */ - t_matrixfloat*mtx_doMultiply(int rowA, t_matrixfloat*A, int colArowB, t_matrixfloat*B, int colB){ - t_matrixfloat*result=0; - int r, c, n; - - if(!A || !B || !rowA || !colArowB || !colB)return 0; - result=(t_matrixfloat*)getbytes(sizeof(t_matrixfloat)*rowA*colB); - - for(r=0; r<rowA; r++){ - for(c=0; c<colB; c++){ - t_matrixfloat sum=0.f; - for(n=0;n<colArowB; n++) - sum+=A[colArowB*r+n]*B[colB*n+c]; - result[colB*r+c]=sum; - } - } - return result; - } /* mtx_mul */ --- 24,27 ---- Index: iemmatrix_utility.c =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/src/iemmatrix_utility.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** iemmatrix_utility.c 11 Jan 2007 19:41:20 -0000 1.1 --- iemmatrix_utility.c 15 Jan 2007 20:06:42 -0000 1.2 *************** *** 417,418 **** --- 417,522 ---- x->col=x->row=0; } + + + /* some math */ + + /* invert a square matrix (row=col=rowcol) */ + /* if "error" is non-NULL, it's content will be set to 0 if the matrix was invertable, else to non-0 */ + t_matrixfloat* mtx_doInvert(t_matrixfloat*input, int rowcol, int*err){ + /* + * row==col==rowclo + * input=t_matrixfloat[row*col] + * output=t_matrixfloat[row*col] + */ + int i, k; + t_matrixfloat *a1, *b1, *a2, *b2; + + int ok=0; /* error counter */ + + int col=rowcol, row=rowcol, row2=row*col; + t_matrixfloat *original=input; + t_matrixfloat *inverted = 0; + + if(input==0)return 0; + + /* 1a reserve space for the inverted matrix */ + inverted=(t_matrixfloat *)getbytes(sizeof(t_matrixfloat)*row2); + if(inverted==0)return 0; + + /* 1b make an eye-shaped float-buf for B */ + i=row2; + b1=inverted; + while(i--)*b1++=0; + i=row; + b1=inverted; + while(i--)b1[i*(row+1)]=1; + + /* 2. do the Gauss-Jordan */ + for (k=0;k<row;k++) { + /* adjust current row */ + t_matrixfloat diagel = original[k*(col+1)]; + t_matrixfloat i_diagel = diagel?1./diagel:0; + if (!diagel)ok++; + + /* normalize current row (set the diagonal-element to 1 */ + a2=original+k*col; + b2=inverted+k*col; + i=row; + while(i--){ + *a2++*=i_diagel; + *b2++*=i_diagel; + } + + /* eliminate the k-th element in each row by adding the weighted normalized row */ + a2=original+k*row; + b2=inverted+k*row; + for(i=0;i<row;i++) + if (i-k) { + t_matrixfloat f=-*(original+i*row+k); + int j = row; + a1=original+i*row; + b1=inverted+i*row; + while (j--) { + *(a1+j)+=f**(a2+j); + *(b1+j)+=f**(b2+j); + } + } + } + if(err!=0)*err=ok; + + return inverted; + } + + /* transpose a matrix */ + t_matrixfloat*mtx_doTranspose(t_matrixfloat*transposee, int row, int col){ + int r,c; + t_matrixfloat*transposed=0; + if(!transposee||!row||!col)return 0; + transposed=(t_matrixfloat*)getbytes(sizeof(t_matrixfloat)*row*col); + r=row; + while(r--){ + c=col; + while(c--) + transposed[c*row+r]=transposee[r*col+c]; + } + return transposed; + } + + /* multiply matrix A=[rowA*colA] with matrix B=[rowB*colB]; C=A*B; colA=rowB=colArowB */ + t_matrixfloat*mtx_doMultiply(int rowA, t_matrixfloat*A, int colArowB, t_matrixfloat*B, int colB){ + t_matrixfloat*result=0; + int r, c, n; + + if(!A || !B || !rowA || !colArowB || !colB)return 0; + result=(t_matrixfloat*)getbytes(sizeof(t_matrixfloat)*rowA*colB); + + for(r=0; r<rowA; r++){ + for(c=0; c<colB; c++){ + t_matrixfloat sum=0.f; + for(n=0;n<colArowB; n++) + sum+=A[colArowB*r+n]*B[colB*n+c]; + result[colB*r+c]=sum; + } + } + return result; + }

1 0

autobuild: pd-extended debian-testing-powerpc 2007-01-15 06.27.09
by pd＠debian-testing-powerpc.idmi.poly.edu 15 Jan '07

15 Jan '07

strip --strip-unneeded -R .note -R .comment /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_zeros.pd_linux chmod 755 /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_zeros.pd_linux #rm -f -- "/home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/mtx_zeros.o" cc -Wl,-export_dynamic -shared -o /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/alias/matrix~.pd_linux "/home/pd/auto-build/pd-extended/externals/iem/iemmatrix/alias/matrix~.o" /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/iemmatrix_binops.o /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/src/iemmatrix_utility.o -lm -lc /usr/bin/ld: /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/alias/matrix~.o: Relocations in generic ELF (EM: 3) /usr/bin/ld: /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/alias/matrix~.o: Relocations in generic ELF (EM: 3) /usr/bin/ld: /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/alias/matrix~.o: Relocations in generic ELF (EM: 3) /usr/bin/ld: /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/alias/matrix~.o: Relocations in generic ELF (EM: 3) /usr/bin/ld: /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/alias/matrix~.o: Relocations in generic ELF (EM: 3) /usr/bin/ld: /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/alias/matrix~.o: Relocations in generic ELF (EM: 3) /home/pd/auto-build/pd-extended/externals/iem/iemmatrix/alias/matrix~.o: could not read symbols: File in wrong format collect2: ld returned 1 exit status make[2]: *** [/home/pd/auto-build/pd-extended/externals/iem/iemmatrix/alias/matrix~.pd_linux] Error 1 make[2]: Leaving directory `/home/pd/auto-build/pd-extended/externals' make[1]: *** [externals_install] Error 2 make[1]: Leaving directory `/home/pd/auto-build/pd-extended/packages' make: *** [install] Error 2 upload specs linux_make build tar.bz2 Uploading /home/pd/auto-build/pd-extended/packages/linux_make/build/Pd*.tar.bz2 ls: /home/pd/auto-build/pd-extended/packages/linux_make/build/Pd*.tar.bz2: No such file or directory

1 0

15 Jan '07

Update of /cvsroot/pure-data/externals/iem/iemmatrix/alias In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1768 Removed Files: matrix_mul_line~.o matrix_mul_line~.pd_linux matrix_mul~.o matrix_mul~.pd_linux matrix~.o matrix~.pd_linux mtx.o mtx.pd_linux mtx_0x21.o mtx_0x21.pd_linux mtx_0x2a0x7e.o mtx_0x2a0x7e.pd_linux mtx_0x2e0x2a.o mtx_0x2e0x2a.pd_linux mtx_0x2e0x2f.o mtx_0x2e0x2f.pd_linux mtx_0x2e0x5e.o mtx_0x2e0x5e.pd_linux mtx_0x3a.o mtx_0x3a.pd_linux mtx_div.o mtx_div.pd_linux Log Message: removed binary files --- mtx.pd_linux DELETED --- --- mtx_0x2a0x7e.o DELETED --- --- mtx_0x2e0x5e.o DELETED --- --- mtx_0x2a0x7e.pd_linux DELETED --- --- matrix_mul~.o DELETED --- --- matrix_mul_line~.pd_linux DELETED --- --- mtx_0x2e0x2f.pd_linux DELETED --- --- matrix_mul_line~.o DELETED --- --- matrix~.pd_linux DELETED --- --- mtx_0x3a.pd_linux DELETED --- --- mtx.o DELETED --- --- mtx_0x2e0x2a.pd_linux DELETED --- --- mtx_0x21.pd_linux DELETED --- --- mtx_0x2e0x5e.pd_linux DELETED --- --- mtx_0x3a.o DELETED --- --- mtx_div.pd_linux DELETED --- --- matrix~.o DELETED --- --- mtx_div.o DELETED --- --- mtx_0x2e0x2a.o DELETED --- --- matrix_mul~.pd_linux DELETED --- --- mtx_0x21.o DELETED --- --- mtx_0x2e0x2f.o DELETED ---

1 0

autobuild: pd-extended-release macosx103-powerpc 2007-01-15 03.15.05
by pd＠idmi.poly.edu 15 Jan '07

15 Jan '07

--enable-png=yes --enable-debug=no configure: creating ./config.status config.status: creating Makefile.config config.status: creating bin/pdp-config config.status: creating include/pdp_config.h make -C /Users/pd/auto-build/pd-extended-release/externals/pdp PD_EXECUTABLE="/Users/pd/auto-build/pd-extended-release/pd/bin/pd" make -C system make -C net gcc -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -fPIC -O2 -funroll-loops -fomit-frame-pointer -ffast-math -DPDP_VERSION=\"0.12.5-darcs\" -fnested-functions -I. -I/usr/X11R6/include -I../include -I../../include -I/Users/pd/auto-build/pd-extended-release/pd/src -I/sw/include -o pdp_net.o -c pdp_net.c cc1: error: unrecognized option `-fnested-functions' make[5]: *** [pdp_net.o] Error 1 make[4]: *** [common] Error 2 make[3]: *** [pdp_all] Error 2 make[2]: *** [/Users/pd/auto-build/pd-extended-release/externals/pdp/pdp.pd_darwin] Error 2 make[1]: *** [externals_install] Error 2 make: *** [extended_install] Error 2 upload specs darwin_app . dmg Uploading /home/pd/auto-build/pd-extended-release/packages/darwin_app/./Pd*.dmg ls: /home/pd/auto-build/pd-extended-release/packages/darwin_app/./Pd*.dmg: No such file or directory

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
54
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 January 2007