Update of /cvsroot/pure-data/externals/iem/iemmatrix/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19602
Modified Files: iemmatrix_sources.c iemmatrix_sources.h Added Files: mtx_max2.c mtx_min2.c Log Message: functions to get elementwise minimum/maximum of 2 matrices
--- NEW FILE: mtx_min2.c --- /* * iemmatrix * * objects for manipulating simple matrices * mostly refering to matlab/octave matrix functions * * Copyright (c) IOhannes m zmölnig, forum::für::umläute * IEM, Graz, Austria * * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. * */ #include "iemmatrix.h"
/* mtx_min2 */
/* mtx_min2 */ static t_class *mtx_min2_class, *mtx_min2scalar_class;
static void mtx_min2scalar_matrix(t_mtx_binscalar *x, t_symbol *s, int argc, t_atom *argv) { int n=argc-2; int row=atom_getfloat(argv), col=atom_getfloat(argv+1);
t_float offset=x->f; t_atom *buf; t_atom *ap=argv+2;
if(argc<2){post("mtx_min2: crippled matrix");return; } adjustsize(&x->m, row, col);
buf=x->m.atombuffer+2;
while(n--){ buf->a_type = A_FLOAT; buf++->a_w.w_float = atom_getfloat(ap++) + offset; } outlet_anything(x->x_obj.ob_outlet, gensym("matrix"), argc, x->m.atombuffer); } static void mtx_min2scalar_list(t_mtx_binscalar *x, t_symbol *s, int argc, t_atom *argv) { int n=argc; t_atom *m; t_float offset = x->f; adjustsize(&x->m, 1, argc); m = x->m.atombuffer;
while(n--){ m->a_type = A_FLOAT; (m++)->a_w.w_float = atom_getfloat(argv++) + offset; } outlet_list(x->x_obj.ob_outlet, gensym("list"), argc, x->m.atombuffer); }
static void mtx_min2_matrix(t_mtx_binmtx *x, t_symbol *s, int argc, t_atom *argv) { int row=atom_getfloat(argv); int col=atom_getfloat(argv+1); t_atom *m; t_atom *m1 = argv+2; t_atom *m2 = x->m2.atombuffer+2; int n = argc-2;
if (argc<2){ post("mtx_min2: crippled matrix"); return; } if ((col<1)||(row<1)) { post("mtx_min2: invalid dimensions"); return; } if (col*row>argc-2){ post("sparse matrix not yet supported : use "mtx_check""); return; }
if (!(x->m2.col*x->m2.row)) { outlet_anything(x->x_obj.ob_outlet, gensym("matrix"), argc, argv); return; }
if ((col!=x->m2.col)||(row!=x->m2.row)){ post("mtx_min2: matrix dimensions do not match"); /* LATER SOLVE THIS */ return; } adjustsize(&x->m, row, col); m = x->m.atombuffer+2;
while(n--){ t_float f1=atom_getfloat(m1++); t_float f2=atom_getfloat(m2++); t_float f = (f1<f2)?f1:f2; SETFLOAT(m, f); m++; }
outlet_anything(x->x_obj.ob_outlet, gensym("matrix"), argc, x->m.atombuffer); } static void mtx_min2_float(t_mtx_binmtx *x, t_float f) { t_matrix *m=&x->m, *m2=&x->m2; t_atom *ap, *ap2=m2->atombuffer+2; int row2, col2, n;
if (!m2->atombuffer){ post("mulitply with what ?"); return; }
row2=atom_getfloat(m2->atombuffer); col2=atom_getfloat(m2->atombuffer+1); adjustsize(m, row2, col2); ap=m->atombuffer+2;
n=row2*col2;
while(n--){ SETFLOAT(ap, f+atom_getfloat(ap2++)); ap++; }
outlet_anything(x->x_obj.ob_outlet, gensym("matrix"), m->row*m->col+2, m->atombuffer); } static void *mtx_min2_new(t_symbol *s, int argc, t_atom *argv) { if (argc>1) post("mtx_min2 : extra arguments ignored"); if (argc) { t_mtx_binscalar *x = (t_mtx_binscalar *)pd_new(mtx_min2scalar_class); floatinlet_new(&x->x_obj, &x->f); x->f = atom_getfloatarg(0, argc, argv); outlet_new(&x->x_obj, 0); return(x); } else { t_mtx_binmtx *x = (t_mtx_binmtx *)pd_new(mtx_min2_class); inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("matrix"), gensym("")); outlet_new(&x->x_obj, 0); x->m.col = x->m.row = x->m2.col = x->m2.row = 0; x->m.atombuffer = x->m2.atombuffer = 0; return(x); } }
void mtx_min2_setup(void) { mtx_min2_class = class_new(gensym("mtx_min2"), (t_newmethod)mtx_min2_new, (t_method)mtx_binmtx_free, sizeof(t_mtx_binmtx), 0, A_GIMME, 0); class_addmethod(mtx_min2_class, (t_method)mtx_min2_matrix, gensym("matrix"), A_GIMME, 0); class_addmethod(mtx_min2_class, (t_method)mtx_bin_matrix2, gensym(""), A_GIMME, 0); class_addfloat (mtx_min2_class, mtx_min2_float); class_addbang (mtx_min2_class, mtx_binmtx_bang);
mtx_min2scalar_class = class_new(gensym("mtx_min2"), 0, (t_method)mtx_binscalar_free, sizeof(t_mtx_binscalar), 0, 0); class_addmethod(mtx_min2scalar_class, (t_method)mtx_min2scalar_matrix, gensym("matrix"), A_GIMME, 0); class_addlist (mtx_min2scalar_class, mtx_min2scalar_list); class_addbang (mtx_min2scalar_class, mtx_binscalar_bang);
class_sethelpsymbol(mtx_min2_class, gensym("iemmatrix/mtx_binops")); class_sethelpsymbol(mtx_min2scalar_class, gensym("iemmatrix/mtx_binops")); }
void iemtx_min2_setup(void) { mtx_min2_setup(); }
Index: iemmatrix_sources.h =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/src/iemmatrix_sources.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** iemmatrix_sources.h 19 Sep 2005 13:13:59 -0000 1.1 --- iemmatrix_sources.h 19 Sep 2005 13:28:51 -0000 1.2 *************** *** 36,40 **** --- 36,42 ---- void iemtx_lt_setup(void); /* mtx_lt.c */ void iemtx_matrix_setup(void); /* mtx_matrix.c */ + void iemtx_max2_setup(void); /* mtx_max2.c */ void iemtx_mean_setup(void); /* mtx_mean.c */ + void iemtx_min2_setup(void); /* mtx_min2.c */ void iemtx_mul_setup(void); /* mtx_mul.c */ void iemtx_mul__setup(void); /* mtx_mul~.c */
--- NEW FILE: mtx_max2.c --- /* * iemmatrix * * objects for manipulating simple matrices * mostly refering to matlab/octave matrix functions * * Copyright (c) IOhannes m zmölnig, forum::für::umläute * IEM, Graz, Austria * * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. * */ #include "iemmatrix.h"
/* mtx_max2 */
/* mtx_max2 */ static t_class *mtx_max2_class, *mtx_max2scalar_class;
static void mtx_max2scalar_matrix(t_mtx_binscalar *x, t_symbol *s, int argc, t_atom *argv) { int n=argc-2; int row=atom_getfloat(argv), col=atom_getfloat(argv+1);
t_float offset=x->f; t_atom *buf; t_atom *ap=argv+2;
if(argc<2){post("mtx_max2: crippled matrix");return; } adjustsize(&x->m, row, col);
buf=x->m.atombuffer+2;
while(n--){ buf->a_type = A_FLOAT; buf++->a_w.w_float = atom_getfloat(ap++) + offset; } outlet_anything(x->x_obj.ob_outlet, gensym("matrix"), argc, x->m.atombuffer); } static void mtx_max2scalar_list(t_mtx_binscalar *x, t_symbol *s, int argc, t_atom *argv) { int n=argc; t_atom *m; t_float offset = x->f; adjustsize(&x->m, 1, argc); m = x->m.atombuffer;
while(n--){ m->a_type = A_FLOAT; (m++)->a_w.w_float = atom_getfloat(argv++) + offset; } outlet_list(x->x_obj.ob_outlet, gensym("list"), argc, x->m.atombuffer); }
static void mtx_max2_matrix(t_mtx_binmtx *x, t_symbol *s, int argc, t_atom *argv) { int row=atom_getfloat(argv); int col=atom_getfloat(argv+1); t_atom *m; t_atom *m1 = argv+2; t_atom *m2 = x->m2.atombuffer+2; int n = argc-2;
if (argc<2){ post("mtx_max2: crippled matrix"); return; } if ((col<1)||(row<1)) { post("mtx_max2: invalid dimensions"); return; } if (col*row>argc-2){ post("sparse matrix not yet supported : use "mtx_check""); return; }
if (!(x->m2.col*x->m2.row)) { outlet_anything(x->x_obj.ob_outlet, gensym("matrix"), argc, argv); return; }
if ((col!=x->m2.col)||(row!=x->m2.row)){ post("mtx_max2: matrix dimensions do not match"); /* LATER SOLVE THIS */ return; } adjustsize(&x->m, row, col); m = x->m.atombuffer+2;
while(n--){ t_float f1=atom_getfloat(m1++); t_float f2=atom_getfloat(m2++); t_float f = (f1>f2)?f1:f2; SETFLOAT(m, f); m++; }
outlet_anything(x->x_obj.ob_outlet, gensym("matrix"), argc, x->m.atombuffer); } static void mtx_max2_float(t_mtx_binmtx *x, t_float f) { t_matrix *m=&x->m, *m2=&x->m2; t_atom *ap, *ap2=m2->atombuffer+2; int row2, col2, n;
if (!m2->atombuffer){ post("mulitply with what ?"); return; }
row2=atom_getfloat(m2->atombuffer); col2=atom_getfloat(m2->atombuffer+1); adjustsize(m, row2, col2); ap=m->atombuffer+2;
n=row2*col2;
while(n--){ SETFLOAT(ap, f+atom_getfloat(ap2++)); ap++; }
outlet_anything(x->x_obj.ob_outlet, gensym("matrix"), m->row*m->col+2, m->atombuffer); } static void *mtx_max2_new(t_symbol *s, int argc, t_atom *argv) { if (argc>1) post("mtx_max2 : extra arguments ignored"); if (argc) { t_mtx_binscalar *x = (t_mtx_binscalar *)pd_new(mtx_max2scalar_class); floatinlet_new(&x->x_obj, &x->f); x->f = atom_getfloatarg(0, argc, argv); outlet_new(&x->x_obj, 0); return(x); } else { t_mtx_binmtx *x = (t_mtx_binmtx *)pd_new(mtx_max2_class); inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("matrix"), gensym("")); outlet_new(&x->x_obj, 0); x->m.col = x->m.row = x->m2.col = x->m2.row = 0; x->m.atombuffer = x->m2.atombuffer = 0; return(x); } }
void mtx_max2_setup(void) { mtx_max2_class = class_new(gensym("mtx_max2"), (t_newmethod)mtx_max2_new, (t_method)mtx_binmtx_free, sizeof(t_mtx_binmtx), 0, A_GIMME, 0); class_addmethod(mtx_max2_class, (t_method)mtx_max2_matrix, gensym("matrix"), A_GIMME, 0); class_addmethod(mtx_max2_class, (t_method)mtx_bin_matrix2, gensym(""), A_GIMME, 0); class_addfloat (mtx_max2_class, mtx_max2_float); class_addbang (mtx_max2_class, mtx_binmtx_bang);
mtx_max2scalar_class = class_new(gensym("mtx_max2"), 0, (t_method)mtx_binscalar_free, sizeof(t_mtx_binscalar), 0, 0); class_addmethod(mtx_max2scalar_class, (t_method)mtx_max2scalar_matrix, gensym("matrix"), A_GIMME, 0); class_addlist (mtx_max2scalar_class, mtx_max2scalar_list); class_addbang (mtx_max2scalar_class, mtx_binscalar_bang);
class_sethelpsymbol(mtx_max2_class, gensym("iemmatrix/mtx_binops")); class_sethelpsymbol(mtx_max2scalar_class, gensym("iemmatrix/mtx_binops")); }
void iemtx_max2_setup(void) { mtx_max2_setup(); }
Index: iemmatrix_sources.c =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/src/iemmatrix_sources.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** iemmatrix_sources.c 19 Sep 2005 13:13:59 -0000 1.1 --- iemmatrix_sources.c 19 Sep 2005 13:28:51 -0000 1.2 *************** *** 38,42 **** --- 38,44 ---- iemtx_lt_setup(); /* mtx_lt.c */ iemtx_matrix_setup(); /* mtx_matrix.c */ + iemtx_max2_setup(); /* mtx_max2.c */ iemtx_mean_setup(); /* mtx_mean.c */ + iemtx_min2_setup(); /* mtx_min2.c */ iemtx_mul_setup(); /* mtx_mul.c */ iemtx_mul__setup(); /* mtx_mul~.c */