[PD-cvs] externals/iem/iemmatrix/src mtx_exp.c, NONE, 1.1 mtx_log.c, NONE, 1.1 iemmatrix.c, 1.7, 1.8

[IOhannes m zmölnig]

Update of /cvsroot/pure-data/externals/iem/iemmatrix/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2310/src

Modified Files:
	iemmatrix.c 
Added Files:
	mtx_exp.c mtx_log.c 
Log Message:
added [mtx_exp] and [mtx_log]


--- NEW FILE: mtx_log.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_log: B=log(A); B[n,m]=e^A[n,m]  */

static t_class *mtx_log_class;

static void mtx_log_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_log: crippled matrix");    return;  }
  if ((col<1)||(row<1)) {    post("mtx_log: 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 = (t_float)log(atom_getfloat(argv++));
    SETFLOAT(m, f);
    m++;
  }

  outlet_anything(x->x_obj.ob_outlet, gensym("matrix"), argc, x->m.atombuffer);
}

static void mtx_log_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--){
    m->a_type = A_FLOAT;
    (m++)->a_w.w_float = (t_float)log(atom_getfloat(argv++));
  }

  outlet_list(x->x_obj.ob_outlet, gensym("list"), argc, x->m.atombuffer);
}

static void *mtx_log_new(t_symbol *s)
{
  /* element log */
  t_matrix *x = (t_matrix *)pd_new(mtx_log_class);
  outlet_new(&x->x_obj, 0);
  x->col = x->row = 0;
  x->atombuffer = 0;
  return(x);
}

void mtx_log_setup(void)
{
  mtx_log_class = class_new(gensym("mtx_log"), (t_newmethod)mtx_log_new, (t_method)mtx_binmtx_free,
				   sizeof(t_mtx_binmtx), 0, A_GIMME, 0);
  class_addmethod(mtx_log_class, (t_method)mtx_log_matrix, gensym("matrix"), A_GIMME, 0);
  class_addlist  (mtx_log_class, mtx_log_list);
  class_addbang  (mtx_log_class, mtx_binmtx_bang);

  class_sethelpsymbol(mtx_log_class, gensym("iemmatrix/mtx_log"));
}

void iemtx_log_setup(void)
{
  mtx_log_setup();
}

--- NEW FILE: mtx_exp.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_exp: B=exp(A); B[n,m]=e^A[n,m]  */

static t_class *mtx_exp_class;

static void mtx_exp_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_exp: crippled matrix");    return;  }
  if ((col<1)||(row<1)) {    post("mtx_exp: 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 = (t_float)exp(atom_getfloat(argv++));
    SETFLOAT(m, f);
    m++;
  }

  outlet_anything(x->x_obj.ob_outlet, gensym("matrix"), argc, x->m.atombuffer);
}

static void mtx_exp_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--){
    m->a_type = A_FLOAT;
    (m++)->a_w.w_float = (t_float)exp(atom_getfloat(argv++));
  }

  outlet_list(x->x_obj.ob_outlet, gensym("list"), argc, x->m.atombuffer);
}

static void *mtx_exp_new(t_symbol *s)
{
  /* element exp */
  t_matrix *x = (t_matrix *)pd_new(mtx_exp_class);
  outlet_new(&x->x_obj, 0);
  x->col = x->row = 0;
  x->atombuffer = 0;
  return(x);
}

void mtx_exp_setup(void)
{
  mtx_exp_class = class_new(gensym("mtx_exp"), (t_newmethod)mtx_exp_new, (t_method)mtx_binmtx_free,
				   sizeof(t_mtx_binmtx), 0, A_GIMME, 0);
  class_addmethod(mtx_exp_class, (t_method)mtx_exp_matrix, gensym("matrix"), A_GIMME, 0);
  class_addlist  (mtx_exp_class, mtx_exp_list);
  class_addbang  (mtx_exp_class, mtx_binmtx_bang);

  class_sethelpsymbol(mtx_exp_class, gensym("iemmatrix/mtx_exp"));
}

void iemtx_exp_setup(void)
{
  mtx_exp_setup();
}

Index: iemmatrix.c
===================================================================
RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/src/iemmatrix.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** iemmatrix.c	11 May 2005 13:05:28 -0000	1.7
--- iemmatrix.c	14 Jun 2005 10:35:30 -0000	1.8
***************
*** 26,32 ****
  void mtx_egg_setup();
  void mtx_element_setup();
  void mtx_eye_setup();
- void mtx_inverse_setup();
  void mtx_gauss_setup();
  void mtx_matrix_setup();
  void mtx_mean_setup();
--- 26,34 ----
  void mtx_egg_setup();
  void mtx_element_setup();
+ void mtx_exp_setup();
  void mtx_eye_setup();
  void mtx_gauss_setup();
+ void mtx_inverse_setup();
+ void mtx_log_setup();
  void mtx_matrix_setup();
  void mtx_mean_setup();
***************
*** 61,67 ****
--- 63,71 ----
    mtx_egg_setup();
    mtx_element_setup();
+   mtx_exp_setup();
    mtx_eye_setup();
    mtx_gauss_setup();
    mtx_inverse_setup();
+   mtx_log_setup();
    mtx_matrix_setup();
    mtx_mean_setup();