Update of /cvsroot/pure-data/externals/iem/iemmatrix/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25235/src
Modified Files:
iemmatrix.c
Added Files:
mtx_dbtorms.c mtx_rmstodb.c
Log Message:
added [mtx_dbtorms] and [mtx_rmstodb]
--- NEW FILE: mtx_dbtorms.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"
#define LOGTEN 2.302585092994
/* mtx_dbtorms: B=log(A); B[n,m]=e^A[n,m] */
static t_class *mtx_dbtorms_class;
static void mtx_dbtorms_matrix(t_mtx_binmtx *x, t_symbol *s, int argc, t_atom *argv)
{
int row=atom_getfloat(argv++);
int col=atom_getfloat(argv++);
t_atom *m;
int n = argc-2;
if (argc<2){ post("mtx_dbtorms: crippled matrix"); return; }
if ((col<1)||(row<1)) { post("mtx_dbtorms: invalid dimensions"); return; }
if (col*row>argc-2){ post("sparse matrix not yet supported : use \"mtx_check\""); return; }
adjustsize(&x->m, row, col);
m = x->m.atombuffer+2;
while(n--){
t_float f=atom_getfloat(argv++);
t_float v=0;
f=(f>485)?485:f;
v=(f<=0)?0:exp((LOGTEN*0.05) * (f-100.));
SETFLOAT(m, (v<0)?0:v);
m++;
}
outlet_anything(x->x_obj.ob_outlet, gensym("matrix"), argc, x->m.atombuffer);
}
static void mtx_dbtorms_list(t_mtx_binscalar *x, t_symbol *s, int argc, t_atom *argv)
{
int n=argc;
t_atom *m;
t_float factor = x->f;
adjustsize(&x->m, 1, argc);
m = x->m.atombuffer;
while(n--){
t_float f=atom_getfloat(argv++);
t_float v=0;
f=(f>485)?485:f;
v=(f<=0)?0:exp((LOGTEN*0.05) * (f-100.));
SETFLOAT(m, (v<0)?0:v);
m++;
}
outlet_list(x->x_obj.ob_outlet, gensym("list"), argc, x->m.atombuffer);
}
static void *mtx_dbtorms_new(t_symbol *s)
{
/* element log */
t_matrix *x = (t_matrix *)pd_new(mtx_dbtorms_class);
outlet_new(&x->x_obj, 0);
x->col = x->row = 0;
x->atombuffer = 0;
return(x);
}
void mtx_dbtorms_setup(void)
{
mtx_dbtorms_class = class_new(gensym("mtx_dbtorms"), (t_newmethod)mtx_dbtorms_new, (t_method)mtx_binmtx_free,
sizeof(t_mtx_binmtx), 0, A_GIMME, 0);
class_addmethod(mtx_dbtorms_class, (t_method)mtx_dbtorms_matrix, gensym("matrix"), A_GIMME, 0);
class_addlist (mtx_dbtorms_class, mtx_dbtorms_list);
class_addbang (mtx_dbtorms_class, mtx_binmtx_bang);
class_sethelpsymbol(mtx_dbtorms_class, gensym("iemmatrix/mtx_dbtorms"));
}
void iemtx_dbtorms_setup(void)
{
mtx_dbtorms_setup();
}
--- NEW FILE: mtx_rmstodb.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"
#define LOGTEN 2.302585092994
/* mtx_rmstodb: B=log(A); B[n,m]=e^A[n,m] */
static t_class *mtx_rmstodb_class;
static void mtx_rmstodb_matrix(t_mtx_binmtx *x, t_symbol *s, int argc, t_atom *argv)
{
int row=atom_getfloat(argv++);
int col=atom_getfloat(argv++);
t_atom *m;
int n = argc-2;
if (argc<2){ post("mtx_rmstodb: crippled matrix"); return; }
if ((col<1)||(row<1)) { post("mtx_rmstodb: invalid dimensions"); return; }
if (col*row>argc-2){ post("sparse matrix not yet supported : use \"mtx_check\""); return; }
adjustsize(&x->m, row, col);
m = x->m.atombuffer+2;
while(n--){
t_float f=atom_getfloat(argv++);
t_float v=(f<0)?0.:(100+20./LOGTEN * log(f));
SETFLOAT(m, (v<0)?0:v);
m++;
}
outlet_anything(x->x_obj.ob_outlet, gensym("matrix"), argc, x->m.atombuffer);
}
static void mtx_rmstodb_list(t_mtx_binscalar *x, t_symbol *s, int argc, t_atom *argv)
{
int n=argc;
t_atom *m;
t_float factor = x->f;
adjustsize(&x->m, 1, argc);
m = x->m.atombuffer;
while(n--){
t_float f=atom_getfloat(argv++);
t_float v=(f<0)?0.:(100+20./LOGTEN * log(f));
SETFLOAT(m, (v<0)?0:v);
m++;
}
outlet_list(x->x_obj.ob_outlet, gensym("list"), argc, x->m.atombuffer);
}
static void *mtx_rmstodb_new(t_symbol *s)
{
/* element log */
t_matrix *x = (t_matrix *)pd_new(mtx_rmstodb_class);
outlet_new(&x->x_obj, 0);
x->col = x->row = 0;
x->atombuffer = 0;
return(x);
}
void mtx_rmstodb_setup(void)
{
mtx_rmstodb_class = class_new(gensym("mtx_rmstodb"), (t_newmethod)mtx_rmstodb_new, (t_method)mtx_binmtx_free,
sizeof(t_mtx_binmtx), 0, A_GIMME, 0);
class_addmethod(mtx_rmstodb_class, (t_method)mtx_rmstodb_matrix, gensym("matrix"), A_GIMME, 0);
class_addlist (mtx_rmstodb_class, mtx_rmstodb_list);
class_addbang (mtx_rmstodb_class, mtx_binmtx_bang);
class_sethelpsymbol(mtx_rmstodb_class, gensym("iemmatrix/mtx_rmstodb"));
}
void iemtx_rmstodb_setup(void)
{
mtx_rmstodb_setup();
}
Index: iemmatrix.c
===================================================================
RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/src/iemmatrix.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** iemmatrix.c 14 Jun 2005 10:35:30 -0000 1.8
--- iemmatrix.c 27 Jun 2005 15:57:49 -0000 1.9
***************
*** 21,24 ****
--- 21,26 ----
void mtx_col_setup();
void mtx_cholesky_setup();
+ void mtx_dbtorms_setup();
+ void mtx_rmstodb_setup();
void mtx_diag_setup();
void mtx_diegg_setup();
***************
*** 68,71 ****
--- 70,75 ----
mtx_inverse_setup();
mtx_log_setup();
+ mtx_dbtorms_setup();
+ mtx_rmstodb_setup();
mtx_matrix_setup();
mtx_mean_setup();