added [mtx_dbtorms] and [mtx_rmstodb]

svn path=/trunk/externals/iem/iemmatrix/; revision=3253

5 files changed, 272 insertions, 0 deletions

diff --git a/doc/mtx_dbtorms.pd b/doc/mtx_dbtorms.pd
new file mode 100644
index 0000000..d6a21a8
--- /dev/null
+++ b/doc/mtx_dbtorms.pd
@@ -0,0 +1,42 @@
+#N canvas 382 124 687 471 10;
+#X obj 485 95 matrix;
+#X text 435 77 see also help for;
+#X obj 181 100 mtx_eye;
+#X obj 64 285 mtx_rand 4 2;
+#X msg 64 263 bang;
+#X obj 64 307 t a a;
+#X obj 105 307 mtx_print org;
+#X obj 64 357 t a a;
+#X msg 181 79 3 3;
+#X obj 48 134 mtx_dbtorms;
+#X obj 64 380 mtx_dbtorms;
+#X obj 483 125 mtx_rmstodb;
+#X obj 483 145 dbtorms;
+#X obj 181 121 mtx_* 100;
+#X obj 48 162 mtx_print dbtorms;
+#X obj 64 330 mtx_rmstodb;
+#X obj 105 357 mtx_print db;
+#X obj 64 407 mtx_print db;
+#X obj 48 100 mtx 2 2;
+#X text 188 7 convert dB(pd) to rms;
+#X text 44 34 convert dB(pd) to a linear value for each element of
+a matrix;
+#X text 290 305 note: dB(pd):=dB(techn)+100;
+#X text 307 337 this means: 100dB(pd)==unity gain (==1);
+#X text 404 375 0dB(pd)==zero gain (==0);
+#X msg 48 80 0 100 97 106;
+#X text 391 354 106dB(pd)~=double gain (==2);
+#X connect 2 0 13 0;
+#X connect 3 0 5 0;
+#X connect 4 0 3 0;
+#X connect 5 0 15 0;
+#X connect 5 1 6 0;
+#X connect 7 0 10 0;
+#X connect 7 1 16 0;
+#X connect 8 0 2 0;
+#X connect 9 0 14 0;
+#X connect 10 0 17 0;
+#X connect 13 0 9 0;
+#X connect 15 0 7 0;
+#X connect 18 0 9 0;
+#X connect 24 0 18 0;
diff --git a/doc/mtx_rmstodb.pd b/doc/mtx_rmstodb.pd
new file mode 100644
index 0000000..f12a974
--- /dev/null
+++ b/doc/mtx_rmstodb.pd
@@ -0,0 +1,44 @@
+#N canvas 382 124 687 471 10;
+#X obj 485 95 matrix;
+#X text 435 77 see also help for;
+#X obj 181 90 mtx_eye;
+#X obj 64 258 mtx_rand 4 2;
+#X msg 64 233 bang;
+#X obj 64 307 t a a;
+#X obj 105 307 mtx_print org;
+#X obj 64 357 t a a;
+#X msg 181 71 3 3;
+#X obj 181 110 mtx_* 100;
+#X obj 48 162 mtx_print dbtorms;
+#X obj 48 100 mtx 2 2;
+#X text 290 305 note: dB(pd):=dB(techn)+100;
+#X text 307 337 this means: 100dB(pd)==unity gain (==1);
+#X text 404 375 0dB(pd)==zero gain (==0);
+#X text 391 354 106dB(pd)~=double gain (==2);
+#X text 188 7 convert rms to dB(pd);
+#X text 44 34 convert a linear value to dB(pd) to for each element
+of a matrix;
+#X obj 48 134 mtx_rmstodb;
+#X obj 64 330 mtx_dbtorms;
+#X obj 64 380 mtx_rmstodb;
+#X obj 105 357 mtx_print rms;
+#X obj 64 407 mtx_print db;
+#X obj 483 124 mtx_dbtorms;
+#X obj 483 145 rmstodb;
+#X msg 48 80 0 1 0.1 2;
+#X obj 64 277 mtx_* 100;
+#X connect 2 0 9 0;
+#X connect 3 0 26 0;
+#X connect 4 0 3 0;
+#X connect 5 0 19 0;
+#X connect 5 1 6 0;
+#X connect 7 0 20 0;
+#X connect 7 1 21 0;
+#X connect 8 0 2 0;
+#X connect 9 0 18 0;
+#X connect 11 0 18 0;
+#X connect 18 0 10 0;
+#X connect 19 0 7 0;
+#X connect 20 0 22 0;
+#X connect 25 0 11 0;
+#X connect 26 0 5 0;
diff --git a/src/iemmatrix.c b/src/iemmatrix.c
index 145b33b..fd884f6 100644
--- a/src/iemmatrix.c
+++ b/src/iemmatrix.c
@@ -20,6 +20,8 @@ void mtx_sub_setup();
 void mtx_pow_setup();
 void mtx_col_setup();
 void mtx_cholesky_setup();
+void mtx_dbtorms_setup();
+void mtx_rmstodb_setup();
 void mtx_diag_setup();
 void mtx_diegg_setup();
 void mtx_distance2_setup();
@@ -67,6 +69,8 @@ void iemtx_setup(){
   mtx_gauss_setup();
   mtx_inverse_setup();
   mtx_log_setup();
+  mtx_dbtorms_setup();
+  mtx_rmstodb_setup();  
   mtx_matrix_setup();
   mtx_mean_setup();
   mtx_check_setup();
diff --git a/src/mtx_dbtorms.c b/src/mtx_dbtorms.c
new file mode 100644
index 0000000..4768078
--- /dev/null
+++ b/src/mtx_dbtorms.c
@@ -0,0 +1,93 @@
+/*
+ *  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();
+}
diff --git a/src/mtx_rmstodb.c b/src/mtx_rmstodb.c
new file mode 100644
index 0000000..f5f6a65
--- /dev/null
+++ b/src/mtx_rmstodb.c
@@ -0,0 +1,89 @@
+/*
+ *  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();
+}